19663 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Tobias Diekershoff	df17038ee2	Merge pull request #5105 from annando/dont-proxy ... Don't proxy pictures when they are sent to other networks	2018-05-21 13:00:49 +02:00
Michael	df531cd400	Don't proxy pictures when they are sent to other networks	2018-05-21 10:15:50 +00:00
Tobias Diekershoff	2473a954ca	added changes frim the overlap time 3.6rc/develop	2018-05-21 11:09:32 +02:00
Tobias Diekershoff	f790bfca85	typo	2018-05-21 10:51:33 +02:00
Michael Vogel	f7e6178fd3	Merge pull request #5103 from tobiasd/20180521-ru ... RU translations THX pztrn	2018-05-21 08:47:42 +02:00
Michael Vogel	458c0511f2	Merge pull request #5102 from tobiasd/20180521-tos ... forgot to rename vars in TOS template	2018-05-21 08:46:47 +02:00
Tobias Diekershoff	42fe83d3ff	RU translations	2018-05-21 07:33:22 +02:00
Tobias Diekershoff	1d78fa9645	RU translations THX pztrn	2018-05-21 07:31:35 +02:00
Tobias Diekershoff	becd9b4879	forgot to rename vars in TOS template	2018-05-21 06:02:49 +02:00
Tobias Diekershoff	a110bcde72	more translations done	2018-05-20 19:39:59 +02:00
Hypolite Petovan	a0a4074de6	Merge pull request #5098 from tobiasd/20180520-msg ... translation update DE, FR, FI, PL	2018-05-20 12:34:48 -04:00
Tobias Diekershoff	a4d11db74e	update PL translations THX waldis	2018-05-20 18:11:42 +02:00
Tobias Diekershoff	56f7fe636a	update FI translations THX kris	2018-05-20 18:09:09 +02:00
Tobias Diekershoff	9a860984d6	update FR translations THX vindarel	2018-05-20 18:08:07 +02:00
Tobias Diekershoff	99b8947c0b	update DE translations	2018-05-20 18:05:50 +02:00
Tobias Diekershoff	fd33ebd5f7	typos	2018-05-20 15:27:30 +02:00
Hypolite Petovan	cfeace3e40	Merge pull request #5097 from tobiasd/20180520-credits ... regen credits	2018-05-20 09:16:27 -04:00
Tobias Diekershoff	b6e02e2f0f	cleanup	2018-05-20 15:02:44 +02:00
Tobias Diekershoff	48aafe4662	fixing the base path detection	2018-05-20 14:56:33 +02:00
Tobias Diekershoff	5419ae93a1	regen credits	2018-05-20 14:56:03 +02:00
Tobias Diekershoff	0eac8d195e	7th addin newly fixed issue	2018-05-20 14:42:12 +02:00
Tobias Diekershoff	76c805a315	6th draft adding the work till May	2018-05-20 14:37:21 +02:00
Hypolite Petovan	0ba6c5ec07	Merge pull request #5094 from tobiasd/2018.05-rc ... regen master messages.po	2018-05-20 08:27:49 -04:00
Tobias Diekershoff	5f2951cdda	regen master messages.po	2018-05-20 14:25:07 +02:00
Hypolite Petovan	c41332364f	Merge pull request #5089 from tobiasd/20180519-tos ... privacy statement	2018-05-20 08:20:16 -04:00
Tobias Diekershoff	d78b1f5191	Merge pull request #5091 from annando/issue-4956 ... Don't fail during installation because of a missing theme configuration	2018-05-20 08:50:28 +02:00
Tobias Diekershoff	f7c24a20ae	cite: just some small styling thing	2018-05-20 08:43:43 +02:00
Michael	9d0ed1a2af	Issue 4956: Don't fail during installation because of a missing theme configuration	2018-05-20 05:44:20 +00:00
Hypolite Petovan	cb1b182f7c	Merge pull request #5090 from annando/issue-3412 ... Issue-3412 related: Don't send connection posts anymore	2018-05-19 16:12:52 -04:00
Michael	c70ebadd7d	Issue-3412 related: Don't send connection posts anymore	2018-05-19 19:34:51 +00:00
Tobias Diekershoff	2798d4ea4d	missing sign	2018-05-19 19:08:50 +02:00
Tobias Diekershoff	4f8530070b	removed one line too much	2018-05-19 19:07:13 +02:00
Tobias Diekershoff	e02093c7ea	text of the priv. statement can now be shown outside of the module	2018-05-19 18:55:29 +02:00
Tobias Diekershoff	dd629d5fa4	registration: added display of privacy statement if enabled	2018-05-19 18:53:54 +02:00
Tobias Diekershoff	ae62c1d1ea	admin panel: added privacy statement preview	2018-05-19 18:52:23 +02:00
Tobias Diekershoff	139f7cdc41	Merge pull request #5088 from annando/display-update ... Follow up: Display update should really be fixed now.	2018-05-19 18:19:52 +02:00
Michael	e28819655c	Follow up: Display update should really be fixed now.	2018-05-19 16:04:57 +00:00
Hypolite Petovan	d4ebf7ae52	Merge pull request #5086 from annando/issue-2880 ... Issue 2880: Editing post doesn't destroy mentions or hashtags anymore	2018-05-19 12:01:05 -04:00
Tobias Diekershoff	9b55e52184	Merge pull request #5087 from annando/issue-4819 ... Issue 4819: The introduction note is now stored	2018-05-19 17:44:42 +02:00
Michael	c214353a5d	Issue 4819: The introduction note is now stored displayed on the contact page.	2018-05-19 15:29:34 +00:00
Michael	3fe07cca57	Issue 2880: Editing post doesn't destroy mentions or hashtags anymore	2018-05-19 14:55:27 +00:00
Hypolite Petovan	bba5ce14f7	Merge pull request #5085 from annando/display-update ... Fix constant display updates	2018-05-19 08:15:59 -04:00
Michael	b1a9030369	Fix constant display updates	2018-05-19 06:12:55 +00:00
Tobias Diekershoff	81089e1b2e	Merge pull request #5083 from annando/fix-spamming ... Fix: Avoid getting spammed when an admin has got several accounts	2018-05-19 08:06:33 +02:00
Michael	1cd6976faa	Fix missing $	2018-05-19 05:59:43 +00:00
Tobias Diekershoff	5ae9193aa7	Merge pull request #5084 from annando/dead-subscriber ... End subscription for unreachable subscribers	2018-05-19 07:07:00 +02:00
Michael	e9848d7b8f	End subscription for unreachable subscribers	2018-05-19 03:56:29 +00:00
Michael	a4d976b70f	Fix: Avoid getting spammed when an admin has got several accounts	2018-05-19 03:38:43 +00:00
Hypolite Petovan	931e9182ff	Merge pull request #5082 from annando/federation-warning ... Avoid warning when no valid data could be read	2018-05-18 12:26:08 -04:00
Michael	5d708fd9a9	Avaoid warning when no valid data could be read	2018-05-18 16:07:55 +00:00