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
6396 commits 5 branches 133 tags 218 MiB
Commit graph

6396 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Kirk 00327986d0 Merge branch 'mkirk/sync-protos' 2018-04-05 16:26:51 -04:00
Michael Kirk 2975d4d5d2 Sync with android protos 
// FREEBIE
 2018-04-05 16:26:18 -04:00
Matthew Chen 0106b1a429 Merge branch 'charlesmchen/quotedReplies4' 2018-04-05 15:04:09 -04:00
Matthew Chen c5d8a7cb38 Clean up ahead of PR. 2018-04-05 11:15:00 -04:00
Matthew Chen f6aa3f89b7 Clean up ahead of PR. 2018-04-05 10:58:55 -04:00
Matthew Chen ca4757b8d1 Clean up ahead of PR. 2018-04-05 10:57:51 -04:00
Matthew Chen c648812cf7 Update cocoapods. 2018-04-05 10:42:56 -04:00
Matthew Chen 71c5c3a4b7 Refine appearance of quoted reply message cells. 2018-04-05 10:39:07 -04:00
Matthew Chen 8a843f70e3 Refine the attachments in the quoted reply view. 2018-04-05 10:38:34 -04:00
Matthew Chen 214e3a9c4d Refine appearance of quoted reply message cells. 2018-04-05 10:38:34 -04:00
Matthew Chen 7fe83cbc42 Merge branch 'charlesmchen/quotedReplies3' 2018-04-05 10:36:08 -04:00
Matthew Chen 822aa64b14 Respond to CR. 2018-04-05 10:35:57 -04:00
Matthew Chen cac85508cc Refine appearance of quoted reply message cells. 2018-04-05 10:24:42 -04:00
Matthew Chen 7e921b7935 Refine appearance of quoted reply message cells. 2018-04-05 10:24:42 -04:00
Matthew Chen 08ba3852cd Refine appearance of quoted reply message cells. 2018-04-05 10:24:42 -04:00
Matthew Chen 5235f6eee9 Refine appearance of quoted reply message cells. 2018-04-05 10:24:42 -04:00
Matthew Chen d6f3df82ae Refine appearance of quoted reply message cells. 2018-04-05 10:24:42 -04:00
Matthew Chen c70f911f6f Refine appearance of quoted reply message cells. 2018-04-05 10:24:42 -04:00
Matthew Chen 6171505657 Refine appearance of quoted reply message cells. 2018-04-05 10:24:42 -04:00
Matthew Chen 10b4ade55a Refine appearance of quoted reply message cells. 2018-04-05 10:24:42 -04:00
Matthew Chen 3343b4ec58 Refine appearance of quoted reply message cells. 2018-04-05 10:24:42 -04:00
Matthew Chen dd36c945e4 Merge branch 'charlesmchen/attachmentEmojis' 2018-04-05 10:24:04 -04:00
Matthew Chen 2b3b08d7c5 Respond to CR. 2018-04-05 10:23:56 -04:00
Matthew Chen f230717b68 Modify attachment emojis. 2018-04-05 09:57:41 -04:00
Matthew Chen 2df54a5775 Merge branch 'charlesmchen/quotedRepliesVsOversizeText' 2018-04-05 09:57:09 -04:00
Matthew Chen 30403be9ba Respond to CR. 2018-04-05 09:56:58 -04:00
Matthew Chen 5a17c5609f Quote reply to oversize text. 2018-04-05 09:49:24 -04:00
Matthew Chen c0cdf0f5b4 Merge branch 'charlesmchen/fixupInteractions' 2018-04-05 09:48:51 -04:00
Matthew Chen 9b5db80f23 Respond to CR. 2018-04-05 09:48:41 -04:00
Matthew Chen a561bf5e22 Fix database conversion tests. 2018-04-05 09:36:52 -04:00
Matthew Chen 9085609087 Fix interaction initializers and tests. 2018-04-05 09:36:52 -04:00
Michael Kirk a6dbe5bf7a Merge branch 'mkirk/update-pods' 2018-04-04 12:37:41 -04:00
Michael Kirk eae2fa27b3 Update pods 
// FREEBIE
 2018-04-04 12:37:17 -04:00
