6434 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Daniel Supernault	2e1e1cf8fd	Add admin system settings view	2018-08-23 19:06:15 -06:00
Daniel Supernault	ffb53df2fc	Add admin storage settings view	2018-08-23 19:04:48 -06:00
Daniel Supernault	6344c80462	Add admin maintenance settings view	2018-08-23 19:04:20 -06:00
Daniel Supernault	20293ca258	Add admin backup settings view	2018-08-23 19:02:22 -06:00
Daniel Supernault	c2f029a890	Add admin report template view	2018-08-23 19:01:02 -06:00
Daniel Supernault	3d7e38d02a	Add admin reports view	2018-08-23 18:58:41 -06:00
Daniel Supernault	05ca453ffc	Update verify_email view	2018-08-23 18:57:32 -06:00
daniel	6a969ca9f4	Merge pull request #395 from hellcp/patch-28 ... Fix search results look	2018-08-23 18:33:37 -06:00
Daniel Supernault	e91bd452d5	Add private profile layout	2018-08-23 18:31:56 -06:00
Daniel Supernault	1d3cddc831	Update profile localizations	2018-08-23 18:28:16 -06:00
daniel	ad5651e465	Merge pull request #281 from TeDomum/dev ... Create an Apache based Docker image ready for production	2018-08-23 18:14:45 -06:00
Pierre Jaury	c82d0fb389	Fix the docker build	2018-08-23 22:57:22 +02:00
Pierre Jaury	5224d7cd96	Move Dockerfiles to contrib/	2018-08-23 22:43:47 +02:00
Pierre Jaury	83c6f4c615	Merge branch 'dev' of https://github.com/dansup/pixelfed into dev	2018-08-23 22:29:53 +02:00
Daniel Supernault	da27cc6ce3	Add Crypto Unit Test	2018-08-22 22:45:25 -06:00
daniel	a157edc7b3	Merge pull request #404 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2018-08-22 22:34:44 -06:00
Daniel Supernault	b3827566a2	Update tests	2018-08-22 22:30:53 -06:00
Daniel Supernault	814b959c3f	Update navbar	2018-08-22 22:28:26 -06:00
Daniel Supernault	c7489a46c9	Update UserFilter model	2018-08-22 22:23:19 -06:00
Daniel Supernault	18cd857e90	Update AccountController	2018-08-22 00:56:16 -06:00
daniel	c34355c4c4	Merge pull request #403 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2018-08-21 21:19:04 -06:00
Daniel Supernault	3a5ac488c0	Update SettingsController	2018-08-21 21:18:14 -06:00
Daniel Supernault	08f2a4be9e	Add update_settings_table migration to add optional profile following/follower counts	2018-08-21 21:17:22 -06:00
Daniel Supernault	526f67f84d	Update hashtag infinite scroll	2018-08-20 21:03:22 -06:00
daniel	447c397cb1	Merge pull request #399 from pixelfed/frontend-ui-refactor ... Update ProfileController and partial, fix status count	2018-08-20 20:46:54 -06:00
Daniel Supernault	f746299711	Update ProfileController and partial, fix status count	2018-08-20 20:46:13 -06:00
daniel	84c10e3d13	Merge pull request #398 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2018-08-20 20:40:14 -06:00
Daniel Supernault	c636aae3b7	Update profile partial, add website to profile	2018-08-20 20:34:58 -06:00
Daniel Supernault	bde671657f	Update SettingsController, fix bug that prevented instances without email validation to update settings	2018-08-20 20:33:07 -06:00
daniel	e90d7c52bc	Merge pull request #397 from pixelfed/frontend-ui-refactor ... Update RegisterController	2018-08-20 18:35:24 -06:00
Daniel Supernault	7e78f63ff5	Update RegisterController	2018-08-20 18:34:26 -06:00
Pierre Jaury	02197696dc	Actually deploy the PHP configuration	2018-08-20 15:42:49 +02:00
Pierre Jaury	9f4bcd2a44	Merge branch 'dev' of https://github.com/dansup/pixelfed into dev	2018-08-20 15:41:45 +02:00
Stasiek Michalski	577242423c	Fix search results look	2018-08-20 08:41:02 +02:00
daniel	58cda56a07	Merge pull request #394 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2018-08-19 19:25:00 -06:00
Daniel Supernault	944a7fe8d3	Bump version	2018-08-19 19:23:27 -06:00
Daniel Supernault	34bdb35f57	Update landing page	2018-08-19 19:22:54 -06:00
Daniel Supernault	707b686e8a	Add AdminReportController	2018-08-19 16:35:16 -06:00
Daniel Supernault	f969b40928	Add landing page images	2018-08-19 15:26:22 -06:00
Pierre Jaury	0c88b28f5d	Merge branch 'dev' of https://github.com/dansup/pixelfed into dev	2018-08-19 19:59:32 +02:00
daniel	43f6cb450b	Merge pull request #391 from Angristan/typo ... Fix a little typo :)	2018-08-18 16:38:14 -06:00
daniel	87b5c7e436	Merge pull request #390 from ArthurHoaro/patch-1 ... Add bcmath PHP extension to Dockerfile	2018-08-18 16:37:34 -06:00
daniel	87e46a7884	Merge pull request #389 from j1t/patch-2 ... Hebrew Translation update	2018-08-18 16:36:46 -06:00
Angristan	dffdd96c44	Fix typo	2018-08-18 23:19:14 +02:00
ArthurHoaro	eec2b889fa	Add bcmath PHP extension to Dockerfile ... This is required by `moontoast/math` dependency.	2018-08-18 14:13:06 +02:00
ArtikBanana	9628e4e22c	Merge pull request #1 from j1t/patch-1 ... Update profile.php	2018-08-17 21:56:41 +03:00
ArtikBanana	63bc37f36c	Update navmenu.php	2018-08-17 18:55:14 +00:00
ArtikBanana	bb9b9e6e11	Update profile.php	2018-08-17 18:39:03 +00:00
daniel	f6bfa0440b	Merge pull request #386 from pixelfed/frontend-ui-refactor ... Frontend ui refactor	2018-08-16 03:16:12 -06:00
Daniel Supernault	3b4ea92d82	Update RestrictedNames	2018-08-16 03:15:13 -06:00