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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								a8c4c3eb76 
								
							
								 
							
						 
						
							
							
								
								Updated migration numbers as a result from merge and bug fixes  
							
							... 
							
							
							
							Updated the CallVC to support an animated profile picture
Fixed a button layout issue with the landing screen
Fixed a bug where the input view could appear above the call UI when the app returns to the foreground
Fixed a bug where the push notification registration could incorrectly get triggered during onboarding when recovering from an onboarding crase 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								b4f44d43e8 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into disappearing-message-redesign  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								742c4a161f 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
#	Session/Media Viewing & Editing/GIFs/GiphyAPI.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/Notifications/AppNotifications.swift
#	Session/Notifications/SyncPushTokensJob.swift
#	Session/Notifications/UserNotificationsAdaptee.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Database/Models/Interaction.swift
#	SessionMessagingKit/Database/Models/SessionThread.swift
#	SessionMessagingKit/Jobs/Types/MessageReceiveJob.swift
#	SessionMessagingKit/Jobs/Types/MessageSendJob.swift
#	SessionMessagingKit/Jobs/Types/SendReadReceiptsJob.swift
#	SessionMessagingKit/Messages/Message.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ReadReceipts.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender+Convenience.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionMessagingKit/Shared Models/MentionInfo.swift 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								3344e58716 
								
							
								 
							
						 
						
							
							
								
								Cleaned up some logic around sync messages  
							
							... 
							
							
							
							Added logic to indicate when a sync message failed to send (and the ability to retry)
Added the retry/resync button to the long press message menu
Updated sync messages to run via the MessageSendJob
Updated the delivery status to always show on the last outgoing message
Updated the logic to update the delivery status when retrying to send a failed message
Removed the convoluted recursion logic for turning self-send messages into sync messages 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								494e12adb6 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into disappearing-message-redesign  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								345b693225 
								
							
								 
							
						 
						
							
							
								
								Fixed build issues, bugs, added unit tests and added the ConvoInfoVolatile handling  
							
							... 
							
							
							
							Added the unit tests for the ConvoInfoVolatile
Added icons to the swipe actions
Updated jobs to be able to be prioritised (and added priorities to the launch jobs to avoid some odd behaviours)
Fixed some build issues resulting from merging
Fixed an issue with the open group pubkey encoding
Fixed an issue where an imageView could get it's image set on a background thread
Fixed a bug where the swipe actions weren't getting theming applied when the theme changed
Fixed a bug where scheduling code after the next db transaction completes couldn't be nested (resulting in code not running)
Fixed a bug where the PagedDataObserver might not notify of unobserved changes if they reverted previous unobserved changes
Fixed a couple of incorrect SQL ordering use cases (was overriding instead of appending ordering)
Fixed an issue where the app would re-upload the avatar every launch (only affected this branch)
Fixed an issue where the home screen wouldn't update group avatars when their profile data changed 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								4f8fb63f2c 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling  
							
							... 
							
							
							
							# Conflicts:
#	Session/Media Viewing & Editing/PhotoCapture.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/Notifications/AppNotifications.swift
#	Session/Onboarding/RestoreVC.swift
#	Session/Shared/SessionTableViewController.swift
#	Session/Shared/SessionTableViewModel.swift
#	SessionMessagingKit/Calls/WebRTCSession.swift
#	SessionMessagingKit/Database/Models/Attachment.swift
#	SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
#	SessionMessagingKit/File Server/FileServerAPI.swift
#	SessionMessagingKit/Jobs/Types/AttachmentDownloadJob.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPI.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionSnodeKit/OnionRequestAPI.swift
#	SessionSnodeKit/SnodeAPI.swift
#	SessionUtilitiesKit/Database/Models/Identity.swift
#	SessionUtilitiesKit/JobRunner/JobRunner.swift 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								5c05fbbbb6 
								
							
								 
							
						 
						
							
							
								
								Added the updated delivery status UI  
							
							... 
							
							
							
							Updated the create closed group screen to cancel the search field when tapping outside of it (previously required tapping the cancel button) 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								bae9c3cbc3 
								
							
								 
							
						 
						
							
							
								
								UI: update standard font size  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								f1e9412c7a 
								
							
								 
							
						 
						
							
							
								
								Added in missing code changes unrelated to closed groups rebuild  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								f0b3044e89 
								
							
								 
							
						 
						
							
							
								
								ui: add legacy option for 1-1 disappearing messages and clean  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								eeb0f4e47c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into disappearing-message-redesign  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								5c6ab4d0af 
								
							
								 
							
						 
						
							
							
								
								minor ui adjustment  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								3041f61e31 
								
							
								 
							
						 
						
							
							
								
								ui: group disappearing message config disabled for non-admin  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								0240001201 
								
							
								 
							
						 
						
							
							
								
								fix copy and share buttons are getting squashed when switching from landscape to portrait in new DM VC  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								d803ba20e7 
								
							
								 
							
						 
						
							
							
								
								themed scrollable subtitle  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								d8fd3b35b4 
								
							
								 
							
						 
						
							
							
								
								Theming tweaks and bug fixes  
							
							... 
							
							
							
							Made a tweak to prevent some odd looking keyboard transitions when going to conversation settings
