Commit graph

7473 commits

Author SHA1 Message Date
Matthew Chen
0b64ecf675 Respond to CR. 2018-06-20 14:46:24 -04:00
Matthew Chen
18a8efe1a9 Respond to CR. 2018-06-20 14:36:35 -04:00
Matthew Chen
6ca3688cd4 "Bump build to 2.27.0.0." 2018-06-19 12:58:05 -04:00
Matthew Chen
32336e38e1 Merge tag '2.26.0.26' 2018-06-15 11:47:23 -04:00
Matthew Chen
9b948141d0 "Bump build to 2.26.0.26." 2018-06-15 11:41:46 -04:00
Matthew Chen
d6b1c1ef0f Merge branch 'charlesmchen/autoLoadMoreOnAppear' into release/2.26.0 2018-06-15 11:40:58 -04:00
Matthew Chen
b5a836bf28 Shared ui db connection v. auto load more. 2018-06-15 11:38:47 -04:00
Matthew Chen
74358b73f5 Merge branch 'charlesmchen/unifyCellAndAvatarSizes' 2018-06-15 11:24:29 -04:00
Matthew Chen
7e1c0102b7 Unify the cell and avatar sizes. 2018-06-15 11:18:34 -04:00
Matthew Chen
647d80d79d Unify the cell and avatar sizes. 2018-06-15 11:15:21 -04:00
Matthew Chen
1acf51ea5c Unify the cell and avatar sizes. 2018-06-15 11:08:01 -04:00
Matthew Chen
261719e53b Unify the cell and avatar sizes. 2018-06-15 10:42:38 -04:00
Matthew Chen
834db55ef0 Merge branch 'mkirk/fix-debug-sync' 2018-06-15 10:28:16 -04:00
Michael Kirk
c48f2404a3 Fix overzealous assert
// FREEBIE
2018-06-15 10:28:07 -04:00
Michael Kirk
a346465db5 tune down logging
// FREEBIE
2018-06-15 10:28:07 -04:00
Matthew Chen
18c1f1ef31 Merge branch 'charlesmchen/searchOversizeText' 2018-06-15 10:03:36 -04:00
Matthew Chen
40e5bcc23f Respond to CR. 2018-06-15 10:03:15 -04:00
Matthew Chen
e8d0d9ecc0 Index oversize text for search. 2018-06-15 10:03:15 -04:00
Matthew Chen
a00df83b37 Merge branch 'charlesmchen/autoSizeContactCells' 2018-06-15 10:01:27 -04:00
Matthew Chen
c1e1a52695 Auto-size contact cells everywhere. 2018-06-15 10:01:16 -04:00
Matthew Chen
dd49c6225f Auto-size contact cells everywhere. 2018-06-15 10:01:16 -04:00
Matthew Chen
f8e785ef72 Merge tag '2.26.0.25' 2018-06-15 09:59:45 -04:00
Matthew Chen
67fe8531c0 "Bump build to 2.26.0.25." 2018-06-14 18:39:49 -04:00
Michael Kirk
72ff5d4c98 Merge branch 'mkirk/update-ui-db-to-latest' into release/2.26.0 2018-06-14 18:36:29 -04:00
Michael Kirk
a91b6b35e2 update UI DB to latest before showing CVC
// FREEBIE
2018-06-14 18:23:13 -04:00
Matthew Chen
8d078e0a11 Merge branch 'charlesmchen/filterIndexText' 2018-06-14 16:34:36 -04:00
Matthew Chen
c8f2201a37 Respond to CR. 2018-06-14 16:33:27 -04:00
Matthew Chen
527e2715d4 Elaborate the search tests. 2018-06-14 16:18:13 -04:00
Matthew Chen
5c42e4c59e Improve search query construction. 2018-06-14 16:18:13 -04:00
Matthew Chen
755d30254e Improve search query construction. 2018-06-14 16:18:13 -04:00
Matthew Chen
153f3fc0a5 Improve search query construction. 2018-06-14 16:18:13 -04:00
Matthew Chen
a51e9b78b0 Improve search query construction. 2018-06-14 16:18:13 -04:00
Matthew Chen
f5a5d84edc Filter search index text. 2018-06-14 16:18:13 -04:00
Matthew Chen
b5e0265758 Filter search index text. 2018-06-14 16:18:13 -04:00
Joshua Lund
80bada5267 Update the README. 2018-06-14 15:36:14 -04:00
Michael Kirk
6450b25106 Merge branch 'mkirk/disappear-group' 2018-06-14 15:34:38 -04:00
Michael Kirk
0a17246737 Don't use group name in message.
// FREEBIE
2018-06-14 15:21:24 -04:00
Michael Kirk
95b1dced18 add: messages in Book Club will disappear in 1 minute
Show different message when joining group with disappearing messages
2018-06-14 15:20:45 -04:00
Michael Kirk
0cf751d34f Newly added group members should have expire time
Send expire timer with group info updates and in group updates that add a user.
2018-06-14 15:20:45 -04:00
Michael Kirk
a9e5d43fc8 Merge branch 'mkirk/disappear' 2018-06-14 15:18:59 -04:00
Michael Kirk
74b741e9de Update timer
// FREEBIE
2018-06-14 15:18:42 -04:00
Matthew Chen
95ac17bb7e Merge tag '2.26.0.24' 2018-06-14 15:07:47 -04:00
Matthew Chen
4e6b84c502 Merge branch 'charlesmchen/syncMessageSendAsserts' 2018-06-14 15:07:22 -04:00
Matthew Chen
f9f931fc2d Fix assert around failing sync message sends. 2018-06-14 15:07:09 -04:00
Michael Kirk
9be88f74f4 Merge branch 'mkirk/localize-socket-timeout' 2018-06-14 13:20:27 -04:00
Michael Kirk
0f38f8e3eb localize socket timeout 2018-06-14 13:19:43 -04:00
Matthew Chen
84fa959160 "Bump build to 2.26.0.24." 2018-06-13 17:31:53 -04:00
Michael Kirk
b3308e4d33 Merge branch 'mkirk/callscreen-read' into release/2.26.0 2018-06-13 15:58:17 -04:00
Michael Kirk
0dec029a69 Don't mark as read when callscreen is active
// FREEBIE
2018-06-13 15:42:01 -04:00
Matthew Chen
c9064ce05c Merge branch 'charlesmchen/doubleScroll' 2018-06-13 15:32:03 -04:00