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 1bc6b0bdba Merge remote-tracking branch 'upstream/dev' into feature/theming 
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Message Cells/VisibleMessageCell.swift
#	Session/Home/HomeVC.swift
#	Session/Home/Message Requests/MessageRequestsViewController.swift
#	Session/Media Viewing & Editing/MediaTileViewController.swift
#	Session/Meta/AppDelegate.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/Onboarding/LandingVC.swift
#	SessionMessagingKitTests/_TestUtilities/MockGeneralCache.swift
 		2022-09-15 14:22:11 +10:00
..
Backups Merge branch 'remove-unused-code' into voice-calls-2 2022-04-04 11:08:54 +10:00
Calls Merge remote-tracking branch 'upstream/dev' into feature/theming 2022-09-15 14:22:11 +10:00
Closed Groups Fixed search performance, started styling in-conversaiton settings 2022-09-07 17:37:01 +10:00
Conversations Merge remote-tracking branch 'upstream/dev' into feature/theming 2022-09-15 14:22:11 +10:00
DMs Updated the conversation creation screens 2022-08-26 16:23:39 +10:00
Dependencies Remove SwiftCSV 2021-01-27 14:09:19 +11:00
Emoji update emoji names for searching 2022-09-01 11:23:50 +10:00
Home Merge remote-tracking branch 'upstream/dev' into feature/theming 2022-09-15 14:22:11 +10:00
Media Viewing & Editing Merge remote-tracking branch 'upstream/dev' into feature/theming 2022-09-15 14:22:11 +10:00
Meta Merge remote-tracking branch 'upstream/dev' into feature/theming 2022-09-15 14:22:11 +10:00
Notifications Merge remote-tracking branch 'upstream/dev' into feature/theming 2022-09-15 14:22:11 +10:00
Onboarding Merge remote-tracking branch 'upstream/dev' into feature/theming 2022-09-15 14:22:11 +10:00
Open Groups Updated the conversation creation screens 2022-08-26 16:23:39 +10:00
Path Updated the conversation creation screens 2022-08-26 16:23:39 +10:00
Settings Fixed a couple of bugs and did some more theming 2022-09-13 17:57:13 +10:00
Shared Did some more styling and fixed a few UI bugs 2022-09-14 18:32:23 +10:00
Sheets & Modals Did some more styling and fixed a few UI bugs 2022-09-14 18:32:23 +10:00
Utilities Fixed search performance, started styling in-conversaiton settings 2022-09-07 17:37:01 +10:00
.swiftlint.yml Fix target naming 2020-11-11 18:42:06 +11:00