3076 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
talon	768369866e	fix conflicts	2019-05-03 23:13:22 -04:00
talon	5ddcdc6c7a	review changes	2019-05-03 23:11:09 -04:00
ghost	4f7ae39807	Merge branch 'dev' into feat/double-tap-to-like	2019-05-03 15:23:03 -04:00
talon	ea9d5d9826	oops	2019-05-03 15:19:01 -04:00
talon	8645387657	add doubletap to like	2019-05-03 15:11:29 -04:00
daniel	af12a746fa	Merge pull request #1257 from pixelfed/frontend-ui-refactor ... Update compiled assets	2019-05-02 21:45:04 -06:00
Daniel Supernault	87376446fe	Update compiled assets	2019-05-02 21:44:40 -06:00
daniel	78b0fc8d7e	Merge pull request #1256 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2019-05-02 21:13:58 -06:00
Daniel Supernault	6273227e84	Update compiled assets	2019-05-02 21:12:55 -06:00
Daniel Supernault	de0fef8fa0	Update Timeline.vue	2019-05-02 21:11:28 -06:00
Daniel Supernault	e0b3866b41	Update npm deps	2019-05-02 21:10:24 -06:00
Daniel Supernault	7d56d27f94	Update components.js	2019-05-02 21:09:39 -06:00
daniel	da683569ae	Merge pull request #1255 from pixelfed/frontend-ui-refactor ... Add unit test	2019-05-02 12:45:58 -06:00
Daniel Supernault	a9072b3ad7	Add unit test	2019-05-02 12:42:18 -06:00
daniel	b6ce5484bd	Merge pull request #1254 from pixelfed/frontend-ui-refactor ... Fix RestrictedNames	2019-05-02 12:22:06 -06:00
Daniel Supernault	4eee2cc7c7	Fix RestrictedNames	2019-05-02 12:21:36 -06:00
daniel	758e8d5da2	Merge pull request #1246 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2019-05-01 23:08:42 -06:00
Daniel Supernault	79f5600847	Update compiled assets	2019-05-01 23:07:53 -06:00
Daniel Supernault	33416db853	Update sass	2019-05-01 23:07:13 -06:00
daniel	66688544bc	Merge pull request #1245 from pixelfed/frontend-ui-refactor ... Update RestrictedNames	2019-05-01 22:55:04 -06:00
Daniel Supernault	41929c09d4	Update RestrictedNames	2019-05-01 22:54:29 -06:00
daniel	546623eb5e	Merge pull request #1244 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2019-05-01 22:20:21 -06:00
Daniel Supernault	894ebeaaa7	Update compiled assets	2019-05-01 22:19:57 -06:00
Daniel Supernault	1fdb23995e	Update Timeline	2019-05-01 22:18:42 -06:00
Daniel Supernault	0b21d3f79e	Update NotificationCard	2019-05-01 22:18:22 -06:00
daniel	4620338e9a	Merge pull request #1242 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2019-05-01 14:54:45 -06:00
Daniel Supernault	8c13bed8ba	Update compiled assets	2019-05-01 14:54:11 -06:00
daniel	ec5f6067b0	Merge pull request #1239 from pixelfed/trwnh-filter-preview ... fit image to filter preview	2019-05-01 14:22:37 -06:00
daniel	8aa27b8864	Merge pull request #1238 from pixelfed/trwnh-invisible-arrows ... Add drop-shadow to next/prev arrows	2019-05-01 14:21:21 -06:00
daniel	8d86e74756	Merge pull request #1236 from pixelfed/trwnh-moment-container ... fix moment ui container sizing	2019-05-01 14:20:45 -06:00
daniel	eb65a8f602	Merge pull request #1234 from pixelfed/trwnh-fix-mobile-overlay ... fix info overlay on small layouts	2019-05-01 14:19:57 -06:00
daniel	ced7860e70	Merge pull request #1241 from pixelfed/frontend-ui-refactor ... Update composer.lock	2019-05-01 13:44:55 -06:00
Daniel Supernault	2387a33457	Update composer.lock	2019-05-01 13:25:07 -06:00
daniel	15bb322d37	Merge pull request #1240 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2019-05-01 12:16:07 -06:00
Daniel Supernault	92a1b05145	Fix CI regression	2019-05-01 12:11:40 -06:00
Daniel Supernault	97716cb3fa	Update CircleCI config	2019-05-01 12:09:05 -06:00
trwnh	4a0ae2ec43	fit image to filter preview ... image had weird aspect ratio before (fixed 100x60)	2019-05-01 06:18:43 -05:00
trwnh	51b64bed1a	Add drop-shadow to next/prev arrows ... white arrows on white bg is invisible, so add a simple black drop-shadow	2019-05-01 06:12:06 -05:00
trwnh	4506891a9f	fix moment ui container sizing	2019-05-01 03:33:40 -05:00
trwnh	29e67be45c	fix info overlay on small layouts ... one row is not enough space; use flex column instead	2019-05-01 02:15:02 -05:00
daniel	76e343f9e2	Merge pull request #1232 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2019-04-30 22:59:32 -06:00
Daniel Supernault	c253436808	Update compiled assets	2019-04-30 22:55:01 -06:00
Daniel Supernault	466f1e7f1b	Update composer.lock	2019-04-30 22:53:46 -06:00
Daniel Supernault	60ead2bab3	Update BaseApiController	2019-04-30 22:51:50 -06:00
Daniel Supernault	4b1ac4a6ef	Update config	2019-04-30 22:48:01 -06:00
Daniel Supernault	cddb88352b	Update AppServiceProvider	2019-04-30 22:44:20 -06:00
Daniel Supernault	64462cdb94	Add NotificationObserver	2019-04-30 22:41:38 -06:00
Daniel Supernault	b3a9587756	Add NotificationService	2019-04-30 22:40:15 -06:00
Daniel Supernault	21c900e493	Update Timeline.vue	2019-04-30 22:38:14 -06:00
Daniel Supernault	f093bf05a9	Update NotificationCard.vue	2019-04-30 22:37:53 -06:00