960 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
daniel	6af6e3d5c6	Merge pull request #310 from OpenAlgeria/dev ... French Translate update	2018-08-09 15:44:00 -06:00
daniel	d2a2a2d260	Merge pull request #306 from Quenty31/dev ... [i18n] Update Occitan translation	2018-08-09 15:40:15 -06:00
daniel	ed7b85faee	Merge pull request #305 from fediverse-pl/dev ... i18n: Update Polish translation	2018-08-09 15:39:42 -06:00
daniel	4e87c1971b	Merge pull request #303 from m4sk1n/patch-1 ... s/instagram/Instagram/	2018-08-09 15:39:11 -06:00
daniel	c113b90321	Merge pull request #296 from xmgz/dev ... update galician	2018-08-09 15:36:21 -06:00
daniel	59546cddaf	Merge pull request #259 from m4sk1n/gdpr-privacy-policy ... Added the law requirements for the EU/EEA	2018-08-09 15:34:20 -06:00
daniel	921ff1ae61	Merge branch 'frontend-ui-refactor' into gdpr-privacy-policy	2018-08-09 15:33:41 -06:00
daniel	231383420d	Merge pull request #331 from Angristan/docker-redis-version ... Provide at least a major version of redis for the docker image	2018-08-09 15:31:47 -06:00
daniel	b7416baa1a	Merge pull request #341 from Angristan/update-env ... Add MAIL_FROM_ADDRESS and MAIL_FROM_NAME to env	2018-08-09 15:31:15 -06:00
daniel	f46b23aa94	Merge pull request #347 from lamby/dont-double-escape-caption-in-atom-feed ... Don't double-escape caption in Atom feed.	2018-08-09 15:30:36 -06:00
daniel	c6947acd98	Merge pull request #348 from pixelfed/frontend-ui-refactor ... Frontend UI Refactor	2018-08-08 19:31:55 -06:00
Daniel Supernault	af67307bed	Update deps	2018-08-08 19:30:34 -06:00
Chris Lamb	e527e888b5	Don't double-escape caption in Atom feed. ... This avoids ugly literal "I don't know" in feed readers, etc.	2018-08-08 22:36:45 +02:00
Daniel Supernault	9a5bd9fa8e	Update WebFinger, remove OStatus	2018-08-05 13:30:11 -06:00
Daniel Supernault	d8b2cc7ae1	Update RestrictedNames	2018-08-05 13:24:23 -06:00
Daniel Supernault	f5fdfcf40c	Update ProfileController	2018-08-05 13:20:20 -06:00
Daniel Supernault	a230265d7b	Update BookmarkController	2018-08-05 13:18:33 -06:00
Daniel Supernault	86d7d1a928	Add BaseApiController	2018-08-05 13:17:28 -06:00
Pierre Jaury	a7b86d6390	Add the bcmath dependency, fix the Docker build	2018-08-01 22:36:28 +02:00
Pierre Jaury	306e2c1e41	Merge branch 'dev' of github.com:pixelfed/pixelfed into dev	2018-08-01 22:03:01 +02:00
daniel	6a92896758	Merge pull request #343 from dansup/frontend-ui-refactor ... Frontend ui refactor	2018-07-24 22:49:56 -06:00
Daniel Supernault	c674845a64	Update pixelfed config	2018-07-24 22:38:59 -06:00
Daniel Supernault	4ba9e2cd6c	Add infinite scroll to profiles, and support private profiles	2018-07-24 22:33:55 -06:00
Angristan	49f34e8fe2	Add MAIL_FROM_ADDRESS and MAIL_FROM_NAME to env	2018-07-24 22:24:25 +02:00
Daniel Supernault	b29ca1823d	Update settings template	2018-07-23 23:09:45 -06:00
daniel	bfaff9330b	Merge pull request #336 from dansup/frontend-ui-refactor ... Frontend ui refactor	2018-07-23 21:23:50 -06:00
Daniel Supernault	dbce506655	Update footer	2018-07-23 21:22:01 -06:00
Daniel Supernault	7701834538	Update FederationController	2018-07-23 21:20:46 -06:00
daniel	9df9f39e01	Merge pull request #335 from dansup/frontend-ui-refactor ... Frontend ui refactor	2018-07-23 19:01:45 -06:00
Daniel Supernault	0623ed5ebf	Update config files	2018-07-23 18:54:42 -06:00
Daniel Supernault	f38c152a89	Update composer.json	2018-07-23 18:53:46 -06:00
Daniel Supernault	8af22a1fd1	Update User model	2018-07-23 18:52:29 -06:00
Daniel Supernault	8f8d099f49	Update pixelfed.php	2018-07-23 14:37:28 -06:00
daniel	56750833e9	Merge pull request #334 from dansup/frontend-ui-refactor ... Frontend ui refactor	2018-07-23 13:13:16 -06:00
Daniel Supernault	72d48696ef	Update UserObserver	2018-07-23 12:53:49 -06:00
Daniel Supernault	77cd0f92c5	Update StatusEntityLexer	2018-07-23 12:53:33 -06:00
Daniel Supernault	057a652c50	Add AP SharedInbox worker	2018-07-23 11:32:19 -06:00
Daniel Supernault	e64c7be584	Add AP Inbox worker	2018-07-23 11:31:51 -06:00
Daniel Supernault	61fb01aaed	Update ProfileController	2018-07-23 11:31:06 -06:00
Daniel Supernault	fec7ee8505	Update LikeController	2018-07-23 11:30:33 -06:00
Daniel Supernault	46bc5322f3	Add AuthLoginEvent	2018-07-23 11:29:20 -06:00
Daniel Supernault	bde6c0f1ff	Update LoginController	2018-07-23 11:26:02 -06:00
Angristan	e170830aca	Provide at least a major version of redis for the docker image ... Considering Redis 5 is currently in RC, it would be safer to provide at least a major version of Redis, even if there is not compatibility issue yet.	2018-07-22 19:15:49 +02:00
Daniel Supernault	d1b99ba271	Update composer.json	2018-07-17 18:14:07 -06:00
Daniel Supernault	b9396b7f68	Update Status & StatusHashtag models to fix mass assignment bug	2018-07-17 18:12:23 -06:00
Daniel Supernault	593d532236	Update AccountController	2018-07-17 18:06:57 -06:00
Daniel Supernault	1dd7c8d189	Add UserFilter model/migration	2018-07-17 18:05:37 -06:00
Daniel Supernault	f6dc795098	Add 2FA migration	2018-07-17 18:05:22 -06:00
Daniel Supernault	97b8ed12ab	Add UserSetting model/migration	2018-07-17 18:04:36 -06:00
Daniel Supernault	74fe13a6f9	Add ReportLog model/migration	2018-07-17 18:04:04 -06:00