Matthew Chen
acd97602ca
Respond to CR.
2018-12-11 10:46:01 -05:00
Matthew Chen
48bd0cfa06
Add missing retains to promises.
2018-12-11 10:43:47 -05:00
Matthew Chen
222e07c5bd
Merge branch 'charlesmchen/moreBackupFeatureFlag'
2018-12-11 10:42:56 -05:00
Matthew Chen
15653498b7
Apply backup feature flag.
2018-12-11 10:05:18 -05:00
Michael Kirk
f68c410bcf
"Bump build to 2.33.0.5."
2018-12-10 13:21:25 -07:00
Michael Kirk
af25225169
Merge branch 'mkirk/order-photo-collections'
2018-12-10 13:13:49 -07:00
Michael Kirk
ff45070219
Optimize album ordering - remove unnecessary albums
2018-12-10 13:13:28 -07:00
Michael Kirk
7f1791b2fd
Sync translations
2018-12-10 13:11:52 -07:00
Michael Kirk
a50541009a
Merge branch 'mkirk/album-design-tweaks'
2018-12-10 12:48:21 -07:00
Michael Kirk
1ab0daeb9b
just a bit faster
2018-12-10 12:00:54 -07:00
Michael Kirk
ed12a74ccf
album picker design tweaks
2018-12-10 11:59:44 -07:00
Michael Kirk
1fecdd1324
Merge branch 'mkirk/collection-presentation'
2018-12-10 11:59:24 -07:00
Michael Kirk
3e032f55cd
clear selectedIds in sync with deselection
2018-12-10 10:25:41 -07:00
Michael Kirk
d85350bf8f
remain in "multiselect" mode after switching PhotoCollection
2018-12-10 10:12:32 -07:00
Michael Kirk
e776a2410c
update comment per code review
2018-12-10 10:07:01 -07:00
Michael Kirk
6556a3173c
Don't extend PhotoCollection picker beneath navbar
2018-12-10 10:06:10 -07:00
Michael Kirk
2eb2c2856b
fix conversation input appearing over image picker
2018-12-10 10:06:10 -07:00
Michael Kirk
6a61d660b4
Don't show "selected" badge unless in batch mode (per myles)
2018-12-10 10:06:10 -07:00
Michael Kirk
ac7e2f76d6
Properly handle external library changes, avoid overzealous deselect
2018-12-10 10:06:10 -07:00
Michael Kirk
82d49350ef
properly deselect items when switching collections
2018-12-10 10:06:10 -07:00
Michael Kirk
635401dc5e
Hide "Select" button while album chooser presented
...
TODO:
-[x] establish parent/child relation
-[x] reconcile changes with collection picker delegate
-[x] present/dismiss animation
-[x] animate title label
-[x] hide (some?) bar button items when collection picker presented
Nice to have:
-[] crop child view top - so that it comes *up to* the navbar bottom, but
doesn't go behind
2018-12-10 10:06:10 -07:00
Michael Kirk
5490f07bb9
Animate title chevron
...
TODO:
-[x] establish parent/child relation
-[x] reconcile changes with collection picker delegate
-[x] present/dismiss animation
-[x] animate title label
-[] hide (some?) bar button items when collection picker presented
Nice to have:
-[] crop child view top - so that it comes *up to* the navbar bottom, but
doesn't go behind
2018-12-10 10:06:10 -07:00
Michael Kirk
caf0020697
Present CollectionPicker as child view
...
TODO:
-[x] establish parent/child relation
-[x] reconcile changes with collection picker delegate
-[x] present/dismiss animation
-[] animate title label
-[] hide (some?) bar button items when collection picker presented
Nice to have:
-[] crop child view top - so that it comes *up to* the navbar bottom, but
doesn't go behind
2018-12-10 10:06:10 -07:00
Michael Kirk
083d587ef0
WIP: Present CollectionPicker as child view
...
-[x] establish parent/child relation
-[x] reconcile changes with collection picker delegate
-[] present/dismiss animation
-[] animate title label
-[] hide (some?) bar button items when collection picker presented
2018-12-10 10:06:10 -07:00
Michael Kirk
0e1a65446f
WIP: Present CollectionPicker as child view
...
-[x] establish parent/child relation
-[] reconcile changes with collection picker delegate
-[] present/dismiss animation
-[] animate title label
2018-12-10 10:06:10 -07:00
Michael Kirk
f3b52945f7
Merge branch 'mkirk/video-thumbnails'
2018-12-10 10:05:35 -07:00
Michael Kirk
858ba6ef37
fix missing video thumbnails in approval view
2018-12-10 10:05:28 -07:00
Michael Kirk
d77d968bfd
Merge branch 'mkirk/remove-overzealous-assert'
2018-12-10 10:04:46 -07:00
Michael Kirk
78e963404a
remove overzealous assert, since we now sometimes post notification without threadId
2018-12-10 10:04:40 -07:00
Michael Kirk
d29763acf2
Merge branch 'mirk/attachment-approval-placeholder'
2018-12-10 10:04:10 -07:00
Michael Kirk
3e48ed105d
keyboard is always dark in attachment approval
2018-12-10 10:04:01 -07:00
Michael Kirk
2f92995cd6
Add placeholder text to message input field
2018-12-10 10:04:01 -07:00
Michael Kirk
800994f106
Merge branch 'mkirk/fix-draft-scrolling'
2018-12-10 10:03:15 -07:00
Michael Kirk
52e21be656
fix draft scrolling
2018-12-10 10:03:01 -07:00
Matthew Chen
19d76ac95d
Merge branch 'charlesmchen/conversationViewScrollDown'
2018-12-10 09:24:32 -05:00
Matthew Chen
00c6ed2f3c
Tweak scroll down animation behavior in conversation view.
2018-12-10 09:24:18 -05:00
Matthew Chen
6f6ce86abd
Merge branch 'charlesmchen/cloudKitNotificationThreadSafety'
2018-12-10 09:22:58 -05:00
Matthew Chen
734cc22cb3
Fix thread safety around CloudKit notifications.
2018-12-10 09:22:45 -05:00
Matthew Chen
d5b2b2cdd3
Merge branch 'charlesmchen/lazyRestoreVsAppReadiness'
2018-12-07 16:46:22 -05:00
Matthew Chen
c646dbc560
Deconflict lazy restore and app readiness.
2018-12-07 16:46:13 -05:00
Matthew Chen
0b03f275e2
Merge branch 'charlesmchen/refineConversationDeleteAndArchive'
2018-12-07 16:45:45 -05:00
Matthew Chen
02c7a52a64
Refine conversation delete/archive.
2018-12-07 16:45:33 -05:00
Michael Kirk
9eb0c5e773
Merge branch 'release/2.32.0'
2018-12-07 14:33:22 -05:00
Michael Kirk
d0f68177f1
"Bump build to 2.32.0.23."
2018-12-07 13:44:32 -05:00
Michael Kirk
1328191a19
log transcript timestamp
2018-12-07 13:44:22 -05:00
Michael Kirk
eb96eec94a
Merge branch 'release/2.32.0'
2018-12-07 09:55:43 -05:00
Matthew Chen
faa6b3e4a5
Merge branch 'charlesmchen/timerIcons'
2018-12-07 09:15:11 -05:00
Matthew Chen
92ed5f54a4
Update timer icons.
2018-12-07 09:14:56 -05:00
Matthew Chen
d48cc08237
Merge branch 'charlesmchen/darkThemeVsMediaDownloads'
2018-12-07 09:12:44 -05:00
Matthew Chen
b88416a931
Apply dark theme changes to media downloads.
2018-12-07 09:12:31 -05:00
