3141 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Moritz Heiber	5117f003fe	Revert the changes to the docker-compose.yml, we can merge the files later if necessary	2018-05-29 12:30:50 +02:00
Nouutilizaire	9ed904091b	Create profile.php	2018-05-29 08:45:16 +00:00
Nouutilizaire	42ba511e3e	Create notification.php	2018-05-29 08:42:30 +00:00
Moritz Heiber	407095c13b	Also added the second docker-compose configuration file to dockerignore	2018-05-29 10:28:19 +02:00
Moritz Heiber	32d54ecf65	Fixed logs location in Dockerfile, added docker-compose-running.yml for running the application	2018-05-29 10:28:19 +02:00
Moritz Heiber	9baa229a12	Simplified Dockerfile	2018-05-29 10:28:19 +02:00
Moritz Heiber	609ca40e69	Tweaked the Docker configuration	2018-05-29 10:28:19 +02:00
daniel	716ce6a588	Merge pull request #36 from j1t/dev ... Hebrew Translation	2018-05-28 22:34:58 -06:00
j1t	23850cd950	Create profile.php	2018-05-29 00:16:07 +00:00
j1t	522e304a30	Create notification.php	2018-05-29 00:13:57 +00:00
Daniel Supernault	ad657b7fdc	Add FederationController ... Closes #8	2018-05-28 17:50:14 -06:00
Daniel Supernault	c6a602e324	Update pixelfed.php config	2018-05-28 17:48:59 -06:00
voss	1664095c3d	some translations done.	2018-05-28 22:41:18 +01:00
daniel	6a21fe3e03	Merge pull request #35 from qwazix/dev ... Greek translation	2018-05-28 15:14:12 -06:00
Michael Demetriou	dc5bce159d	Greek translation ... Added translations for greek (el). Also added DS_Store to .gitignore	2018-05-28 18:12:46 +03:00
daniel	13dbb509ab	Merge pull request #34 from yabirgb/dev ... Spanish translation	2018-05-27 15:39:10 -06:00
Yabir	5cbbecf9aa	Spanish traslation	2018-05-27 23:22:49 +02:00
daniel	a6e8366489	Merge pull request #31 from Swedneck/dev ... i18n: Add Swedish translation	2018-05-27 12:01:14 -06:00
daniel	9a8155b328	Merge pull request #30 from Grazouillis/patch-5 ... French corrections	2018-05-27 12:00:53 -06:00
daniel	d38b7be9ee	Merge pull request #29 from Grazouillis/patch-4 ... Call a variable correctly	2018-05-27 11:59:27 -06:00
daniel	e872d928d9	Merge pull request #28 from timmyrs/dev ... Translate new files in German	2018-05-27 11:59:04 -06:00
daniel	6ee0c3cc81	Merge pull request #27 from Grazouillis/patch-3 ... escape characters are missing before apostrophes	2018-05-27 11:58:42 -06:00
daniel	7a0843aedd	Merge pull request #26 from m4sk1n/patch-1 ... Add pcntl extension to Dockerfile	2018-05-27 11:58:24 -06:00
daniel	b5748e2efe	Merge pull request #25 from Grazouillis/patch-2 ... escaping single quote mark	2018-05-27 11:55:31 -06:00
daniel	03d6802344	Merge pull request #24 from Grazouillis/patch-1 ... french correction	2018-05-27 11:55:03 -06:00
Tim Stahel	b79d013544	finished swedish translations	2018-05-27 16:49:55 +02:00
Reka	4e0d49bd5e	French corrections ... More comprehensible for French natives ;)	2018-05-27 15:24:59 +02:00
Reka	46b32d9890	call a variable correctly ... :seconds instead : secondes	2018-05-27 15:21:02 +02:00
timmyRS	df5db1d27f	Translate new files in German	2018-05-27 15:18:24 +02:00
Reka	618b5b46ef	escape caracters are missing before aporstrophes ... many antislashes are missing before apostrophes (single quote mark) to escape this character. + non présente => absente* + x et y doit => doivent* (plural) correspondre and other french corrections	2018-05-27 15:11:03 +02:00
Marcin Mikołajczak	47cd935091	Add pcntl extension to Dockerfile	2018-05-27 13:00:55 +00:00
Reka	a1b444cb7a	triple single quote marks	2018-05-27 14:30:18 +02:00
Reka	1f46410777	french correction ... I suppose this mention will appear after a nickname. Ex : JohnDoe liked this photo. So in French, JohnDoe a aimé cette photo.	2018-05-27 14:27:55 +02:00
daniel	d8bbe98728	Merge pull request #21 from OpenAlgeria/dev ... notification.php Translate French	2018-05-26 22:19:30 -06:00
OpenAlgeria	0e1c1611c3	notification.php Translate French	2018-05-27 06:13:49 +02:00
Daniel Supernault	1406f467a0	Add basic notification support	2018-05-26 21:25:04 -06:00
Daniel Supernault	3ec93d096c	Add LikePipeline and like notifications	2018-05-26 20:26:44 -06:00
Daniel Supernault	de9237b5e1	Update cache.php config	2018-05-26 19:24:49 -06:00
daniel	a6ee20b8f3	Merge pull request #20 from OpenAlgeria/dev ... profile.php Translate French	2018-05-26 17:14:34 -06:00
OpenAlgeria	73f71b7922	Translate French	2018-05-27 01:09:24 +02:00
Daniel Supernault	da94721d62	Update cache.php, add more detailed redis config ... Closes #19	2018-05-26 17:05:38 -06:00
Daniel Supernault	e1faa17bd5	Add AccountController	2018-05-26 17:00:07 -06:00
Daniel Supernault	095b23ac78	Update LikeController	2018-05-26 16:59:31 -06:00
Daniel Supernault	e52f81fc2a	Add Notification model/migration	2018-05-26 16:58:22 -06:00
Daniel Supernault	1250312cab	Add SettingsController	2018-05-26 16:53:21 -06:00
daniel	da2fa82fca	Merge pull request #14 from j1t/dev ... WIP Hebrew Translation	2018-05-26 16:51:55 -06:00
Daniel Supernault	1252f76a2f	Add SearchController	2018-05-26 16:50:36 -06:00
j1t	02ec1688b4	Update validation.php	2018-05-26 22:49:41 +00:00
Daniel Supernault	3dafc278b5	Add DiscoverController and hashtag posts view	2018-05-26 16:49:39 -06:00
Daniel Supernault	befa82dc04	Update CommentController, remove hashids	2018-05-26 16:46:07 -06:00