Morgan Pretty
|
661720a988
|
Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign
# Conflicts:
# Session.xcodeproj/project.pbxproj
# Session/Meta/Translations/ar.lproj/Localizable.strings
# Session/Meta/Translations/be.lproj/Localizable.strings
# Session/Meta/Translations/bg.lproj/Localizable.strings
# Session/Meta/Translations/bn.lproj/Localizable.strings
# Session/Meta/Translations/cs.lproj/Localizable.strings
# Session/Meta/Translations/da.lproj/Localizable.strings
# Session/Meta/Translations/de.lproj/Localizable.strings
# Session/Meta/Translations/el.lproj/Localizable.strings
# Session/Meta/Translations/en.lproj/Localizable.strings
# Session/Meta/Translations/eo.lproj/Localizable.strings
# Session/Meta/Translations/es-ES.lproj/Localizable.strings
# Session/Meta/Translations/fa.lproj/Localizable.strings
# Session/Meta/Translations/fi.lproj/Localizable.strings
# Session/Meta/Translations/fil.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/hu.lproj/Localizable.strings
# Session/Meta/Translations/id.lproj/Localizable.strings
# Session/Meta/Translations/it.lproj/Localizable.strings
# Session/Meta/Translations/ja.lproj/Localizable.strings
# Session/Meta/Translations/ko.lproj/Localizable.strings
# Session/Meta/Translations/ku.lproj/Localizable.strings
# Session/Meta/Translations/lt.lproj/Localizable.strings
# Session/Meta/Translations/lv.lproj/Localizable.strings
# Session/Meta/Translations/ne-NP.lproj/Localizable.strings
# Session/Meta/Translations/nl.lproj/Localizable.strings
# Session/Meta/Translations/no.lproj/Localizable.strings
# Session/Meta/Translations/pl.lproj/Localizable.strings
# Session/Meta/Translations/pt-BR.lproj/Localizable.strings
# Session/Meta/Translations/pt-PT.lproj/Localizable.strings
# Session/Meta/Translations/ro.lproj/Localizable.strings
# Session/Meta/Translations/ru.lproj/Localizable.strings
# Session/Meta/Translations/si-LK.lproj/Localizable.strings
# Session/Meta/Translations/sk.lproj/Localizable.strings
# Session/Meta/Translations/sl.lproj/Localizable.strings
# Session/Meta/Translations/sv-SE.lproj/Localizable.strings
# Session/Meta/Translations/th.lproj/Localizable.strings
# Session/Meta/Translations/tr.lproj/Localizable.strings
# Session/Meta/Translations/uk.lproj/Localizable.strings
# Session/Meta/Translations/vi.lproj/Localizable.strings
# Session/Meta/Translations/zh-CN.lproj/Localizable.strings
# Session/Meta/Translations/zh-TW.lproj/Localizable.strings
# SessionMessagingKit/Configuration.swift
# SessionUtilitiesKit/Database/Storage.swift
|
4 months ago |
|
Morgan Pretty
|
645c936fdd
|
Added an error modal if the voice recording fails to start
|
4 months ago |
Ryan ZHAO
|
490cde57ce
|
fix disappearing messages update control messages for legacy groups
|
6 months ago |
|
Ryan ZHAO
|
4ec1d730cd
|
remove previous logic for expiring control messages indicating disappearing messages turned off
|
6 months ago |
|
Ryan ZHAO
|
5d2a307d5e
|
WIP: update copies and implement following setting
|
6 months ago |
|
Morgan Pretty
|
b97c0955be
|
Copy tweak to better support localization
|
8 months ago |
|
Morgan Pretty
|
06f12a58b0
|
Change the 'Grant Camera Access' copy to 'Continue' at Apple's request
Updated translations again
|
8 months ago |
|
Morgan Pretty
|
cf159bdd77
|
Added a couple of missing strings
|
8 months ago |
|
Morgan Pretty
|
1d0733baa7
|
Added additional new disappearing messages strings
|
8 months ago |
|
Morgan Pretty
|
8fee4edf34
|
Updated to the latest translations from Crowdin
|
8 months ago |