9013 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Kirk	1fb4ca9994	Merge branch 'mkirk/color-picker-tweaks' into release/2.30.2	2018-10-02 09:51:27 -06:00
Michael Kirk	dcb65854eb	More scaleable across device sizes.	2018-10-02 09:49:37 -06:00
Michael Kirk	bdb5bd5596	minimize diff	2018-10-02 09:49:37 -06:00
Michael Kirk	375c8bee04	Use stand accessoryView mechanics	2018-10-02 09:49:37 -06:00
Michael Kirk	5127352f7a	update color picker cell per design	2018-10-02 09:49:37 -06:00
Michael Kirk	8faf8668bd	lighter sheetview handle for dark theme	2018-10-02 09:49:37 -06:00
Michael Kirk	bbbc5bbb83	update copy per myles	2018-10-02 09:49:37 -06:00
Michael Kirk	043b0c8359	swipe to dismiss sheet view	2018-10-02 09:49:37 -06:00
Michael Kirk	17ad905f2d	Merge branch 'mkirk/fix-multiple-review-requests' into release/2.30.2	2018-10-02 08:29:46 -06:00
Michael Kirk	7805e00441	work around multiple review's appearing	2018-10-02 08:29:29 -06:00
Michael Kirk	eac0c8e355	Merge branch 'mkirk/color-update-delay' into release/2.30.2	2018-10-02 08:28:22 -06:00
Michael Kirk	006021ea41	Fix: group color change doesn't immediately apply ... Because we were fetching a new thread instance, instead of updating the existing thread instance, classes which were bound to the old thread instance weren't updating. This affected the HeaderView.AvatarView.thread and the ConversationStyle.thread.	2018-10-01 17:06:09 -06: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