Commit graph

7089 commits

Author SHA1 Message Date
Matthew Chen
8a76e778b5 Use websocket for sends. 2018-05-22 14:24:04 -04:00
Matthew Chen
5f1682deab Use websocket for sends. 2018-05-22 14:24:04 -04:00
Michael Kirk
fb3efe3647
Update ISSUE_TEMPLATE.md 2018-05-22 13:34:02 -04:00
Michael Kirk
57008b7ad8
Update ISSUE_TEMPLATE.md 2018-05-22 13:33:45 -04:00
Michael Kirk
f33a845f24
Update ISSUE_TEMPLATE.md 2018-05-22 13:32:39 -04:00
Michael Kirk
fbfa5e6dee
Update MAINTAINING.md 2018-05-22 13:21:54 -04:00
Joshua Lund
5d312220ab Update the contribution guidelines. 2018-05-22 13:19:09 -04:00
Matthew Chen
9155a82b65 "Bump build to 2.26.0.0." 2018-05-22 09:40:29 -04:00
Matthew Chen
d3d4157c2f Merge branch 'charlesmchen/callLifecycleEdgeCases' 2018-05-22 09:39:59 -04:00
Matthew Chen
1d8c642346 Respond to CR. 2018-05-22 09:39:46 -04:00
Matthew Chen
a5c42ecca8 Clean up ahead of CR. 2018-05-22 09:22:40 -04:00
Matthew Chen
f68f3cc53d Call lifecycle edge cases. 2018-05-22 09:22:40 -04:00
Matthew Chen
3967a5ab05 Call lifecycle edge cases. 2018-05-22 09:22:40 -04:00
Matthew Chen
6e0d92e039 Revert "Disable contact sharing."
This reverts commit cb603d0bad.
2018-05-18 16:17:39 -04:00
Matthew Chen
ff4c58cd64 "Bump build to 2.25.0.28." 2018-05-18 16:17:32 -04:00
Matthew Chen
efb0769c6f Disable contact sharing. 2018-05-18 16:17:25 -04:00
Matthew Chen
1ce304d054 "Bump build to 2.25.0.27." 2018-05-18 16:17:12 -04:00
Matthew Chen
a7aaa7f6be Merge branch 'charlesmchen/groupAvatarUpdates' 2018-05-18 16:17:03 -04:00
Matthew Chen
e2d9c1187a Fix "group avatar doesn't update after local change." 2018-05-18 15:37:38 -04:00
Matthew Chen
2f8b5b8ea2 Move app state check to main thread. 2018-05-18 13:23:10 -04:00
Matthew Chen
7254d92601 Revert "Disable contact sharing."
This reverts commit cb603d0bad.
2018-05-18 10:23:27 -04:00
Matthew Chen
0b6b80fead "Bump build to 2.25.0.26." 2018-05-18 10:23:10 -04:00
Matthew Chen
cb603d0bad Disable contact sharing. 2018-05-18 10:23:05 -04:00
Matthew Chen
4d20757943 "Bump build to 2.25.0.25." 2018-05-18 10:22:49 -04:00
Matthew Chen
cc1ccb7f9a Update l10n strings. 2018-05-18 10:22:39 -04:00
Michael Kirk
be5a80e657 Merge branch 'mkirk/disappearing-10deadcc' 2018-05-17 17:19:42 -04:00
Michael Kirk
c0ddcc7919 Only clean up messages while active
// FREEBIE
2018-05-17 16:49:12 -04:00
Michael Kirk
4080545d85 Merge branch 'mkirk/lowercase-contact-field-labels' 2018-05-17 16:45:47 -04:00
Michael Kirk
b1e06217b2 Consistently lower-case contact field headers
// FREEBIE
2018-05-17 16:45:44 -04:00
Matthew Chen
a48cc8d652 Merge branch 'charlesmchen/normalizeImageColorSpace' 2018-05-17 16:40:01 -04:00
Matthew Chen
0620cb60df Normalize image colorspace. 2018-05-17 16:31:04 -04:00
Matthew Chen
946240fb69 Merge branch 'charlesmchen/readVsVisible2' 2018-05-17 16:07:35 -04:00
Matthew Chen
692d0a7579 Don't mark messages as read if conversation view isn't 100% visible. 2018-05-17 16:07:23 -04:00
Matthew Chen
78de7a10f7 Don't mark messages as read if conversation view isn't 100% visible. 2018-05-17 16:07:23 -04:00
Michael Kirk
18f3bf535a Merge branch 'mkirk/phone-number-display-name' 2018-05-17 11:09:04 -04:00
Michael Kirk
c72d45dc91 Fall back to phone number for picker cell display name
// FREEBIE
2018-05-17 11:08:56 -04:00
Michael Kirk
8d1d62b610 Merge branch 'mkirk/profile-avatar-in-contact-picker' 2018-05-17 11:08:35 -04:00
Michael Kirk
2098ec570b Contact picker uses profile pic, when available.
// FREEBIE
2018-05-17 11:08:21 -04:00
Michael Kirk
87a25804d7 Merge branch 'mkirk/fix-send-with-no-number' 2018-05-17 10:00:24 -04:00
Michael Kirk
f2750d18c6 Don't send empty contact card with just avatar
// FREEBIE
2018-05-17 09:59:57 -04:00
Michael Kirk
ddcca73aa1 Merge branch 'mkirk/fix-localizations' 2018-05-17 09:59:26 -04:00
Michael Kirk
af8ddf7bf0 Use raw text when localization fails
// FREEBIE
2018-05-17 09:59:07 -04:00
Matthew Chen
7ccb2df331 Merge branch 'charlesmchen/contactShareAvatar' 2018-05-17 09:45:54 -04:00
Matthew Chen
db1c8fd9f3 Respond to CR. 2018-05-16 17:24:10 -04:00
Matthew Chen
c800ae381b Make contact share "bubble/card" reflect share contents. 2018-05-16 17:19:05 -04:00
Matthew Chen
f436fc19c2 Make contact share "bubble/card" reflect share contents. 2018-05-16 17:19:05 -04:00
Matthew Chen
3cdce13b44 Merge branch 'charlesmchen/sortGroupMembers' 2018-05-16 17:13:49 -04:00
Matthew Chen
2edabdbba4 Sort group members. 2018-05-16 17:13:42 -04:00
Matthew Chen
cbc27f1c30 Revert "Disable contact sharing."
This reverts commit 2b6b8c2f69.
2018-05-16 16:37:39 -04:00
Matthew Chen
762a03dace "Bump build to 2.25.0.24." 2018-05-16 16:37:25 -04:00