oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
9,002 Commits 5 Branches 133 Tags 227 MiB
Commit Graph

9002 Commits

Author SHA1 Message Date
Matthew Chen f0f25aa413 Merge remote-tracking branch 'origin/release/2.30.2' 2018-09-28 17:48:05 -04:00
Matthew Chen 5fc21bce96 "Bump build to 2.30.2.4." 2018-09-28 17:32:10 -04:00
Michael Kirk 39a73abcee update pods 2018-09-28 15:28:43 -06:00
Matthew Chen 26fadaf10e Merge branch 'charlesmchen/iOS9CustomBarButton' into release/2.30.2 2018-09-28 17:25:54 -04:00
Matthew Chen 9474a1bfcb Fix "broken settings button layout in iOS 9" issue. 2018-09-28 17:25:44 -04:00
Matthew Chen ea0aba1f99 Merge branch 'charlesmchen/unreadBadgeRound' into release/2.30.2 2018-09-28 17:25:06 -04:00
Matthew Chen 908d6dfd78 Ensure unread badges in home view are always at least a circle. 2018-09-28 16:41:51 -04:00
Matthew Chen b07de266c6 "Bump build to 2.30.2.3." 2018-09-28 15:43:35 -04:00
Michael Kirk c07147210c Merge branch 'mkirk/picker-bubble-preview' into release/2.30.2 2018-09-28 13:36:21 -06:00
Michael Kirk 56387f3574 demo conversation colors when selecting 2018-09-28 13:35:57 -06:00
Michael Kirk 06eae47e09 ConversationViewItem -> protocol 2018-09-28 12:58:33 -06:00
Matthew Chen f56ac96d31 "Bump build to 2.30.2.2." 2018-09-27 19:42:39 -04:00
Matthew Chen ebae75af00 Revert 'new sort id'. 2018-09-27 19:40:51 -04:00
Matthew Chen 673dae83d9 Bump build to 2.30.2.1. 2018-09-27 17:00:38 -04:00
Matthew Chen 69b805c390 "Bump build to 2.30.1.1." 2018-09-27 16:58:00 -04:00
Matthew Chen 64007e7d71 Merge branch 'charlesmchen/swiftExit' 2018-09-27 16:57:05 -04:00
Matthew Chen b076f14964 Swift exit(). 2018-09-27 16:56:54 -04:00
Matthew Chen 3c22d0b0c8 Swift exit(). 2018-09-27 16:56:54 -04:00
Matthew Chen 90e7d9fbb6 Update AxolotlKit. 2018-09-27 15:52:59 -04:00
Matthew Chen 2629f0114a Update tags_to_ignore. 2018-09-27 15:46:18 -04:00
Matthew Chen 1e82caed03 Remove dark theme feature flag. 2018-09-27 15:41:43 -04:00
Matthew Chen fbeb07d2e4 Fix build break. 2018-09-27 15:40:55 -04:00
Matthew Chen 2f1f7a8e22 Update cocoapods. 2018-09-27 15:38:41 -04:00
Matthew Chen 99766fe07b Update l10n strings. 2018-09-27 15:38:41 -04:00
Michael Kirk 6f9c99f99e Merge branch 'mkirk/color-picker' 2018-09-27 13:35:26 -06:00
Michael Kirk acd042c35a Sort conversation colors 2018-09-27 13:34:23 -06:00
Michael Kirk 4765ed9a06 Color picker 
TODO

-[x] tap to select/deselect
-[x] initially selected
-[x] integrate into conversation settings
-[x] colorPickerDelegate
-[x] translate strings
-[] reorder colors
-[x] SheetView: add top handle

Nice to have:

-[] SheetView: interactively swipe/unswipe to dismiss?
-[] preview color in bubbles
 2018-09-27 13:34:23 -06:00
Michael Kirk 95a6df6496 Generic SheetViewController 2018-09-27 13:34:23 -06:00
Matthew Chen 6b9133e5e6 Merge branch 'strings-audit' 2018-09-27 15:31:05 -04:00
Joshua Lund 97d0543cef String cleanup: 
* Made our Title Case usage a little more consistent.
* Standardized on the ellipses special character.
* Rephrased a few buttons and descriptions.
 2018-09-27 15:30:58 -04:00
Matthew Chen 57047e67e8 Merge branch 'mkirk/fix-hang-on-entry' 2018-09-27 15:29:07 -04:00
Michael Kirk e3e6c31612 fix hang on conversation load 2018-09-27 15:29:00 -04:00
Michael Kirk c05f9a4de8 update pods 2018-09-27 13:06:29 -06:00
Michael Kirk 79add78d51 Merge branch 'release/2.30.1' 2018-09-27 13:03:35 -06:00
Michael Kirk 58103060e8 Merge branch 'mkirk/wip-sort-id' into release/2.30.1 2018-09-27 12:51:45 -06:00
Matthew Chen 0298c35841 Merge branch 'charlesmchen/productionizeCDS2' 2018-09-27 13:57:45 -04:00
Matthew Chen bb5c9ff106 Respond to CR. 2018-09-27 13:56:07 -04:00
Matthew Chen c0f4254599 Mark CDS feature flag for removal. 2018-09-27 13:56:07 -04:00
Matthew Chen 0884598a3a Fix CDS cookie handling. 2018-09-27 13:56:07 -04:00
Matthew Chen c368aabf9c Fix the "de-register" logic. 2018-09-27 13:56:07 -04:00
Matthew Chen b10bf441c4 Add note about curl cookie support. 2018-09-27 13:56:07 -04:00
Matthew Chen 370c96af53 Enable CDS in contact intersection. 2018-09-27 13:56:07 -04:00
Matthew Chen 43d0b9b9bf Fix misnamed method. 2018-09-27 13:56:07 -04:00
Matthew Chen b6a14ea014 Fix the CDS version checking. 2018-09-27 13:56:07 -04:00
Matthew Chen bcb882f5aa Update CDS URLs. 2018-09-27 13:56:07 -04:00
Matthew Chen 7b056d624c Merge branch 'charlesmchen/crashAppGesture' 2018-09-27 12:34:45 -04:00
Matthew Chen 2ef878bfc9 Add crash gesture to about view. 2018-09-27 12:32:09 -04:00
Michael Kirk 3518d37c3e use autorelease pool in migration to avoid accumulating memory 2018-09-27 10:30:28 -06:00
Matthew Chen 469bb3fee2 Merge branch 'charlesmchen/conversationColorsClass' 2018-09-27 12:25:20 -04:00
Matthew Chen 2b75c4034d Pull out OWSConversationColor to its own file. 2018-09-27 12:24:14 -04:00