Michael Kirk 6958598d08 Merge tag '2.23.1.1' 2018-04-04 11:15:37 -04:00
Michael Kirk 73dc22cc1a Merge branch 'mkirk/quote-authoring' 2018-04-04 11:14:50 -04:00
Michael Kirk b6409dd514 CR: formatting changes 
// FREEBIE
 2018-04-04 10:59:06 -04:00
Michael Kirk eb16043de6 simplify emoji, remove iconview 
// FREEBIE
 2018-04-04 10:59:05 -04:00
Michael Kirk b3b3fa64e7 Use "You" instead of Author name in quote 
// FREEBIE
 2018-04-04 10:59:05 -04:00
Michael Kirk 51eee90bb7 Remove unnecessary changes 
// FREEBIE
 2018-04-04 10:59:05 -04:00
Michael Kirk 52ea54ae64 Add thumbnail when available 
MVP

- [x] populate from menu
- [x] send quoted message

TODO

- [x] thumbnail
- [] paperclip icon showing for text message
- [] cancel button asset
- [] fonts
- [] colors
- [] adjust content inset/offset when showing quote edit

NICE TO HAVE

- [] animate presentation
- [] animate dismiss
- [] non-paperclip icon for generic attachments

// FREEBIE
 2018-04-04 10:59:05 -04:00
Michael Kirk bf401bad90 Send quoted messages 
MVP

- [x] populate from menu
- [x] send quoted message

TODO

- [] thumbnail
- [] paperclip icon showing for text message
- [] cancel button asset
- [] fonts
- [] colors
- [] adjust content inset/offset when showing quote edit

NICE TO HAVE

- [] animate presentation
- [] animate dismiss
- [] non-paperclip icon for generic attachments

// FREEBIE
 2018-04-04 10:59:04 -04:00
Michael Kirk d99054d895 Reply menu item 
MVP

- [x] populate from menu
- [] send quoted message

TODO

- [] thumbnail
- [] paperclip icon showing for text message
- [] cancel button asset
- [] fonts
- [] colors
- [] adjust content inset/offset when showing quote edit

NICE TO HAVE

- [] animate presentation
- [] animate dismiss
- [] non-paperclip icon for generic attachments

// FREEBIE
 2018-04-04 10:59:04 -04:00
Michael Kirk 6874a9e28e Convert to swift 
// FREEBIE
 2018-04-04 10:59:04 -04:00
Michael Kirk cfbbeca7ac WIP: QuotedMessagePreviewView 
MVP

- [] populate from menu
- [] send quoted message

TODO

- [] thumbnail
- [] paperclip icon showing for text message
- [] cancel button asset
- [] fonts
- [] colors
- [] adjust content inset/offset when showing quote edit

NICE TO HAVE

- [] animate presentation
- [] animate dismiss
- [] non-paperclip icon for generic attachments

// FREEBIE
 2018-04-04 10:59:03 -04:00
Michael Kirk 0a20eec4eb "Bump build to 2.23.1.1." 2018-04-04 10:44:05 -04:00
Michael Kirk a98834cc21 pull latest translations 
// FREEBIE
 2018-04-04 10:43:55 -04:00
Michael Kirk 5b55b9eab8 Merge branch 'charlesmchen/screenLockFix' into release/2.23.1 2018-04-04 10:41:33 -04:00
Matthew Chen 609e68e8bc Merge branch 'charlesmchen/quotedReplies2' 2018-04-04 10:31:03 -04:00
Matthew Chen 00a81355d6 Respond to CR. 2018-04-04 10:27:30 -04:00
Matthew Chen 445d38f72a Modify cells to show quoted messages. 2018-04-04 10:12:07 -04:00