Morgan Pretty
|
8109a326cf
|
Merge remote-tracking branch 'upstream/dev' into feature/theming
# Conflicts:
# Session.xcodeproj/project.pbxproj
# Session/Closed Groups/NewClosedGroupVC.swift
# Session/Conversations/ConversationVC+Interaction.swift
# Session/Conversations/Message Cells/CallMessageCell.swift
# Session/Conversations/Views & Modals/JoinOpenGroupModal.swift
# Session/Home/HomeVC.swift
# Session/Home/New Conversation/NewDMVC.swift
# Session/Home/NewConversationButtonSet.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/Open Groups/JoinOpenGroupVC.swift
# Session/Open Groups/OpenGroupSuggestionGrid.swift
# Session/Settings/SettingsVC.swift
# Session/Shared/BaseVC.swift
# Session/Shared/OWSQRCodeScanningViewController.m
# Session/Shared/ScanQRCodeWrapperVC.swift
# Session/Shared/UserCell.swift
# SessionMessagingKit/Configuration.swift
# SessionShareExtension/SAEScreenLockViewController.swift
# SessionUIKit/Style Guide/Gradients.swift
# SignalUtilitiesKit/Media Viewing & Editing/OWSViewController+ImageEditor.swift
# SignalUtilitiesKit/Screen Lock/ScreenLockViewController.m
|
3 years ago |
Ryan Zhao
|
e7778725a5
|
feat: add close button on new conversation screens
|
3 years ago |
|
Ryan Zhao
|
ec8b9df3bb
|
minor tableview tweaks
|
3 years ago |
|
Ryan Zhao
|
52449d6522
|
minor colour adjustment
|
3 years ago |
|
Ryan Zhao
|
3e30ceb032
|
feat: long press to show copy on current user's public key label
|
3 years ago |
|
ryanzhao
|
e5c3c23e74
|
WIP: new closed group vc
|
3 years ago |
|
ryanzhao
|
df140584e7
|
feat: add tapping function for contacts in new conversation screen
|
3 years ago |
|
ryanzhao
|
2213a99330
|
ui: new conversation screen contacts table
|
3 years ago |
|
ryanzhao
|
39e2e052ee
|
WIP: implement sorting and grouping contacts
|
3 years ago |
|
ryanzhao
|
b2869b7538
|
refactor on layouts
|
3 years ago |
|
ryanzhao
|
8ad21ba089
|
add tap gesture
|
3 years ago |
|
ryanzhao
|
53e67adb1c
|
wip: new conversation menu screen
|
3 years ago |
|
ryanzhao
|
3d24c1526e
|
clean
|
3 years ago |