661720a988 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Meta/Translations/ar.lproj/Localizable.strings
#	Session/Meta/Translations/be.lproj/Localizable.strings
#	Session/Meta/Translations/bg.lproj/Localizable.strings
#	Session/Meta/Translations/bn.lproj/Localizable.strings
#	Session/Meta/Translations/cs.lproj/Localizable.strings
#	Session/Meta/Translations/da.lproj/Localizable.strings
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/el.lproj/Localizable.strings
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Meta/Translations/eo.lproj/Localizable.strings
#	Session/Meta/Translations/es-ES.lproj/Localizable.strings
#	Session/Meta/Translations/fa.lproj/Localizable.strings
#	Session/Meta/Translations/fi.lproj/Localizable.strings
#	Session/Meta/Translations/fil.lproj/Localizable.strings
#	Session/Meta/Translations/fr.lproj/Localizable.strings
#	Session/Meta/Translations/hi.lproj/Localizable.strings
#	Session/Meta/Translations/hr.lproj/Localizable.strings
#	Session/Meta/Translations/hu.lproj/Localizable.strings
#	Session/Meta/Translations/id.lproj/Localizable.strings
#	Session/Meta/Translations/it.lproj/Localizable.strings
#	Session/Meta/Translations/ja.lproj/Localizable.strings
#	Session/Meta/Translations/ko.lproj/Localizable.strings
#	Session/Meta/Translations/ku.lproj/Localizable.strings
#	Session/Meta/Translations/lt.lproj/Localizable.strings
#	Session/Meta/Translations/lv.lproj/Localizable.strings
#	Session/Meta/Translations/ne-NP.lproj/Localizable.strings
#	Session/Meta/Translations/nl.lproj/Localizable.strings
#	Session/Meta/Translations/no.lproj/Localizable.strings
#	Session/Meta/Translations/pl.lproj/Localizable.strings
#	Session/Meta/Translations/pt-BR.lproj/Localizable.strings
#	Session/Meta/Translations/pt-PT.lproj/Localizable.strings
#	Session/Meta/Translations/ro.lproj/Localizable.strings
#	Session/Meta/Translations/ru.lproj/Localizable.strings
#	Session/Meta/Translations/si-LK.lproj/Localizable.strings
#	Session/Meta/Translations/sk.lproj/Localizable.strings
#	Session/Meta/Translations/sl.lproj/Localizable.strings
#	Session/Meta/Translations/sv-SE.lproj/Localizable.strings
#	Session/Meta/Translations/th.lproj/Localizable.strings
#	Session/Meta/Translations/tr.lproj/Localizable.strings
#	Session/Meta/Translations/uk.lproj/Localizable.strings
#	Session/Meta/Translations/vi.lproj/Localizable.strings
#	Session/Meta/Translations/zh-CN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-TW.lproj/Localizable.strings
#	SessionMessagingKit/Configuration.swift
#	SessionUtilitiesKit/Database/Storage.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								3f19c776d9 
								
							
								 
							
						 
						
							
							
								
								Fixed a few issues around jumping between messages  
							
							... 
							
							
							
							Fixed a bug where tapping on quotes could break after loading lots of visible cells
Fixed a bug where a cell which contained both links and a quote would only ever let you interact with the quote
Fixed an issue where message highlight wasn't working when jumping between messages 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								12347c9f2f 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							... 
							
							
							
							# Conflicts:
#	Session/Media Viewing & Editing/MediaDetailViewController.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								de7d85f4cb 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into fix/media-interactions  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								a6931bb922 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Shared/SessionTableViewController.swift
#	Session/Shared/SessionTableViewModel.swift
#	Session/Shared/Types/SessionTableSection.swift
#	SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
#	SessionUIKit/Components/SessionButton.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								89b38dc2f5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #928  from mpretty-cyro/fix/blocked-contacts-crash  
							
							... 
							
							
							
							Fixed a crash on the blocked contacts screen and refactoring 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								aec2aed81f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #927  from mpretty-cyro/fix/snode-info-deduping  
							
							... 
							
							
							
							Fixed an issue where the messages might not get reprocessed when they should 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								bd98db2612 
								
							
								 
							
						 
						
							
							
								
								Fixed a few bugs and crashes around media interactions  
							
							... 
							
							
							
							Fixed a crash when trying to grant permission to access additional photos
