oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
session-ios/Session
History
Morgan Pretty 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
 		2023-04-06 18:09:26 +10:00
..
Backups Merge branch 'remove-unused-code' into voice-calls-2 2022-04-04 11:08:54 +10:00
Calls Updated migration numbers as a result from merge and bug fixes 2023-03-15 15:27:01 +11:00
Closed Groups Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-04-06 18:09:26 +10:00
Conversations Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-04-06 18:09:26 +10:00
Dependencies Remove SwiftCSV 2021-01-27 14:09:19 +11:00
Emoji Further config util logic 2022-12-07 15:06:15 +11:00
Home Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-04-06 18:09:26 +10:00
Media Viewing & Editing Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-04-06 18:09:26 +10:00
Meta Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-04-06 18:09:26 +10:00
Notifications Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-04-06 18:09:26 +10:00
Onboarding Finished off a few remaining bits and pieces 2023-03-08 17:27:07 +11:00
Open Groups Fixed the QA issues and a few other bugs 2023-03-31 12:09:04 +11:00
Path Fixed the QA issues and a few other bugs 2023-03-31 12:09:04 +11:00
Settings Fixed issues raised during QA 2023-03-17 15:12:35 +11:00
Shared Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-04-06 18:09:26 +10:00
Utilities Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-04-06 18:09:26 +10:00
.swiftlint.yml Fix target naming 2020-11-11 18:42:06 +11:00