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/Meta
History
Morgan Pretty 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
 		2023-05-18 17:34:25 +10:00
..
AudioFiles add silence audio file 2022-08-17 14:19:14 +10:00
Certificates Updated the certificate for seed3 2023-05-18 08:50:03 +10:00
Countries Improve onion request path loading efficiency 2021-01-27 16:14:35 +11:00
Fonts Fix missing font 2021-05-25 09:04:22 +10:00
Images.xcassets Merge pull request #851 from mpretty-cyro/feature/updated-profile-picture-modal 2023-05-18 15:23:11 +10:00
Mnemonic Debug 2020-11-12 13:54:59 +11:00
Settings.bundle Further refactoring work 2022-12-07 15:54:17 +11:00
Translations Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
TurnServers add session turn server info 2022-04-26 10:57:01 +10:00
AppDelegate.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
AppEnvironment.swift Further config util logic 2022-12-07 15:06:15 +11:00
Launch Screen.storyboard Updated the app settings screens 2022-08-17 10:51:14 +10:00
MainAppContext.h Re-organize files 2021-01-12 11:05:52 +11:00
MainAppContext.m Further config util logic 2022-12-07 15:06:15 +11:00
Session-Info.plist Updated permission descriptions to appease Apple 2023-04-19 10:41:07 +10:00
SessionApp.swift Cleaned up a bunch of code, added pinned and hidden handling 2023-03-02 17:52:37 +11:00
Signal-Bridging-Header.h Added in missing code changes unrelated to closed groups rebuild 2022-12-08 14:21:38 +11:00
Signal.entitlements Removed the iCloud entitlements 2023-04-17 08:44:09 +10:00
SignalTSan.supp Organize files 2020-11-12 08:48:41 +11:00
SignalUBSan.supp Organize files 2020-11-12 08:48:41 +11:00