1751 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Carly Ho	a4929efe5c	fix merge conflict	2018-12-30 10:46:38 -06:00
Carly Ho	036c31141f	Apply content-box box-sizing to avatars images; add object-fit: cover to post thumbnail image on comment pages	2018-12-30 10:41:07 -06:00
daniel	ed4b217b3e	Merge pull request #720 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2018-12-29 21:52:11 -07:00
Daniel Supernault	2d2c9a60f8	Fixes #719, add blind key rotation	2018-12-29 21:50:37 -07:00
Daniel Supernault	714e47f387	Add Accept validator/test	2018-12-29 16:56:39 -07:00
daniel	25f679b4db	Merge pull request #712 from pixelfed/frontend-ui-refactor ... Update RestrictedNames	2018-12-28 20:40:21 -07:00
Daniel Supernault	cfbd7d5a1a	Update RestrictedNames	2018-12-28 20:39:16 -07:00
daniel	0a0359f193	Merge pull request #711 from pixelfed/frontend-ui-refactor ... Update config	2018-12-28 20:26:57 -07:00
Daniel Supernault	a2a69c9d6c	Update config	2018-12-28 20:25:19 -07:00
daniel	44246143cb	Merge pull request #707 from pixelfed/frontend-ui-refactor ... Update AP Inbox	2018-12-27 22:56:08 -07:00
Daniel Supernault	1cca479fad	Update AP Inbox	2018-12-27 22:55:21 -07:00
daniel	1fde81ceec	Merge pull request #706 from pixelfed/frontend-ui-refactor ... Update Settings view, fix avatar upload bug	2018-12-27 22:51:06 -07:00
Daniel Supernault	88189360c6	Update Settings view, fix avatar upload bug	2018-12-27 22:50:09 -07:00
daniel	137788b00c	Merge pull request #705 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2018-12-27 21:37:16 -07:00
Daniel Supernault	ce6ba4cd4b	Bump version to 0.7.6	2018-12-27 21:36:11 -07:00
Daniel Supernault	8576392662	Update 2FA view	2018-12-27 21:35:24 -07:00
Daniel Supernault	3a38c7386b	Update AccountController, allow 2FA backup codes	2018-12-27 21:34:51 -07:00
Daniel Supernault	f7c1801ab8	Update web routes	2018-12-27 21:33:15 -07:00
Daniel Supernault	2eff42bd76	Update SecuritySettings Controller, add 2FA backup code regeneration	2018-12-27 21:32:50 -07:00
daniel	6c2ead0516	Merge pull request #698 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2018-12-27 01:18:06 -07:00
Daniel Supernault	2ab70f4344	Bump version to 0.7.5	2018-12-27 01:17:15 -07:00
daniel	b16ee2beba	Merge pull request #693 from hnrd/fix/php7.2 ... Build docker images on PHP 7.2 base image	2018-12-27 01:15:53 -07:00
daniel	4571a68891	Merge pull request #678 from EdwardBetts/spelling ... Correct spelling mistakes	2018-12-27 01:11:52 -07:00
daniel	cacaa6b721	Merge pull request #676 from cmho/274-add-comment-button ... [274] Add comment button to comment form where browser has 'Touch' event enabled	2018-12-27 01:07:34 -07:00
daniel	f8b13af194	Merge pull request #653 from Aditoo17/dev ... L10n: Update Czech translation	2018-12-27 01:02:46 -07:00
Daniel Supernault	3c63bc49cf	Update PublicApiController	2018-12-27 01:02:08 -07:00
daniel	35b78c9f31	Merge pull request #697 from pixelfed/frontend-ui-refactor ... Update web routes	2018-12-26 15:56:21 -07:00
Daniel Supernault	83f69409d6	Update web routes	2018-12-26 15:51:53 -07:00
hnrd	bc6256c28e	Require PHP < 7.3 for Pixelfed to work.	2018-12-26 20:51:47 +01:00
hnrd	1239fd17d6	pin docker images to PHP 7.2	2018-12-26 20:50:58 +01:00
daniel	bd11473f7a	Merge pull request #688 from pixelfed/frontend-ui-refactor ... Update FixUsername command	2018-12-26 00:52:22 -07:00
Daniel Supernault	69f745f0c0	Update FixUsername command	2018-12-26 00:51:43 -07:00
daniel	ddadf86eea	Merge pull request #687 from pixelfed/frontend-ui-refactor ... Update AP helpers	2018-12-25 23:56:51 -07:00
Daniel Supernault	03007b1754	Update AP helpers	2018-12-25 23:56:18 -07:00
daniel	77b0d36d49	Merge pull request #685 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2018-12-25 22:06:40 -07:00
Daniel Supernault	ee167f0f8c	Bump version to 0.7.4	2018-12-25 22:06:06 -07:00
Daniel Supernault	e2b782466d	Update helpers	2018-12-25 22:05:47 -07:00
daniel	b98c624562	Merge pull request #684 from pixelfed/frontend-ui-refactor ... Bump version to 0.7.3	2018-12-25 20:43:39 -07:00
Daniel Supernault	8c2fa76c7d	Bump version to 0.7.3	2018-12-25 20:43:02 -07:00
daniel	dd9d682dea	Merge pull request #683 from pixelfed/frontend-ui-refactor ... Update Timeline.vue, fix notification avatar bug	2018-12-25 19:41:46 -07:00
Daniel Supernault	310d427a34	Update Timeline.vue, fix notification avatar bug	2018-12-25 19:41:12 -07:00
daniel	a88b6e6b68	Merge pull request #682 from pixelfed/frontend-ui-refactor ... Update FederationController	2018-12-25 18:07:51 -07:00
Daniel Supernault	eaaf8fbcd7	Update FederationController	2018-12-25 18:07:32 -07:00
Daniel Supernault	fedcdb204d	Update FederationController	2018-12-25 18:06:12 -07:00
daniel	c837f5aea9	Merge pull request #681 from pixelfed/frontend-ui-refactor ... Update FederationController, fixes #680	2018-12-25 17:46:06 -07:00
Daniel Supernault	55ca00ba30	Update FederationController, fixes #680	2018-12-25 17:45:29 -07:00
daniel	e61e5f20e0	Merge pull request #679 from pixelfed/frontend-ui-refactor ... Fix AP fanout	2018-12-25 15:22:07 -07:00
Daniel Supernault	14d43ba845	Fix AP fanout	2018-12-25 15:21:25 -07:00
Edward Betts	94a1d7da90	Correct spelling mistakes	2018-12-25 21:59:32 +00:00
Carly Ho	bffaac1b08	Add comment button to comment form where browser has 'Touch' event enabled	2018-12-25 15:42:12 -06:00