7536 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Daniel Supernault	3820122af2	Update CommentController, still allow muted users to comment on your posts	2019-07-20 20:55:10 -06:00
daniel	f105e28eae	Merge pull request #1536 from pixelfed/frontend-ui-refactor ... Update Profile.vue component, use vue-masonry for MomentUI	2019-07-20 20:50:47 -06:00
Daniel Supernault	272dabf449	Update compiled assets	2019-07-20 20:50:21 -06:00
Daniel Supernault	a454db8a29	Update Profile.vue component, use vue-masonry for MomentUI	2019-07-20 20:50:07 -06:00
Daniel Supernault	8a822c00a7	Update npm	2019-07-20 20:47:34 -06:00
daniel	b1dc74f760	Merge pull request #1535 from pixelfed/frontend-ui-refactor ... Fix regression in comment mutes/blocks	2019-07-20 20:12:25 -06:00
Daniel Supernault	8891b8bc17	Update compiled assets	2019-07-20 20:11:31 -06:00
Daniel Supernault	60e9d547ae	Fix regression in comment mutes/blocks	2019-07-20 20:09:46 -06:00
Daniel Supernault	2cd389e229	Update PostMenu, add missing methods	2019-07-20 19:56:20 -06:00
daniel	56af6ffb92	Merge pull request #1534 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2019-07-20 19:31:21 -06:00
Daniel Supernault	b7ce72972e	Update compiled assets	2019-07-20 19:30:55 -06:00
Daniel Supernault	4f45108734	Update Profile.vue	2019-07-20 19:29:41 -06:00
daniel	418a478109	Merge pull request #1533 from pixelfed/frontend-ui-refactor ... Fixes #1521	2019-07-20 19:22:27 -06:00
Daniel Supernault	a8fe297c2b	Fixes #1521	2019-07-20 19:21:50 -06:00
daniel	bb67fbaebc	Merge pull request #1532 from pixelfed/frontend-ui-refactor ... Update FederationController, fix nodeinfo stats	2019-07-20 14:53:22 -06:00
Daniel Supernault	02f002a02d	Update FederationController, fix nodeinfo stats	2019-07-20 14:52:50 -06:00
daniel	6ebb8004fd	Merge pull request #1531 from pixelfed/frontend-ui-refactor ... Update profile view	2019-07-19 23:09:51 -06:00
Daniel Supernault	0388732095	Update profile view	2019-07-19 23:09:31 -06:00
daniel	d3356e0265	Merge pull request #1530 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2019-07-19 23:08:38 -06:00
Daniel Supernault	6644c69366	Update AvatarController	2019-07-19 23:07:33 -06:00
Daniel Supernault	3603913f2a	Update ProfileController, show follow request on private profiles	2019-07-19 21:56:46 -06:00
Daniel Supernault	796f8ca78c	Update ExportSettings controller	2019-07-19 21:37:37 -06:00
daniel	0ed156102b	Merge pull request #1529 from pixelfed/frontend-ui-refactor ... Update ComposeModal, fixes #1527	2019-07-19 20:33:03 -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	1f8bff2729	Merge pull request #1526 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2019-07-18 22:23:45 -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