oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity
4254 commits 5 branches 133 tags 218 MiB
Commit graph

4254 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Chen 3eb4274937 Merge branch 'charlesmchen/capButtonTextSize' 2017-09-29 12:30:23 -04:00
Matthew Chen ffea39abd0 Cap the flat button text size. 
// FREEBIE
 2017-09-29 12:30:18 -04:00
Matthew Chen e5387a3971 Update l10n strings. 
// FREEBIE
 2017-09-29 12:30:00 -04:00
Matthew Chen d6d528d6fd Merge branch 'charlesmchen/listGroupMembers' 2017-09-29 12:28:09 -04:00
Matthew Chen b3da6a9774 Change the "group members" item name. 
// FREEBIE
 2017-09-29 10:39:57 -04:00
Michael Kirk 791613a3ee bump build 
// FREEBIE
 2017-09-29 10:25:09 -04:00
Michael Kirk 5706683dd3 sync translations 
// FREEBIE
 2017-09-29 10:24:47 -04:00
Matthew Chen 251d4968ae Merge branch 'charlesmchen/moreThreadSafety' 2017-09-29 10:16:51 -04:00
Matthew Chen c3dca21a69 More thread safety fixes. 
// FREEBIE
 2017-09-29 10:16:42 -04:00
Michael Kirk 8fbc996bca Merge branch 'mkirk/fix-rtl-bubbles' 2017-09-28 16:37:07 -04:00
Michael Kirk e2445e6ed2 Fix RTL bubbles in conversation and message detail view 
// FREEBIE
 2017-09-28 16:34:10 -04:00
Michael Kirk b2a38323b1 Merge branch 'mkirk/stricter-l10n-script' 2017-09-28 16:32:19 -04:00
Michael Kirk 09a457ee62 Check all preconditions up front 
// FREEBIE
 2017-09-28 16:32:13 -04:00
Michael Kirk 2b05326d73 bump build 
// FREEBIE
 2017-09-28 15:57:31 -04:00
Michael Kirk 549c39c6c8 sync latest translations 
// FREEBIE
 2017-09-28 15:57:10 -04:00
Michael Kirk 70f28d0486 Merge branch 'mkirk/bubble-metadata-view' 2017-09-28 15:34:19 -04:00
Michael Kirk c3bb8a0190 on main thread, per CR 
// FREEBIE
 2017-09-28 14:59:00 -04:00
Michael Kirk 5704bf1765 message bubbles for message detail view controller 
// FREEBIE
 2017-09-28 14:58:15 -04:00
Michael Kirk 0b73018c02 Merge branch 'mkirk/fix-notification-launch' 2017-09-28 14:55:28 -04:00
Michael Kirk 344903fa5b Show proper thread from notification 
// FREEBIE
 2017-09-28 14:55:13 -04:00
Matthew Chen 36d55fb7a5 Merge branch 'charlesmchen/fixMarkAsReadFromLinkedDevice' 2017-09-28 14:50:04 -04:00
Matthew Chen 65957c932d Respond to CR. 
// FREEBIE
 2017-09-28 14:49:58 -04:00
Matthew Chen 8b15dba4e7 Fix "mark as read on linked device". 
// FREEBIE
 2017-09-28 14:49:58 -04:00
Michael Kirk 08e3c6cc04 regenerate source l10n, replace lost JSQMVC strings 
// FREEBIE
 2017-09-28 14:48:01 -04:00
Matthew Chen b34076eeaf Merge branch 'charlesmchen/offMainThread' 2017-09-28 14:33:57 -04:00
Matthew Chen facbc56062 Move more work off the main thread. 
// FREEBIE
 2017-09-28 14:30:27 -04:00
Matthew Chen 9573e0e16d Move more work off the main thread. 
// FREEBIE
 2017-09-28 14:30:27 -04:00
Michael Kirk 80ae952716 Merge branch 'mkirk/fix-assert' 2017-09-28 13:12:13 -04:00
Michael Kirk e77a7e09bb Fix assert for empty thread 
// FREEBIE
 2017-09-28 13:06:29 -04:00
Matthew Chen 5faeed4d59 Fix breakage. 
// FREEBIE
 2017-09-28 10:26:10 -04:00
Matthew Chen f0021bb351 Merge branch 'charlesmchen/readReceiptsCopy' 2017-09-28 10:11:12 -04:00
Matthew Chen 3566ed8ded Update read receipts setting copy. 
// FREEBIE
 2017-09-28 10:11:03 -04:00
Matthew Chen 147f99f1ba Merge branch 'charlesmchen/reworkMessageMetadataView' 2017-09-28 10:10:08 -04:00
Matthew Chen 2dce0e9b1b Respond to CR. 
// FREEBIE
 2017-09-28 10:09:54 -04:00
Matthew Chen 26c8c4e1fa Rework message metadata view. 
// FREEBIE
 2017-09-28 10:06:50 -04:00
Matthew Chen de29b5a6ee Rework message metadata view. 
// FREEBIE
 2017-09-28 10:06:50 -04:00
Matthew Chen 29c4059049 Rework message metadata view. 
// FREEBIE
 2017-09-28 10:06:50 -04:00
Michael Kirk ca76af1feb Merge branch 'mkirk/remove-already-registered-button' 2017-09-28 09:47:53 -04:00
Michael Kirk 655598d0a3 remove existing account button 
// FREEBIE
 2017-09-28 09:47:44 -04:00
Matthew Chen cdd17c7699 Merge branch 'charlesmchen/outgoingMessagesFromLinkedDevices' 2017-09-28 09:18:59 -04:00
Matthew Chen 1df1144e43 Respond to CR. 
// FREEBIE
 2017-09-28 09:18:38 -04:00
Matthew Chen 33376f66d2 Simplify processing of messages from linked devices. 
// FREEBIE
 2017-09-27 20:41:12 -04:00
Matthew Chen 1a3b3b2c06 Merge branch 'charlesmchen/contactCellsInMessageMetadata' 2017-09-27 20:26:08 -04:00
Matthew Chen a231834a73 Use contact cells in message metadata view. 
// FREEBIE
 2017-09-27 20:25:02 -04:00
Matthew Chen 0b60b521c6 Merge branch 'charlesmchen/tweakReadReceiptsSetting' 2017-09-27 20:23:48 -04:00
Matthew Chen d6e8849248 Rework "send read receipts" setting. 
// FREEBIE
 2017-09-27 20:23:41 -04:00
Matthew Chen 6aec891771 Merge branch 'charlesmchen/silentMessages' 2017-09-27 20:20:15 -04:00
Matthew Chen 9b5affb390 Send silent messages where appropriate. 
// FREEBIE
 2017-09-27 17:13:29 -04:00
Matthew Chen cc2d08d036 Merge branch 'charlesmchen/messageDetailViewChanges_' 2017-09-27 16:52:46 -04:00
Matthew Chen d28a014e2d Respond to CR. 
// FREEBIE
 2017-09-27 16:52:31 -04:00