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

8983 Commits

Author SHA1 Message Date
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
Matthew Chen 5a99cd347f Pull out OWSConversationColor to its own file. 2018-09-27 12:24:14 -04:00
Matthew Chen c90c12702f Merge branch 'charlesmchen/conversationColorsFixBubbleSecondaryColor' 2018-09-27 12:22:57 -04:00
Matthew Chen 43dc362fc7 Fix secondary color within message bubbles. 2018-09-27 12:22:52 -04:00
Matthew Chen 4003e31852 Merge branch 'charlesmchen/conversationColorsDefaultContactAvatarAsset' 2018-09-27 12:22:20 -04:00
Matthew Chen 0e5f42defe Use new asset for default contact avatars. 2018-09-27 12:22:14 -04:00
Matthew Chen 1c1d305a71 Respond to CR. 2018-09-27 11:42:32 -04:00
Matthew Chen 8c6a396bd2 Merge branch 'charlesmchen/conversationColorsMapLegacyColors' 2018-09-27 11:26:30 -04:00
Matthew Chen 857cdf4368 Map the legacy conversation color names. 2018-09-27 11:26:21 -04:00
Matthew Chen 3c8639b8ad Merge branch 'charlesmchen/conversationColorsDefaultAvatarTextSize' 2018-09-27 11:25:25 -04:00
Matthew Chen ec0206ff01 Adapt text size of default avatars to avatar size. 2018-09-27 11:25:18 -04:00
Matthew Chen 05d4836c74 Merge branch 'charlesmchen/conversationColorsDefaultProfileAvatars' 2018-09-27 11:24:27 -04:00
Matthew Chen 6d14a1b472 Local profile default avatars should use steel background. 2018-09-27 11:24:20 -04:00
Matthew Chen 27488f078a Replace old "default profile avatar" icon with default avatar for local user. 2018-09-27 11:24:20 -04:00
Matthew Chen e4ab360716 Respond to CR. 2018-09-27 10:43:50 -04:00
Matthew Chen 2cb9de5ea3 Merge branch 'charlesmchen/converationColorsAppSettingsAvatar' 2018-09-27 10:26:54 -04:00
Matthew Chen b5c5d1c3ef Use local avatar as app settings button. 2018-09-27 09:53:40 -04:00
Matthew Chen 307a7ebf88 Merge branch 'charlesmchen/conversationColorsMediaShadows' 2018-09-27 09:52:59 -04:00
Matthew Chen cbaf40d4ce Respond to CR. 2018-09-27 09:52:12 -04:00
Matthew Chen d161e5ff3d Add inner shadows to media thumbnails. 2018-09-27 09:42:29 -04:00