Updated the PagedDatabaseObserver to not call 'onChangeUnsorted' on the main thread (now we can generate the changeset on the background thread so there is less main thread work)
Fixed an issue where the most recently received message from the swarm could be removed from the swarm yet the app would still poll for it, resulting in the swarm always returning the oldest possible messages until the user sends a new one-to-one message
Fixed an issue where the initial scroll offset could be incorrect due to certain message types
Fixed an issue where the title view inside a conversation could jump when pushing to the conversation settings screen
Refactored a couple of ObjC functions to Swift as they were crashing (due to memory allocation?) hopefully this will fix it
Tweaked some DispatchQueue priorities to ensure PagedDatabaseObserver loading is prioritised
Updated buttons to use a standard convention for highlighted states
Updated the new conversation button to follow the new highlighted state convention 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								0af00feed9 
								
							
								 
							
						 
						
							
							
								
								Added the version footer back to the settings screen  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								58184d6d27 
								
							
								 
							
						 
						
							
							
								
								Fixed issues found during testing  
							
							... 
							
							
							
							Fixed an issue where the user config message wouldn't get sent correctly
Fixed an issue where the theme preference migration wasn't working properly
Fixed a crash which could occur in some cases when updating the theme
Fixed a crash which could occur when opening the new conversation screen with a contact with no name
Fixed a minor UI glitch with the 'sessionId' separator border
Fixed a minor UI issue where long author names in quotes could cause the message bubble to stretch incorrectly
Cleaned up some no-contact UI states
Updated the Atomic queue to have a 'userInteractive' priority so it can't be delayed by lower priority queues and block the main thread 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								6eeb0ec7ac 
								
							
								 
							
						 
						
							
							
								
								Fixed most of the styling issues raised during QA  
							
							... 
							
							
							
							Copy tweak
Added a toast when copying the sessionId or group URL (fixes to the toast UI as well)
Fixed the new conversation screen styling
Fixed the styling of the various attachment screens
Updated the buttons on the attachment screen to behave like the input view buttons
Removed the old OWSNavigationBar and OWSNavigationController (logic was buggy and not actually needed in most cases) 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								40109e0bea 
								
							
								 
							
						 
						
							
							
								
								Cleaned up the config-based table view controller to be more reusable  
							
							... 
							
							
							
							Updated the settings screens to have the "rounded group" styling
Added a "loading conversations" label to the Message Requests screen before the conversations load
Removed the legacy UserCell (replaced with the more reusable 'SessionCell')
Renamed a few things to make them more generic and reusable 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								f98e2a157e 
								
							
								 
							
						 
						
							
							
								
								Added rounding to the settings and updated the SettingVC to use the config approach  
							
							... 
							
							
							
							Removed some unused code 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								8109a326cf 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/theming  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Closed Groups/NewClosedGroupVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/Message Cells/CallMessageCell.swift
#	Session/Conversations/Views & Modals/JoinOpenGroupModal.swift
#	Session/Home/HomeVC.swift
#	Session/Home/New Conversation/NewDMVC.swift
#	Session/Home/NewConversationButtonSet.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/Open Groups/JoinOpenGroupVC.swift
#	Session/Open Groups/OpenGroupSuggestionGrid.swift
#	Session/Settings/SettingsVC.swift
#	Session/Shared/BaseVC.swift
#	Session/Shared/OWSQRCodeScanningViewController.m
#	Session/Shared/ScanQRCodeWrapperVC.swift
#	Session/Shared/UserCell.swift
#	SessionMessagingKit/Configuration.swift
#	SessionShareExtension/SAEScreenLockViewController.swift
#	SessionUIKit/Style Guide/Gradients.swift
#	SignalUtilitiesKit/Media Viewing & Editing/OWSViewController+ImageEditor.swift
#	SignalUtilitiesKit/Screen Lock/ScreenLockViewController.m 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								f7fd15dae0 
								
							
								 
							
						 
						
							
							
								
								Finished removing usages to non-theme colour variables  
							
							... 
							
							
							
							Updated theming throughout
