Michael Kirk
|
3ff3779f17
|
CR: remove unnecessary assert
|
2018-11-07 10:12:50 -06:00 |
|
Matthew Chen
|
195c42b9c4
|
Merge branch 'charlesmchen/captionIndicators'
|
2018-11-07 11:12:20 -05:00 |
|
Matthew Chen
|
c7c02f03d1
|
Display caption indicators for media albums in conversation view.
|
2018-11-07 11:12:13 -05:00 |
|
Michael Kirk
|
db3e5f6084
|
Merge branch 'mkirk/multi-image-approval'
|
2018-11-07 10:09:49 -06:00 |
|
Michael Kirk
|
7cef41f8e2
|
Multi-approval
|
2018-11-07 10:09:21 -06:00 |
|
Matthew Chen
|
b519baf37d
|
Merge branch 'charlesmchen/typingIndicatorsVsSelf'
|
2018-11-07 11:08:31 -05:00 |
|
Matthew Chen
|
b7fd48ec40
|
Respond to CR.
|
2018-11-07 10:56:40 -05:00 |
|
Matthew Chen
|
9cdf8d06fd
|
Ignore typing indicators from self.
|
2018-11-07 10:56:19 -05:00 |
|
Matthew Chen
|
af85c09602
|
Merge branch 'charlesmchen/mediaGalleryCells4'
|
2018-11-07 10:54:31 -05:00 |
|
Matthew Chen
|
57de089118
|
Add support for album captions to models.
|
2018-11-07 10:54:17 -05:00 |
|
Matthew Chen
|
3816cb4bf4
|
Update proto schema to reflect album captions.
|
2018-11-07 10:54:17 -05:00 |
|
Matthew Chen
|
268c456d5d
|
Merge branch 'charlesmchen/mediaGalleryCellsDebug'
|
2018-11-07 09:56:56 -05:00 |
|
Matthew Chen
|
60c5a84dd2
|
Fix issues in media gallery cells; Improve debug galleries.
|
2018-11-07 09:56:49 -05:00 |
|
Matthew Chen
|
88a1186e4e
|
Restore XCode 9 compatability.
|
2018-11-07 09:56:17 -05:00 |
|
Matthew Chen
|
ada4bf5956
|
Merge branch 'charlesmchen/typingIndicatorFixes'
|
2018-11-07 08:51:50 -05:00 |
|
Matthew Chen
|
cdfd2779a3
|
Fix a couple small bugs in the typing indicators.
|
2018-11-06 17:21:24 -05:00 |
|
Matthew Chen
|
3f135e9f73
|
Merge branch 'charlesmchen/mediaGalleryCells'
|
2018-11-06 15:36:18 -05:00 |
|
Matthew Chen
|
5aa6467d20
|
Fix issues in media gallery cells.
|
2018-11-06 15:35:48 -05:00 |
|
Matthew Chen
|
f45693ec34
|
Respond to CR.
|
2018-11-06 15:34:18 -05:00 |
|
Matthew Chen
|
736d7c7351
|
Fix media gallery cell edge cases.
|
2018-11-06 15:23:09 -05:00 |
|
Matthew Chen
|
d538301632
|
Fix media gallery cell edge cases.
|
2018-11-06 15:23:09 -05:00 |
|
Matthew Chen
|
34e85dd90e
|
Fix media gallery cell edge cases.
|
2018-11-06 15:23:09 -05:00 |
|
Matthew Chen
|
ee3bdca336
|
Fix media gallery cell edge cases.
|
2018-11-06 15:23:09 -05:00 |
|
Matthew Chen
|
cfcb6cb15b
|
Clean up ahead of PR.
|
2018-11-06 15:23:09 -05:00 |
|
Matthew Chen
|
0c76e1c02d
|
Use ConversationMediaView to simplify media rendering in conversation view cells.
|
2018-11-06 15:23:09 -05:00 |
|
Matthew Chen
|
f2c0a6f7dd
|
Clean up ahead of PR.
|
2018-11-06 15:23:09 -05:00 |
|
Matthew Chen
|
c89bdd2a15
|
Modify MediaGalleryCellView to handle animated images and videos.
|
2018-11-06 15:23:09 -05:00 |
|
Matthew Chen
|
2c9a556786
|
Remove overzealous assert in ConversationViewModel.
|
2018-11-06 15:23:09 -05:00 |
|
Matthew Chen
|
cf057e3af3
|
Modify MediaGalleryCellView to handle still images.
|
2018-11-06 15:23:09 -05:00 |
|
Matthew Chen
|
ec6de40bd9
|
Modify MessageBubbleView to support media galleries.
|
2018-11-06 15:23:09 -05:00 |
|
Matthew Chen
|
0341f5dc2b
|
Modify ConversationViewItem to support media galleries.
|
2018-11-06 15:23:09 -05:00 |
|
Matthew Chen
|
f2c0985907
|
Add 'is valid media?' method.
|
2018-11-06 15:23:09 -05:00 |
|
Michael Kirk
|
a5c4d1b9ed
|
Merge branch 'mkirk/multi-image-send'
|
2018-11-05 22:24:15 -06:00 |
|
Michael Kirk
|
4c5d46e8f8
|
Custom photo picker, respects theme/call banner
- share GridViewCell
- Multiple image selection, with feature flag, cant currently approve multiple
|
2018-11-05 22:23:40 -06:00 |
|
Matthew Chen
|
c8ac66ff8f
|
"Bump build to 2.32.0.2."
|
2018-11-05 16:54:21 -05:00 |
|
Matthew Chen
|
dfc7b032b9
|
Merge branch 'charlesmchen/incrementalDiffOrdering'
|
2018-11-05 16:53:57 -05:00 |
|
Matthew Chen
|
2ca32fddcc
|
Preserve ordering in incremental diffs.
|
2018-11-05 16:53:39 -05:00 |
|
Matthew Chen
|
aa5e6b456e
|
Preserve ordering in incremental diffs.
|
2018-11-05 16:53:39 -05:00 |
|
Matthew Chen
|
5d6ff608c1
|
"Bump build to 2.32.0.1."
|
2018-11-05 16:28:38 -05:00 |
|
Matthew Chen
|
43eda866e2
|
Merge branch 'charlesmchen/appWillBecomeReady_'
|
2018-11-05 09:16:30 -05:00 |
|
Matthew Chen
|
1c7add2b8f
|
Respond to CR.
|
2018-11-05 09:16:17 -05:00 |
|
Matthew Chen
|
39c820b866
|
Distinguish 'app will/did become ready' events.
|
2018-11-05 09:04:57 -05:00 |
|
Matthew Chen
|
eb2e16872e
|
Distinguish 'app will/did become ready' events.
|
2018-11-05 09:04:57 -05:00 |
|
Matthew Chen
|
d338e00b1a
|
Merge branch 'charlesmchen/conversationViewModelStartupRace'
|
2018-11-05 09:02:40 -05:00 |
|
Matthew Chen
|
af249de681
|
Fix race in CVM startup.
|
2018-11-05 09:02:05 -05:00 |
|
Matthew Chen
|
4c98a200df
|
Merge branch 'charlesmchen/signalRecipientReloads' into release/2.31.0
|
2018-11-05 08:43:48 -05:00 |
|
Matthew Chen
|
1c21c31c2b
|
Fix failed reloads in SignalRecipient.
|
2018-11-05 08:43:16 -05:00 |
|
Michael Kirk
|
269fae21a4
|
Merge branch 'mkirk/bundle-update'
|
2018-11-02 11:41:08 -06:00 |
|
Michael Kirk
|
e9ac38b906
|
bundle update
|
2018-11-02 11:38:03 -06:00 |
|
Matthew Chen
|
65776cdaef
|
"Bump build to 2.32.0.0."
|
2018-11-02 13:19:55 -04:00 |
|