Commit Graph

16249 Commits (9216506847f08e93e5b7e4195dc0eae8be5681d3)
 

Author SHA1 Message Date
Morgan Pretty 9216506847 Merge branch 'dev' into feature/session-id-blinding-part-2
# Conflicts:
#	Session/Calls/Views & Modals/CallVideoView.swift
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/es.lproj/Localizable.strings
#	Session/Meta/Translations/fi.lproj/Localizable.strings
#	Session/Meta/Translations/fr.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/si.lproj/Localizable.strings
#	Session/Meta/Translations/sk.lproj/Localizable.strings
#	Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
#	Session/Meta/Translations/zh_CN.lproj/Localizable.strings
#	Session/Utilities/BackgroundPoller.swift
#	SessionSnodeKit/OnionRequestAPI.swift
#	SessionSnodeKit/SnodeAPI.swift
2 years ago
Morgan Pretty 4e471aadb0 Merge remote-tracking branch 'upstream/dev' into dev 2 years ago
Morgan Pretty 6b1fc0f552 Fixed an issue where I had 'whisperTo' and 'whisperMods' acting in a mutually exclusive way 2 years ago
RyanZhao 0bc8da87ae
Update README.md 2 years ago
ryanzhao 6b15db7437 update version & build number 2 years ago
RyanZhao 306a6aa2f1
Merge pull request #622 from RyanRory/authentication-1
Message sending & retrieving authentication
2 years ago
ryanzhao a337123cbb only update the harkfork version when it is increasing 2 years ago
Ryan Zhao 2a18c8e9c9 Merge branch 'dev' into authentication-1 2 years ago
RyanZhao 719248ba7d
Merge pull request #614 from RyanRory/bug-fixes-1.11.25
Bug fixes on 1.12.7
2 years ago
Ryan Zhao 510d7c22a2 fix background poller updating last hash issue. 2 years ago
Ryan Zhao 627aba1650 clean up duplicated code 2 years ago
Morgan Pretty 38bb6e79e2 Combined the Register/Unregister response objects in the PushNotificationAPI (they are identical) 2 years ago
ryanzhao dac3f10dd1 tweaks on closed group polling logic 2 years ago
ryanzhao b8ec4a8c7a exclude namespace in parameters if polling for 0 with no authentication 2 years ago
ryanzhao c46c75e4f0 clean 2 years ago
ryanzhao 86605dce08 update background poller for hardfork closed group message retrieve 2 years ago
ryanzhao 782d51c1d6 minor change on hardfork version check 2 years ago
ryanzhao 372e87e70f minor fix 2 years ago
ryanzhao 7cc887267f fix retrieve from default inbox 2 years ago
ryanzhao fb65173b06 poll closed group messages in both default namespace and closed group namespace 2 years ago
ryanzhao e540497724 update last hash persistence 2 years ago
ryanzhao 4224a1fa3c tweaks for sending message to snode 2 years ago
ryanzhao 15b954dbd6 persist hardfork info 2 years ago
ryanzhao 38523230cb update namespace 2 years ago
Ryan Zhao 9c535dcb1b update namespace number 2 years ago
Ryan Zhao 00c200d284 update translation 2 years ago
Ryan Zhao 034f2ecc22 send messages with authentication 2 years ago
Ryan Zhao 0b0f0a3787 retrieve messages authenticated for 1-1 chats 2 years ago
Ryan Zhao f48cdd02ee fix an issue where current call implementation won't compile for simulators 2 years ago
Morgan Pretty 4eaa8c4d36 Updated Nimble to the latest version
Fixed some flaky OpenGroupManager tests
2 years ago
Ryan Zhao f9bb1517a1 fix an issue where closed groups stop to be updated part 1 2 years ago
ryanzhao a12e86a36b fix an issue where new additions to group not appearing in mentions 2 years ago
ryanzhao eab9cf96ec fix an issue where in dark mode the share button outline is in wrong colour 2 years ago
Ryan Zhao bc9ff65659 fix for conversation screen title position with call button 2 years ago
Ryan Zhao 4da0ccdd44 fix an issue where current call implementation won't compile for simulators 2 years ago
Ryan Zhao 9c994ff176 Merge branch 'dev' into bug-fixes-1.11.25 2 years ago
Morgan Pretty 949b043867 Updated the unit tests to build with a host app (needed due to the x86_64 build requirement...)
Fixed the broken tests
2 years ago
Ryan Zhao 7b33c541a4 minor fix for conversation screen title position 2 years ago
Ryan Zhao 662ec71116 fix a dead lock on receiving message request approval 2 years ago
Morgan Pretty a154b56e22 Merge branch 'dev' into feature/session-id-blinding-part-2 2 years ago
Morgan Pretty cc495bccc1 Merge remote-tracking branch 'upstream/dev' into dev 2 years ago
Morgan Pretty 1c575e520d Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2
# Conflicts:
#	Podfile.lock
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/Views & Modals/JoinOpenGroupModal.swift
#	Session/Home/HomeVC.swift
#	Session/Open Groups/JoinOpenGroupVC.swift
#	Session/Utilities/BackgroundPoller.swift
#	SessionMessagingKit/Jobs/AttachmentUploadJob.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
#	SessionNotificationServiceExtension/NotificationServiceExtension.swift
2 years ago
Ryan Zhao 102a29b8e3 further fix for input view not scrollable issue 2 years ago
RyanZhao 75d922eb3a
Merge pull request #485 from oxen-io/voice-calls-2
P2P Voice/Video Calls
2 years ago
Ryan Zhao f95fe15d46 add session turn server info 2 years ago
Ryan Zhao 5bb287f258 fix an issue where rejected message requests will come back on linked devices 2 years ago
Ryan Zhao 8db281e42f hide disappearing message settings when current thread is blocked 2 years ago
Ryan Zhao d0764adaf3 ask formic permission when enabled call for the first time & update build number 2 years ago
Ryan Zhao ad575f6fb5 fix an issue where incoming call is not showed for non-voip notifications 2 years ago
Ryan Zhao 8821d796dd bump up build number 2 years ago