Fixed a couple of bugs with the media gallery 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								1bc6b0bdba 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/theming  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Message Cells/VisibleMessageCell.swift
#	Session/Home/HomeVC.swift
#	Session/Home/Message Requests/MessageRequestsViewController.swift
#	Session/Media Viewing & Editing/MediaTileViewController.swift
#	Session/Meta/AppDelegate.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/Onboarding/LandingVC.swift
#	SessionMessagingKitTests/_TestUtilities/MockGeneralCache.swift 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								afd908a64a 
								
							
								 
							
						 
						
							
							
								
								ui: add gradient background for create new group button  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								7715c5ea09 
								
							
								 
							
						 
						
							
							
								
								Did some more styling and fixed a few UI bugs  
							
							... 
							
							
							
							Fixed a bug where the time label would no longer appear in the context menu
Fixed a bug where the tile label in the context menu could be clipped
Tweaked the context menu appearance animation to look less jumpy when at the edges of the screen 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								ac008fbd35 
								
							
								 
							
						 
						
							
							
								
								WIP: Gradient background for closed group create button  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								b4d29c58c4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into menu-redesign  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								fe14bb1b31 
								
							
								 
							
						 
						
							
							
								
								Fixed a couple of bugs and did some more theming  
							
							... 
							
							
							
							Started trying to add the unit tests that were in the settings refactor branch (need to be refactored due to the implementation changes)
Fixed a bug where the typing indicators wouldn't get cleaned up in some cases 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								d939f95b4f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into message-request-tweak  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								67a9047df7 
								
							
								 
							
						 
						
							
							
								
								update grey background color  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								52449d6522 
								
							
								 
							
						 
						
							
							
								
								minor colour adjustment  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								e5c3c23e74 
								
							
								 
							
						 
						
							
							
								
								WIP: new closed group vc  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								face9da02b 
								
							
								 
							
						 
						
							
							
								
								Fixed search performance, started styling in-conversaiton settings  
							
							... 
							
							
							
							Fixed a bug where the scroll to bottom button wasn't working
Fixed an issue where searching was running on the main thread (which could cause UI issues)
Updated the searching to interrupt the previous query when the search term changes
Updated the in-conversation settings to be use the new config-based approach (deleted the OWSConversationSettingsViewController) 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								b029728b6c 
								
							
								 
							
						 
						
							
							
								
								Did some more theming, removed some files and fixed a couple of minor call issues  
							
							... 
							
							
							
							Applied theming logic to the ConversationTitleView, blocked banner
Removed a few redundant modals (replaced them with the "Confirmation Modal")
Removed some duplicate code
Fixed an issue where a synchronous start/stop behaviour was running on the main thread causing some UI blocking
Fixed an issue where the minimised call view could be covered by presenting view controllers 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								b47e5accd6 
								
							
								 
							
						 
						
							
							
								
								Updated some more message types and modals  
							
							... 
							
							
							
							Added a disabled state to the OutlineButton
Finished of the last bits for the BlockedContacts screen
Applied theming to the LinkPreview
Applied theming to the Call info message (and it's prompt)
Fixed a minor issue where showing the ContextMenu (via long press) could look odd due to the input field being dismissed
Swapped the LinkPreviewModal to use the standard ConfirmationModal
Removed a redundant closure from the ConfirmationModal 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								7f5b7ef703 
								
							
								 
							
						 
						
							
							
								
								Updated the conversation creation screens  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								c82ee0c44b 
								
							
								 
							
						 
						
							
							
								
								Finished off the updated settings sections and fixed a couple of bugs  
							
							... 
							
							
							
							Added the Blocked contacts screen
Added a setting to control whether concurrent audio messages should auto-play
Finished updating the settings screens
Fixed an issue where items that should be removed from the PagedDatabaseObserver due to filter logic weren't getting removed in some cases 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								a1e88329db 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into feature/theming  
							
							... 
							
							
							
							# Conflicts:
#	Podfile.lock
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Message Cells/VisibleMessageCell.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/Notifications/AppNotifications.swift
#	SessionMessagingKit/Shared Models/MessageViewModel.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SignalUtilitiesKit/Profile Pictures/ProfilePictureView.swift 
							
						 
						
							3 years ago