Fixed a bug where audio files would incorrectly get recognised as voice messages
Replaced our custom video/audio players with the native ones (which have additional built-in controls)
Updated the errors from SSKKeychainStorage to include useful information
Updated layout for audio attachments 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								f97170fdcd 
								
							
								 
							
						 
						
							
							
								
								Fixed a crash on the blocked contacts screen and refactoring  
							
							... 
							
							
							
							Refactored the SessionThreadViewModel to reduce boilerplate and clean up the interface a little
Refactored the MessageRequestsViewController to use the SessionTableViewController
Fixed a crash when returning from the background on the BlockedContactsViewModel
Fixed some minor lag on the NotificationSoundViewModel
Added an optional initial loading message to the SessionTableViewController 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								085a1a59aa 
								
							
								 
							
						 
						
							
							
								
								Fixed an issue where the messages might not get reprocessed when they should  
							
							... 
							
							
							
							Dropped the auto-incrementing id from the SnodeReceivedMessageInfo
Changed the 'key, hash' from a uniqueKey to a primaryKey to allow "upsert" behaviours to work 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								3a9ada581d 
								
							
								 
							
						 
						
							
							
								
								Fixed an issue where theme changes stopped updating nav styling  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								90cd3fb5e0 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							... 
							
							
							
							# Conflicts:
#	_SharedTestUtilities/MockJobRunner.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								42b49e0227 
								
							
								 
							
						 
						
							
							
								
								Added unit tests to verify migrations between all versions work  
							
							... 
							
							
							
							Fixed a busted test import 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								bf58831313 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							... 
							
							
							
							# Conflicts:
#	Scripts/LintLocalizableStrings.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								5917cf103f 
								
							
								 
							
						 
						
							
							
								
								Refactored the LintLocalizableStrings  
							
							... 
							
							
							
							Added inline errors & warnings (regex could use some work to remove invalid cases)
Added a build step to validate the strings are included in the app and it's extensions 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								6e9cbe402f 
								
							
								 
							
						 
						
							
							
								
								add accessibility id for radio buttons  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								2d0bbe4455 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into disappearing-message-redesign  
							
							... 
							
							
							
							#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Meta/Translations/es-ES.lproj/Localizable.strings
#	Session/Meta/Translations/fa.lproj/Localizable.strings
#	Session/Meta/Translations/fi.lproj/Localizable.strings
#	Session/Meta/Translations/fil.lproj/Localizable.strings
#	Session/Meta/Translations/fr.lproj/Localizable.strings
#	Session/Meta/Translations/hi.lproj/Localizable.strings
#	Session/Meta/Translations/hr.lproj/Localizable.strings
#	Session/Meta/Translations/it.lproj/Localizable.strings
#	Session/Meta/Translations/ja.lproj/Localizable.strings
#	Session/Meta/Translations/nl.lproj/Localizable.strings
#	Session/Meta/Translations/pl.lproj/Localizable.strings
#	Session/Meta/Translations/pt-BR.lproj/Localizable.strings
#	Session/Meta/Translations/ru.lproj/Localizable.strings
#	Session/Meta/Translations/sk.lproj/Localizable.strings
#	Session/Meta/Translations/sl.lproj/Localizable.strings
#	Session/Meta/Translations/sv-SE.lproj/Localizable.strings
#	Session/Meta/Translations/th.lproj/Localizable.strings
#	Session/Meta/Translations/vi.lproj/Localizable.strings
#	Session/Meta/Translations/zh-CN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-TW.lproj/Localizable.strings 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								52836cff91 
								
							
								 
							
						 
						
							
							
								
								Fixed a couple more issues  
							
							... 
							
							
							
							Fixed an issue with the Emoji generation
