keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
15,906 Commits
5 Branches
145 Tags
430 MiB
master
dev
voice-calls-2
voice-calls
authentication
2.5.0
2.4.5
2.4.4
2.4.3
2.4.2
2.4.1
2.4.0
2.3.2
2.3.1
2.3.0
2.2.14
2.2.13
2.2.12
2.2.11
2.2.10
2.2.9
2.2.6
2.2.4
2.2.2
2.2.1
2.2.0
2.1.1
2.0.3
2.0.2
2.0.1
2.0.0
1.0.0-alpha.1
audit-2
audit
2.8.0
2.7.4
2.7.3
2.7.2
2.7.1
2.7.0
2.6.3
2.6.2
2.6.1
2.6.0
2.2.8
2.2.7
2.2.5
2.2.3
2.1.0
1.9.7
1.9.6
1.9.5
1.9.4
1.9.3
1.9.1
1.9.0
1.8.3
1.8.2
1.8.1
1.8.0
1.7.8
1.7.7
1.7.6
1.7.5
1.7.4
1.7.3
1.7.2
1.7.0
1.6.5
1.6.4
1.6.3
1.6.2
1.6.1
1.6.0
1.5.3
1.5.2
1.5.1-beta
1.5.0-beta
1.5.0
1.4.7
1.4.6
1.4.5
1.4.4
1.4.3
1.4.2
1.4.0-beta
1.4.0
1.3.0-alpha.1
1.3.0
1.2.6
1.2.5
1.2.4
1.2.3
1.2.1
1.2.0-alpha.2
1.2.0-alpha.1
1.2.0
1.13.0
1.12.9
1.12.8
1.12.7
1.12.6
1.12.5
1.12.4
1.12.2
1.12.1
1.11.9
1.11.8
1.11.7
1.11.6
1.11.5
1.11.4
1.11.3
1.11.24
1.11.23
1.11.22
1.11.21
1.11.20
1.11.2
1.11.19
1.11.18
1.11.17
1.11.16
1.11.15
1.11.14
1.11.13
1.11.12
1.11.11
1.11.10
1.11.1
1.11.0
1.10.2
1.10.1
1.10.0
1.1.0-alpha.4
1.1.0-alpha.3
1.1.0-alpha.2
1.1.0-alpha.1
1.1.0
1.0.8
1.0.7
1.0.6
1.0.5
1.0.4
1.0.3
1.0.2
1.0.1
1.0.0-alpha.3
1.0.0-alpha.2
1.0.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '5762445128'
${ noResults }
Commit Graph

15906 Commits (5762445128eaa9dfaf4da3ff8d1cda6aedccc25e)
 

Author SHA1 Message Date
Ryan Zhao 5762445128 Merge branch 'ipad-support-1' into voice-calls-2 3 years ago
Ryan Zhao d3342094a4 Merge branch 'dev' into ipad-support-1 3 years ago
RyanZhao 49c995ee92
Merge pull request #572 from RyanRory/fix-closed-group-not-restored 
Fix closed groups not restored
 3 years ago
Ryan Zhao b1fb202eab mark current user as approved in message request migration 3 years ago
Ryan Zhao 9a04c7a4fe mark current user as approved on preregistering 3 years ago
Ryan Zhao bf6de99395 Merge branch 'dev' into ipad-support-1 3 years ago
RyanZhao e287241bc5
Merge pull request #571 from mpretty-cyro/fix/unrecognised-selector-crash 
Fixed unrecognised selector crash
 3 years ago
Morgan Pretty af543b980b Made a couple of changes to how the ConfigurationMessage is generated and handled 
Stopped configuration messages from automatically creating threads for sync'ed contacts (now they will only be created if there are messages)
Updated the ConfigurationMessage to stop truncating the list of contacts but filter the full set (also update the logic to include previously approved contacts)
 3 years ago
Morgan Pretty decb946bf3 Fixed an unrecognised selector crash hidden by the conversion of Objective-C to Swift 3 years ago
Ryan Zhao 79c1cb08b6 minor UI adjustment 3 years ago
Ryan Zhao 88876138db Merge branch 'ipad-support-1' into voice-calls-2 3 years ago
Ryan Zhao 4edb666580 UI minor adjustment to modals 3 years ago
Morgan Pretty f316eb4e24 Merge remote-tracking branch 'upstream/dev' into dev 3 years ago
Ryan Zhao 38f972ec9a fix magic number 3 years ago
Ryan Zhao 6a9a5b2752 fix session id label width 3 years ago
Ryan Zhao 23508fb936 fix bottom margin & copy/share button width 3 years ago
Ryan Zhao c08b1617c2 slim the button width again 3 years ago
Ryan Zhao ea64469c2b Merge branch 'dev' into ipad-support-1 3 years ago
Ryan Zhao f6ef0b9f45 Merge branch 'dev' into voice-calls-2 3 years ago
Ryan Zhao e8f996306d show call permission required modal when calls are nor enabled 3 years ago
RyanZhao 8542564692
Merge pull request #569 from mpretty-cyro/fix/database-threading-crash 
Fix database threading crash
 3 years ago
