Ryan ZHAO
526172243b
Merge branch 'dev' into onboarding
1 year ago
Ryan ZHAO
86ee0317ef
implement contacts and global search tweaks
1 year ago
Ryan ZHAO
673170360d
Merge branch 'dev' into onboarding
1 year 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
1 year ago
Morgan Pretty
2ee6c84199
Updated build number and feature flag timestamp
1 year ago
Morgan Pretty
f528742752
Bumped build number and re-enabled feature flag
1 year ago
Ryan ZHAO
da0a459e89
Merge branch 'disappearing-message-redesign' of https://github.com/RyanRory/loki-messenger-ios into disappearing-message-redesign
1 year ago
Ryan ZHAO
d63f3a8bee
fix disappearing message settings subtitle copy
1 year ago
Morgan Pretty
92299e92a9
Updated build number
1 year ago
Morgan Pretty
5ff9ae96c7
Updated build number
1 year ago
Morgan Pretty
8777d1b2d0
Updated build number
1 year ago
Ryan ZHAO
91760c00bb
minor fix
1 year ago
Ryan ZHAO
b2360d8e1a
fix an issue where DaR messages are read on linked devices won't have correct expiration start time
1 year ago
Ryan ZHAO
a4286212b4
imp: default contact list of global search screen
1 year ago
Ryan ZHAO
d25783c4df
Merge branch 'dev' into onboarding
1 year ago
Morgan Pretty
9951d5c75d
Increased build & version number, removed ATS hack
1 year ago
Morgan Pretty
84492be016
Fixed build issues, removed invalid unit tests and missing copy
1 year 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
1 year ago
Ryan ZHAO
ecd8083ebe
WIP: refactor global search screen into SwiftUI
1 year ago
Ryan ZHAO
3ea127ab5e
imp: customised search bar in SwiftUI
1 year ago
Ryan ZHAO
16b597e35a
organize file
1 year ago
Ryan ZHAO
5aaf02180a
clean
1 year ago
Ryan ZHAO
c985d3b361
clean up
1 year ago
Ryan ZHAO
ce50fd9265
ui: implement invite a friend screen with SwiftUI
1 year ago
Ryan ZHAO
c5eb55d1e8
WIP: implement start new conversation screen with SwiftUI
1 year ago
Ryan ZHAO
9faf835617
ui: refactor QR code screen with SwiftUI and update QR code style
1 year ago
Ryan ZHAO
5eca31aaa2
refactor & clean
1 year ago
Morgan Pretty
bac1f7b3a5
Increase build and version numbers
1 year ago
Morgan Pretty
e1d6a9dfc1
Added a migration to recreate any invalid FTS tables
1 year ago
Morgan Pretty
cbcdb9b37f
Refactored AppContext and AppRediness to Swift
1 year ago
Ryan ZHAO
3667d304f2
Merge branch 'dev' into disappearing-message-redesign
1 year ago
Morgan Pretty
f532496ee4
Increased build and version numbers
1 year ago
Morgan Pretty
60684bc977
Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/drop-yap-database-support
1 year ago
Ryan Zhao
83a64c5ca1
clean
1 year ago
Ryan Zhao
61df9e2cf1
refactor disappearing timer view from objc to swift
1 year 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
Morgan Pretty
de7d85f4cb
Merge remote-tracking branch 'upstream/dev' into fix/media-interactions
2 years ago
Morgan Pretty
a6931bb922
Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign
...
# Conflicts:
# Session.xcodeproj/project.pbxproj
# Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
# Session/Conversations/Settings/ThreadSettingsViewModel.swift
# Session/Shared/SessionTableViewController.swift
# Session/Shared/SessionTableViewModel.swift
# Session/Shared/Types/SessionTableSection.swift
# SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
# SessionUIKit/Components/SessionButton.swift
2 years ago
Morgan Pretty
89b38dc2f5
Merge pull request #928 from mpretty-cyro/fix/blocked-contacts-crash
...
Fixed a crash on the blocked contacts screen and refactoring
2 years ago
Morgan Pretty
bd98db2612
Fixed a few bugs and crashes around media interactions
...
Fixed a crash when trying to grant permission to access additional photos
Fixed a bug where audio files would incorrectly get recognised as voice messages
Replaced our custom video/audio players with the native ones (which have additional built-in controls)
Updated the errors from SSKKeychainStorage to include useful information
Updated layout for audio attachments
2 years ago
Morgan Pretty
f97170fdcd
Fixed a crash on the blocked contacts screen and refactoring
...
Refactored the SessionThreadViewModel to reduce boilerplate and clean up the interface a little
Refactored the MessageRequestsViewController to use the SessionTableViewController
Fixed a crash when returning from the background on the BlockedContactsViewModel
Fixed some minor lag on the NotificationSoundViewModel
Added an optional initial loading message to the SessionTableViewController
2 years ago
Morgan Pretty
085a1a59aa
Fixed an issue where the messages might not get reprocessed when they should
...
Dropped the auto-incrementing id from the SnodeReceivedMessageInfo
Changed the 'key, hash' from a uniqueKey to a primaryKey to allow "upsert" behaviours to work
2 years ago
Morgan Pretty
e43ec1db43
Removed another random deleted file reference from the pbxproj
2 years ago
Morgan Pretty
88fd134228
Removed some invalid references
2 years ago
Morgan Pretty
18b296bcd8
Merge branch 'disappearing-message-redesign' into feature/drop-yap-database-support
...
# Conflicts:
# Session.xcodeproj/project.pbxproj
# Session/Meta/AppDelegate.swift
# Session/Meta/Translations/de.lproj/Localizable.strings
# Session/Meta/Translations/es-ES.lproj/Localizable.strings
# Session/Meta/Translations/fi.lproj/Localizable.strings
# Session/Meta/Translations/fr.lproj/Localizable.strings
# Session/Meta/Translations/it.lproj/Localizable.strings
# Session/Meta/Translations/ja.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/sk.lproj/Localizable.strings
# Session/Meta/Translations/zh-CN.lproj/Localizable.strings
# Session/Meta/Translations/zh-TW.lproj/Localizable.strings
# SessionMessagingKit/Database/LegacyDatabase/SMKLegacy.swift
# SessionMessagingKit/Database/Migrations/_003_YDBToGRDBMigration.swift
# SessionMessagingKit/Messages/Control Messages/ConfigurationMessage.swift
# SessionSnodeKit/Database/LegacyDatabase/SSKLegacy.swift
# SessionSnodeKit/Database/Migrations/_003_YDBToGRDBMigration.swift
# SessionUtilitiesKit/Database/LegacyDatabase/SUKLegacy.swift
# SessionUtilitiesKit/Database/Migrations/_003_YDBToGRDBMigration.swift
2 years ago
Morgan Pretty
90cd3fb5e0
Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign
...
# Conflicts:
# _SharedTestUtilities/MockJobRunner.swift
2 years ago
Morgan Pretty
ed33e1f2e2
Merge remote-tracking branch 'upstream/dev' into fix/blocked-contacts-issues
2 years ago