3812 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Daniel Supernault	796f8ca78c	Update ExportSettings controller	2019-07-19 21:37:37 -06:00
Daniel Supernault	00eefa24eb	Update compiled asets	2019-07-19 20:32:40 -06:00
Daniel Supernault	d87d1f8d58	Update ComposeModal, fixes #1527	2019-07-19 20:31:29 -06:00
Daniel Supernault	a60f167d49	Update AP Helpers	2019-07-18 22:08:39 -06:00
Daniel Supernault	8e942994d6	Update Inbox	2019-07-18 21:53:02 -06:00
Daniel Supernault	b14ad224ad	Update Media model	2019-07-18 21:52:37 -06:00
daniel	79f84b59d2	Merge pull request #1525 from Frinkel/patch-1 ... Remove Mastodon CoC message for custom-written community guidelines	2019-07-18 20:56:53 -06:00
Frinkeldoodle	23463a4472	Remove Mastodon CoC msg for custom guidelines ... When an admin makes their own Community Guidelines page through the page editor, the message stating "Originally adapted from the Mastodon Code of Conduct" still appears, which may no longer be accurate in such a scenario (as the admin has probably written their own community guidelines in that case.) This edit simply removes that line.	2019-07-18 22:39:28 -04:00
daniel	cc8d66c11b	Merge pull request #1524 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2019-07-18 19:43:02 -06:00
Daniel Supernault	b88d020818	Update config	2019-07-18 19:41:53 -06:00
Daniel Supernault	e313a9b0ca	Update config	2019-07-18 19:41:19 -06:00
daniel	973cdc5f18	Merge pull request #1520 from pixelfed/frontend-ui-refactor ... Update routes	2019-07-17 23:39:07 -06:00
Daniel Supernault	d95fa27e61	Update routes	2019-07-17 23:38:29 -06:00
daniel	7e1f1b20f4	Merge pull request #1519 from pixelfed/frontend-ui-refactor ... Update CollectionCompose.vue component	2019-07-17 23:36:31 -06:00
Daniel Supernault	832340b55a	Update compiled assets	2019-07-17 23:35:42 -06:00
Daniel Supernault	a472b5cab1	Update CollectionCompose.vue component	2019-07-17 23:34:28 -06:00
daniel	4230a5a6d1	Merge pull request #1518 from pixelfed/frontend-ui-refactor ... Update CollectionController	2019-07-17 23:28:42 -06:00
Daniel Supernault	031c93915e	Update CollectionController	2019-07-17 23:28:16 -06:00
daniel	be3f5976d5	Merge pull request #1517 from pixelfed/frontend-ui-refactor ... Update Collection model	2019-07-17 23:22:46 -06:00
Daniel Supernault	4b41f48972	Update Collection model	2019-07-17 23:22:17 -06:00
daniel	cb381f1f9b	Merge pull request #1516 from pixelfed/frontend-ui-refactor ... Update admin dashboard	2019-07-17 23:03:45 -06:00
Daniel Supernault	6751aa4ea6	Update admin dashboard	2019-07-17 23:00:34 -06:00
daniel	d007d9bcb4	Merge pull request #1515 from pixelfed/frontend-ui-refactor ... Update FederationController	2019-07-17 22:42:33 -06:00
Daniel Supernault	8e7f4000b6	Update FederationController	2019-07-17 22:42:04 -06:00
daniel	738f814d93	Merge pull request #1514 from pixelfed/frontend-ui-refactor ... Fix #1512	2019-07-17 21:33:48 -06:00
daniel	4ff26de873	Merge pull request #1513 from pixelfed/trwnh-fix-1512 ... Fix #1512	2019-07-17 21:32:58 -06:00
daniel	b9697d15d6	Merge pull request #1511 from pixelfed/frontend-ui-refactor ... Add Collections Feature	2019-07-17 21:23:20 -06:00
Daniel Supernault	e021ab9f2a	Bump version to v0.10.0	2019-07-17 21:22:14 -06:00
Daniel Supernault	5f97b03d66	Update compiled assets	2019-07-17 21:12:56 -06:00
Daniel Supernault	4ec7a53985	Update routes	2019-07-17 21:10:59 -06:00
Daniel Supernault	c391a281f3	Update Collection model	2019-07-17 21:10:42 -06:00
Daniel Supernault	6791d13fc5	Update CollectionController	2019-07-17 21:10:28 -06:00
Daniel Supernault	64926762f2	Update Profile model, add collections relation	2019-07-17 21:04:24 -06:00
Daniel Supernault	5623701642	Update Profile.vue component	2019-07-17 21:04:00 -06:00
trwnh	736fdeb858	Fix #1512	2019-07-17 21:47:09 -05:00
Daniel Supernault	354b5144ac	Update compiled assets	2019-07-17 20:25:40 -06:00
Daniel Supernault	0d120f5c38	Update CollectionController	2019-07-17 20:24:53 -06:00
Daniel Supernault	14bd847d4e	Update Profile.vue component	2019-07-17 20:24:25 -06:00
Daniel Supernault	bc51339e0c	Update CollectionCompose.vue component	2019-07-17 20:24:06 -06:00
Daniel Supernault	a86a1ae401	Add collection views	2019-07-17 20:08:56 -06:00
Daniel Supernault	de56ddd7b5	Update routes	2019-07-17 20:07:52 -06:00
Daniel Supernault	2cb3f8540a	Update compiled assets	2019-07-17 20:05:52 -06:00
Daniel Supernault	c1d8821bf4	Update webpack mix config	2019-07-17 19:10:08 -06:00
Daniel Supernault	ba0250a47c	Update ComposeModal.vue component	2019-07-17 19:03:46 -06:00
Daniel Supernault	2ddc4c3003	Update CollectionCompose.vue component	2019-07-17 19:03:17 -06:00
Daniel Supernault	26edd4f9e8	Update web routes	2019-07-17 18:56:34 -06:00
Daniel Supernault	0d7a0f2381	Add CollectionCompose.vue component	2019-07-17 18:37:06 -06:00
Daniel Supernault	e6d5dcd96b	Add collections.js	2019-07-16 20:14:57 -06:00
Daniel Supernault	8299553d81	Add CollectionComponent.vue	2019-07-16 20:14:16 -06:00
Daniel Supernault	281d9ac7e3	Update instance config	2019-07-16 20:13:14 -06:00