Morgan Pretty 22921a6b5a Fixed a crash due to not passing the transaction when accessing the database 3 years ago
Ryan Zhao 2bfbf25c75 Merge branch 'ipad-support-1' into voice-calls-2 3 years ago
Ryan Zhao 094fbfec2e improvements on sizes to make the UI look much better 3 years ago
Ryan Zhao 952a3d3414 minor fix for merging 3 years ago
Ryan Zhao 52407aec03 Merge branch 'ipad-support-1' into voice-calls-2 3 years ago
Ryan Zhao 9b075efe0c Merge branch 'dev' into ipad-support-1 3 years ago
Ryan Zhao e243fb8817 fix unread message request count issues 3 years ago
Morgan Pretty f370b050a3 Merge remote-tracking branch 'upstream/dev' into dev 3 years ago
Ryan Zhao 167d68870a show conversation settings button after approving message requests 3 years ago
RyanZhao 0332250498
Merge pull request #568 from mpretty-cyro/fix/failable-message-request-response 
Fix for failing message request responses
 3 years ago
Morgan Pretty bdaae2b347 Moved the copy for the message request approval error into Localizable.strings 3 years ago
Morgan Pretty 1b3f6c0ca6 Minor tweaks to the message request banner on the HomeVC 
Fixed the unread message counting for message requests
Updated the message request banner to indicate the number of message requests with an unread message
Updated the message request banner to automatically disappear if the user has no unread message requests
Renamed a variable for ReadReceipt management to make it a bit more self-documenting (it looked like it would trigger a read receipt to be sent regardless of the setting)
 3 years ago
Morgan Pretty 9251d98bde Added a loading state when approving a message request 
Removed the 'presentTimer' logic from the 'ModalActivityIndicatorViewController' (the delay looked buggy, if it does have "blipping" issues then we can fix those separately)
 3 years ago
Morgan Pretty f0f4128db2 Fixed an issue where the MessageRequestResponse could fail to send but would be flagged locally as approved 3 years ago
Morgan Pretty b648d27ba1 Merge remote-tracking branch 'upstream/dev' into dev 3 years ago
Ryan Zhao 04d25577f4 Merge branch 'dev' into ipad-support-1 3 years ago
RyanZhao ae7abf6fc1
Merge pull request #567 from mpretty-cyro/feature/message-request-tweaks 
Message request fixes and tweaks
 3 years ago
Morgan Pretty 110c7bb01a Addressed PR comments 
Moved the 'backBarButtonItem' into the BaseVC (and removed it for being duplicated in various view controllers)
Removed a redundant line of code
 3 years ago
Morgan Pretty b077061714 Updated the code to parse an open group URL to handle a '/r/' before the room name 3 years ago
Morgan Pretty e6b941ea8a Fixed a number of tweaks and bugs with message requests 
Removed the "Back" text from the back buttons
Removed the inset on the 'Path' settings button so the text remains horizontally centered
Hid the settings button from message request threads
Fixed an issue where the back button would remain visible in a conversation when the search field was visible
Fixed an issue where the tintColor of the conversation search field didn't match the global search field
Fixed an issue where sending an attachment response to a message request wouldn't approve the message request
Updated the size and positioning of the message request 'Clear All' button to match the DM 'Next' button
Updated the message request 'Clear All' button to start visible (so it's visible during the push animation) since that's the most likely state it'll be in
Updated the 'Message Requests' cell to use the pinned background colour
Updated the fallback for contact thread names to be a middle-truncated string (4 characters either side)
 3 years ago
Morgan Pretty f8c0700ba0 Merge remote-tracking branch 'upstream/dev' into dev 3 years ago
Ryan Zhao c0615fe11d Merge branch 'dev' of https://github.com/oxen-io/session-ios into ipad-support-1 3 years ago
RyanZhao 6573610ee9
Merge pull request #559 from mpretty-cyro/feature/message-requests 
Message Requests Phase 1
 3 years ago
Morgan Pretty 028ba0c77a Merge branch 'dev' into feature/message-requests 
# Conflicts:
#	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
 3 years ago
Morgan Pretty c7196a96bc Merge remote-tracking branch 'upstream/dev' into dev 3 years ago
Morgan Pretty 819d5a39e1 Disabled the disappearing message settings for the recipient of a message request as well 3 years ago
Ryan Zhao b32a8cbab2 fix alert vc for iPad 3 years ago
Ryan Zhao a8c7f517eb clean 3 years ago
Ryan Zhao 24d8122d78 fix sharing UI for iPad 3 years ago