Commit Graph

16048 Commits

Author SHA1 Message Date
Ryan Zhao 64374bb59e Revert "update pods for merge"
This reverts commit 6cb571bb1b.
2022-02-04 11:01:41 +11:00
Ryan Zhao 6cb571bb1b update pods for merge 2022-02-04 10:07:05 +11:00
Ryan Zhao b1c2802613 update pods 2022-02-04 10:03:23 +11:00
Ryan Zhao 69e464e8ae bump up version & build number 2022-02-03 16:33:26 +11:00
RyanZhao a12ff0cbe2
Merge pull request #557 from RyanRory/1.11.21
Fix bugs and crashes for 1.11.21
2022-02-03 16:31:20 +11:00
Ryan Zhao e543f86c8b Merge branch 'dev' of https://github.com/oxen-io/session-ios into 1.11.21 2022-02-03 11:02:19 +11:00
RyanZhao 8afe5b0896
Merge pull request #548 from mpretty-cyro/fix/safari-sharing
Fix issues with sharing from Safari
2022-02-03 10:52:08 +11:00
Morgan Pretty 16ab4be537 Merge branch 'dev' into feature/pdf-preview 2022-02-03 08:33:58 +11:00
Morgan Pretty 4d62ddbd77 Merge branch 'dev' into fix/safari-sharing
# Conflicts:
#	Podfile.lock
2022-02-03 08:32:17 +11:00
Morgan Pretty 7f479bbca4 Merge branch 'dev' into feature/message-requests 2022-02-02 17:00:40 +11:00
Morgan Pretty 9db5083cc5 Built out the Message Request functionality
Added the MessageRequestsViewController
Added a 'Message Requests' button to the settings screen
Added accept/reject buttons for message requests to the ConversationVC
Added the ability to hide the message request item on the HomeVC (re-appears if you get a new message request)
Added code to handle an edge-case where the message request approval state wouldn't be returned to the sender due to the recipient running an old version of the app
Prevented contacts which aren't associated with an approved thread from appearing when creating a closed group
Disabled notifications for threads which aren't approved
Updated the app notification count to exclude unapproved messages
Updated the app to ignore closed group creation messages if the group has no admins which are approved contacts
Fixed up the keyboard avoidance behaviour in the ConversationVC
Fixed a couple of minor interaction issues which affected some devices
Fixed an issue where the database migrations would run on the 2nd launch when creating a new account (causing odd behaviours)
2022-02-02 16:59:56 +11:00
Ryan Zhao ebb7507728 Merge branch 'dev' of https://github.com/oxen-io/session-ios into 1.11.21 2022-02-02 13:33:25 +11:00
RyanZhao b4782896b1
Merge pull request #555 from RyanRory/global-search
Global Search Phase 1
2022-02-02 13:31:30 +11:00
Ryan Zhao 166fbff26c improve selected message animation for global search 2022-02-02 11:32:37 +11:00
Ryan Zhao 5ce7aa49ee mark messages with undownloaded attachments as read as well 2022-02-01 15:12:48 +11:00
Morgan Pretty bee36423da Fixed a couple of issue with sharing large attachments
Added back localized attachment error messages
Fixed an issue where sending an attachment could fail and the screen would be dismissed before the user had a chance to read the error
2022-02-01 14:55:03 +11:00
Morgan Pretty c7e7d30dea Merge branch 'dev' into fix/safari-sharing 2022-02-01 13:57:34 +11:00
Ryan Zhao ce83de5c46 fix crash of dictionary.subscript.getter for closed groups 2022-01-31 14:09:56 +11:00
Morgan Pretty 0f20c37afa Regenerated the SessionProtos for message requests 2022-01-31 08:56:42 +11:00
Morgan Pretty b85c113da6 Added code to preview PDF attachments 2022-01-28 16:24:18 +11:00
Ryan Zhao c729967953 Merge branch 'dev' of https://github.com/oxen-io/session-ios into global-search 2022-01-28 15:56:16 +11:00
Ryan Zhao a101bfbf82 Merge branch 'dev' of https://github.com/oxen-io/session-ios into 1.11.21 2022-01-28 15:55:48 +11:00
RyanZhao 6aac2a9966
Merge pull request #550 from mpretty-cyro/fix/open-group-initial-mention-list
Fix open group initial mention list population
2022-01-28 15:55:21 +11:00
Ryan Zhao c81e0e517d fix ui issue after making unread message count 4 digits 2022-01-28 15:03:19 +11:00
Ryan Zhao 99022006da Make the unread message count 4 digits instead of 2 2022-01-28 14:21:54 +11:00
Ryan Zhao 2c7dfe6a37 fix conversation screen scrolling to bottom issue 2022-01-28 14:10:35 +11:00
Ryan Zhao 70a562344c minor issue fix 2022-01-28 14:09:57 +11:00
Ryan Zhao 8ed77435d8 update translation 2022-01-28 14:08:43 +11:00
Ryan Zhao d96d7468a4 fix read more button colour 2022-01-28 14:04:41 +11:00
Ryan Zhao 6ae84d3e37 update outgoing message text colour in light mode 2022-01-28 13:45:27 +11:00
Ryan Zhao d642d8a4ed improve image message ratio 2022-01-28 13:14:57 +11:00
Ryan Zhao bcc5da75b6 minor fix on debug mode to prevent crashing 2022-01-28 13:14:02 +11:00
RyanZhao 8a1e916bcc
Merge pull request #549 from mpretty-cyro/feature/more-link-previews
Default link previews to use HTTPS
2022-01-28 12:16:28 +11:00
Ryan Zhao 16f6d49cec add note to self to the default global search screen with empty search text 2022-01-28 09:59:05 +11:00
Ryan Zhao 124d908686 add author for group messages 2022-01-27 16:39:22 +11:00
Ryan Zhao 18fea4ab73 Merge branch 'dev' into global-search 2022-01-27 15:43:54 +11:00
Ryan Zhao be1fb789e8 hide recent search results behind the flag 2022-01-27 15:32:19 +11:00
Ryan Zhao e4b0ca9ebc fix `not to self` 2022-01-27 15:29:10 +11:00
Morgan Pretty a26dec0005 Merge branch 'dev' into feature/more-link-previews 2022-01-27 15:18:25 +11:00
Morgan Pretty f8dd56c9d2 Merge branch 'dev' into fix/open-group-initial-mention-list 2022-01-27 15:17:57 +11:00
Morgan Pretty 09d63456b6 Merge branch 'dev' into fix/safari-sharing
# Conflicts:
#	Podfile
#	Podfile.lock
#	Session.xcodeproj/project.pbxproj
2022-01-27 15:17:28 +11:00
Ryan Zhao d329740bd4 add clear for recent search results 2022-01-27 14:56:59 +11:00
RyanZhao 7e789c8a10
Merge pull request #547 from mpretty-cyro/fix/m1-build-issues
Fix Mac M1 build issues
2022-01-27 14:23:58 +11:00
Ryan Zhao 85c4b3d745 show recent search result as default for global search screen 2022-01-27 14:19:07 +11:00
Ryan Zhao a2db4a8330 add comments 2022-01-25 16:55:48 +11:00
Ryan Zhao 79fc9459a4 clean 2022-01-25 16:54:21 +11:00
Ryan Zhao 837b2ac157 fix a typo 2022-01-25 16:47:50 +11:00
Ryan Zhao 78af18413f show at most 500 search results 2022-01-25 16:43:03 +11:00
Ryan Zhao d583422c73 add some comments 2022-01-25 16:31:30 +11:00
Ryan Zhao 20a3b6ee26 move path button into setttings 2022-01-25 15:56:23 +11:00