Fixed the SessionThread 'isPinned' property
Fixed an issue when migrating from a pre 2.3.0 version to the latest version 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								31976048bd 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'feature/updated-user-config-handling' of  https://github.com/mpretty-cyro/session-ios  into disappearing-message-redesign  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								c86cc0ed9c 
								
							
								 
							
						 
						
							
							
								
								CI tweaks and incremented build number  
							
							... 
							
							
							
							Added the XCBeautify pod (so the CI doesn't need to separately install something)
Updated the CI build script to use XCBeautify
Fixed some broken unit tests 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								9ae6d2f506 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'updated-user-config-handling' into disappearing-message-redesign  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								53a5db0ea5 
								
							
								 
							
						 
						
							
							
								
								Fixed a number of issues found during internal testing  
							
							... 
							
							
							
							Added copy for an unrecoverable startup case
Added some additional logs to better debug ValueObservation query errors
Increased the pageSize to 20 on iPad devices (to prevent it immediately loading a second page)
Cleaned up a bunch of threading logic (try to avoid overriding subscribe/receive threads specified at subscription)
Consolidated the 'sendMessage' and 'sendAttachments' functions
Updated the various frameworks to use 'DAWRF with DSYM' to allow for better debugging during debug mode (at the cost of a longer build time)
Updated the logic to optimistically insert messages when sending to avoid any database write delays
Updated the logic to avoid sending notifications for messages which are already marked as read by the config
Fixed an issue where multiple paths could incorrectly get built at the same time in some cases
Fixed an issue where other job queues could be started before the blockingQueue finishes
Fixed a potential bug with the snode version comparison (was just a string comparison which would fail when getting to double-digit values)
Fixed a bug where you couldn't remove the last reaction on a message
Fixed the broken media message zoom animations
Fixed a bug where the last message read in a conversation wouldn't be correctly detected as already read
Fixed a bug where the QuoteView had no line limits (resulting in the '@You' mention background highlight being incorrectly positioned in the quote preview)
Fixed a bug where a large number of configSyncJobs could be scheduled (only one would run at a time but this could result in performance impacts) 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								f7c7c75527 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'updated-user-config-handling' into disappearing-message-redesign  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								f07313c7ac 
								
							
								 
							
						 
						
							
							
								
								Fixed a number of bugs found during internal testing  
							
							... 
							
							
							
							Updated to the latest libSession to increase the available size for config message content (size check now happens after compression rather than before)
Added some additional logs for config size info
Fixed a bug where the database could be accessed before the migrations ran which could result in unexpected behaviours
Fixed a bug where you couldn't mark a non one-to-one thread as read/unread
Fixed a bug where a database initialization failure wouldn't result in a migration failure (user would be stuck on the splash screen indefinitely)
Fixed a bug where if a message was too large for the screen the conversation would open it centered on the screen (now it will be positioned to the top)
Started looking at broken unit tests
Increased the build number 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								e3537e55ca 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'updated-user-config-handling' into disappearing-message-redesign  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								d2c82cb915 
								
							
								 
							
						 
						
							
							
								
								Started working on some config contact pruning logic  
							
							... 
							
							
							
							Added support for a ConfirmationModal with an input field
Added a mechanism on Debug builds to export the database and it's key
Added logic to catch exceptions thrown within libSession (need to actually plug it in)
Added a debug-only mechanism to export the users database and (encrypted) database key
Added a few unit tests to check the CONTACTS config message size constraints 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								32d7dd2ea6 
								
							
								 
							
						 
						
							
							
								
								refactor on accessibility of SessionButton.Info, and fix some unit tests on disappearing messages config  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								43e38c5644 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'updated-user-config-handling' into disappearing-message-redesign  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								c455a13a7b 
								
							
								 
							
						 
						
							
							
								
								Finished adding logic to ignore messages invalidated by config  
							
							... 
							
							
							
							Added timestamps to the Profile table to avoid overriding current profile info with older info
Updated the MessageReceiver to ignore the rest of the messages invalidated by the config
Updated to the latest libSession
Updated the JobRunner to expose some more info about the currently running jobs
Made some tweaks to the ConfigurationSyncJob to better support concurrent jobs running for different targets 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								0cfd87ee27 
								
							
								 
							
						 
						
							
							
								
								Fixed a bug where the ProfilePictureView could incorrectly take up space when hidden  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								afb456b710 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'updated-user-config-handling' into disappearing-message-redesign  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								5d88db7a8a 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/feature/tweak-profile-modal-ui' into feature/updated-user-config-handling  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Calls/Call Management/SessionCall.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/Input View/MentionSelectionView.swift
#	Session/Conversations/Message Cells/VisibleMessageCell.swift
#	Session/Settings/SettingsViewModel.swift
#	Session/Shared/Views/SessionAvatarCell.swift
#	Session/Shared/Views/SessionCell+AccessoryView.swift
#	SessionUIKit/Components/ConfirmationModal.swift
#	SessionUIKit/Components/PlaceholderIcon.swift
#	SignalUtilitiesKit/Profile Pictures/ProfilePictureView.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								22303f2458 
								
							
								 
							
						 
						
							
							
								
								Colour tweak  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								cf2e198a64 
								
							
								 
							
						 
						
							
							
								
								Updated the profile picture modal  
							
							... 
							
							
							
							Moved the ProfilePictureView into SessionUIKit
Fixed a couple of minor ProfilePictureView bugs 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								2d792e4e3e 
								
							
								 
							
						 
						
							
							
								
								Updated the profile picture modal and standardised the ProfilePictureView sizes  
							
							... 
							
							
							
							Fixed an issue where 'CurrentAppContext().isMainAppAndActive' wasn't called on the main thread
Updated the ProfilePictureView to have the updated icon UI 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								edfe8a61b0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'feature/updated-user-config-handling' of  https://github.com/mpretty-cyro/session-ios  into disappearing-message-redesign  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								2053b6b0cd 
								
							
								 
							
						 
						
							
							
								
								Added some accessibility info  
							
							... 
							
							
							
							Fixed an issue where the Display Picture update modal wouldn't rendering animated images actually animating 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								86705d88e3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'feature/updated-user-config-handling' into disappearing-message-redesign  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								534343f8b0 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling  
							
							... 
							
							
							
							# Conflicts:
#	Session/Closed Groups/NewClosedGroupVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Home/GlobalSearch/GlobalSearchViewController.swift
#	Session/Home/HomeVC.swift
#	Session/Home/New Conversation/NewDMVC.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Meta/Translations/es.lproj/Localizable.strings
#	Session/Meta/Translations/fa.lproj/Localizable.strings
#	Session/Meta/Translations/fi.lproj/Localizable.strings
#	Session/Meta/Translations/fr.lproj/Localizable.strings
#	Session/Meta/Translations/hi.lproj/Localizable.strings
#	Session/Meta/Translations/hr.lproj/Localizable.strings
#	Session/Meta/Translations/id-ID.lproj/Localizable.strings
#	Session/Meta/Translations/it.lproj/Localizable.strings
#	Session/Meta/Translations/ja.lproj/Localizable.strings
#	Session/Meta/Translations/nl.lproj/Localizable.strings
#	Session/Meta/Translations/pl.lproj/Localizable.strings
#	Session/Meta/Translations/pt_BR.lproj/Localizable.strings
#	Session/Meta/Translations/ru.lproj/Localizable.strings
#	Session/Meta/Translations/si.lproj/Localizable.strings
#	Session/Meta/Translations/sk.lproj/Localizable.strings
#	Session/Meta/Translations/sv.lproj/Localizable.strings
#	Session/Meta/Translations/th.lproj/Localizable.strings
#	Session/Meta/Translations/vi-VN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
#	Session/Meta/Translations/zh_CN.lproj/Localizable.strings
#	Session/Settings/BlockedContactsViewController.swift
#	Session/Settings/NukeDataModal.swift
#	Session/Settings/SettingsViewModel.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionUIKit/Components/ConfirmationModal.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								9c8653aa21 
								
							
								 
							
						 
						
							
							
								
								Updated the profile picture management UI  
							
							... 
							
							
							
							Updated the UI to use a modal
Added the ability to remove the profile picture 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								be7881ad2e 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Conversations/Views & Modals/ConversationTitleView.swift
#	Session/Notifications/AppNotifications.swift
#	Session/Settings/NukeDataModal.swift
#	Session/Shared/SessionTableViewModel.swift
#	Session/Shared/Views/SessionCell.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Database/Models/Contact.swift
#	SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
#	SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift
#	SessionMessagingKit/Messages/Message.swift
#	SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift
#	SessionMessagingKit/Protos/Generated/SNProto.swift
#	SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift
#	SessionMessagingKit/Protos/SessionProtos.proto
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift
#	SessionMessagingKitTests/_TestUtilities/TestOnionRequestAPI.swift
#	SessionSnodeKit/Models/SnodeAPIEndpoint.swift
#	SessionSnodeKit/SnodeAPI.swift
#	SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
#	SessionUtilitiesKit/General/Features.swift 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								5e3dd3c731 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
#	Session/Shared/Views/SessionCell+AccessoryView.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Database/Models/Interaction.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionUtilitiesKit/Database/Models/Job.swift 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								2983086837 
								
							
								 
							
						 
						
							
							
								
								Fixed an accessibility regression  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								0e1dea8f62 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling  
							
							... 
							
							
							
							# Conflicts:
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								19856c7ef5 
								
							
								 
							
						 
						
							
							
								
								Disabled the disappearing messages setting when not a group member  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								fa39b5f61c 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Calls/CallVC.swift
#	Session/Conversations/Message Cells/Content Views/DocumentView.swift
#	Session/Conversations/Settings/OWSMessageTimerView.m
#	SessionMessagingKit/File Server/FileServerAPI.swift
#	SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift
#	SessionMessagingKit/Open Groups/OpenGroupManager.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionMessagingKit/Shared Models/MessageViewModel.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionSnodeKit/SnodeAPI.swift
#	SessionUtilitiesKit/Networking/HTTP.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentTextToolbar.swift 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								70ce967df6 
								
							
								 
							
						 
						
							
							
								
								Made a few optimisations and fixes  
							
							... 
							
							
							
							Made a couple of DB query optimisations for the Home and Conversation screens
Removed some compiler-complex global generic functions
Increased the timeout for file uploads
Fixed a few import issues
Fixed an issue preventing calls on the simulator from working (disable CallKit on the simulator)
Fixed an issue where opening a conversation with a draft would result in a typing indicator notification being sent (if enabled)
Fixed a truncation issue on the CallVC 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								f4d6babca2 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling  
							
							... 
							
							
							
							# Conflicts:
#	Podfile.lock
#	Session.xcodeproj/project.pbxproj
#	Session/Closed Groups/EditClosedGroupVC.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Home/HomeVC.swift
#	Session/Home/HomeViewModel.swift
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Meta/Translations/es.lproj/Localizable.strings
#	Session/Meta/Translations/fa.lproj/Localizable.strings
#	Session/Meta/Translations/fi.lproj/Localizable.strings
#	Session/Meta/Translations/fr.lproj/Localizable.strings
#	Session/Meta/Translations/hi.lproj/Localizable.strings
#	Session/Meta/Translations/hr.lproj/Localizable.strings
#	Session/Meta/Translations/id-ID.lproj/Localizable.strings
#	Session/Meta/Translations/it.lproj/Localizable.strings
#	Session/Meta/Translations/ja.lproj/Localizable.strings
#	Session/Meta/Translations/nl.lproj/Localizable.strings
#	Session/Meta/Translations/pl.lproj/Localizable.strings
#	Session/Meta/Translations/pt_BR.lproj/Localizable.strings
#	Session/Meta/Translations/ru.lproj/Localizable.strings
#	Session/Meta/Translations/si.lproj/Localizable.strings
#	Session/Meta/Translations/sk.lproj/Localizable.strings
#	Session/Meta/Translations/sv.lproj/Localizable.strings
#	Session/Meta/Translations/th.lproj/Localizable.strings
#	Session/Meta/Translations/vi-VN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
#	Session/Meta/Translations/zh_CN.lproj/Localizable.strings
#	Session/Shared/FullConversationCell.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Database/Models/SessionThread.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionUIKit/Utilities/UIContextualAction+Theming.swift
#	SessionUtilitiesKit/Database/Models/Job.swift
#	SessionUtilitiesKit/General/Dictionary+Utilities.swift
#	SessionUtilitiesKit/JobRunner/JobRunner.swift 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								27cfe6b8b8 
								
							
								 
							
						 
						
							
							
								
								make the swipe actions always right & correct the copy for delete a covnersation  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								fde34a6c45 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling  
							
							
							
						 
						
							3 years ago