Commit Graph

920 Commits (c97b9308169f7da6375d78b7a04d8f8501ab1a6c)

Author SHA1 Message Date
Ryan ZHAO de0a3b0ee0 Merge branch 'dev' into onboarding 2 years ago
Ryan ZHAO 526172243b Merge branch 'dev' into onboarding 2 years ago
Ryan ZHAO 6dc5d3031b Merge branch 'dev' into message-detail-screen 2 years ago
Ryan ZHAO 028334a174 update build and version number for testing 2 years ago
Ryan ZHAO 10bc7d47f6 update build and version number for testing 2 years ago
Ryan ZHAO 1d043157e0 fix an issue where messages with quotes are truncated 2 years ago
Ryan ZHAO f5afdae646 Merge branch 'dev' into message-detail-screen 2 years ago
Ryan ZHAO 86ee0317ef implement contacts and global search tweaks 2 years ago
Ryan ZHAO 673170360d Merge branch 'dev' into onboarding 2 years ago
Morgan Pretty e1bb6de7d6 Merge remote-tracking branch 'upstream/dev' into feature/drop-yap-database-support
# Conflicts:
#	Podfile.lock
#	SessionMessagingKit/Database/Migrations/_003_YDBToGRDBMigration.swift
2 years ago
Morgan Pretty 2ee6c84199 Updated build number and feature flag timestamp 2 years ago
Morgan Pretty f528742752 Bumped build number and re-enabled feature flag 2 years ago
Ryan ZHAO da0a459e89 Merge branch 'disappearing-message-redesign' of https://github.com/RyanRory/loki-messenger-ios into disappearing-message-redesign 2 years ago
Ryan ZHAO d63f3a8bee fix disappearing message settings subtitle copy 2 years ago
Morgan Pretty 92299e92a9 Updated build number 2 years ago
Morgan Pretty 5ff9ae96c7 Updated build number 2 years ago
Morgan Pretty 8777d1b2d0 Updated build number 2 years ago
Ryan ZHAO 91760c00bb minor fix 2 years ago
Ryan ZHAO b2360d8e1a fix an issue where DaR messages are read on linked devices won't have correct expiration start time 2 years ago
Ryan ZHAO a4286212b4 imp: default contact list of global search screen 2 years ago
Ryan ZHAO d25783c4df Merge branch 'dev' into onboarding 2 years ago
Morgan Pretty 9951d5c75d Increased build & version number, removed ATS hack 2 years ago
Morgan Pretty 84492be016 Fixed build issues, removed invalid unit tests and missing copy 2 years ago
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
2 years ago
Ryan ZHAO ecd8083ebe WIP: refactor global search screen into SwiftUI 2 years ago
Ryan ZHAO 3ea127ab5e imp: customised search bar in SwiftUI 2 years ago
Ryan ZHAO 16b597e35a organize file 2 years ago
Ryan ZHAO 5aaf02180a clean 2 years ago
Ryan ZHAO c985d3b361 clean up 2 years ago
Ryan ZHAO ce50fd9265 ui: implement invite a friend screen with SwiftUI 2 years ago
Ryan ZHAO c5eb55d1e8 WIP: implement start new conversation screen with SwiftUI 2 years ago
Ryan ZHAO 9faf835617 ui: refactor QR code screen with SwiftUI and update QR code style 2 years ago
Ryan ZHAO 5eca31aaa2 refactor & clean 2 years ago
Morgan Pretty bac1f7b3a5 Increase build and version numbers 2 years ago
Morgan Pretty e1d6a9dfc1 Added a migration to recreate any invalid FTS tables 2 years ago
Morgan Pretty cbcdb9b37f Refactored AppContext and AppRediness to Swift 2 years ago
Ryan ZHAO 3667d304f2 Merge branch 'dev' into disappearing-message-redesign 2 years ago
Morgan Pretty f532496ee4 Increased build and version numbers 2 years ago
Morgan Pretty 60684bc977 Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/drop-yap-database-support 2 years ago
Ryan ZHAO 0d27bbed00 refactor quote view into SwiftUI and clean up UIKit quote view 2 years ago
ryanzhao 2a10ab208a clean up and implementation in message info screen 2 years ago
Ryan Zhao b9ba355008 WIP: refactor document view and voice message view 2 years ago
Ryan Zhao 83a64c5ca1 clean 2 years ago
Ryan Zhao 61df9e2cf1 refactor disappearing timer view from objc to swift 2 years ago
Ryan Zhao 809e0eb6e6 WIP: refactor document view to Swift UI 2 years ago
ryanzhao f603b422b0 Merge branch 'dev' into message-detail-screen
# Conflicts:
#	Session/Media Viewing & Editing/MediaInfoVC+MediaPreviewView.swift
#	SignalUtilitiesKit/Media Viewing & Editing/OWSVideoPlayer.swift
2 years ago
Ryan Zhao 01f202ac79 clean up 2 years ago
Ryan Zhao 45d2964bf1 Merge branch 'dev' into onboarding 2 years ago
ryanzhao 0632514d45 imp: updated recovery password screen 2 years ago
Morgan Pretty 12347c9f2f Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign
# Conflicts:
#	Session/Media Viewing & Editing/MediaDetailViewController.swift
2 years ago