Commit Graph

8 Commits

Author SHA1 Message Date
meaz 9c6fbb618f
Merge branch 'master' into pleroma 2022-12-17 08:06:41 +01:00
muppeth fe7e544dc2 changed xmpp file retention period (#42)
While introducing larger file limit for xmpp file uploads (512MB) we have also decided to change the time files are stored on the server by matching it with chat history (1month).

Co-authored-by: muppeth <muppeth@disroot.org>
Co-authored-by: avg_joe <jh@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: #42
Reviewed-by: avg_joe <avg_joe@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: muppeth <muppeth@no-reply@disroot.org>
Co-committed-by: muppeth <muppeth@no-reply@disroot.org>
2022-10-15 18:06:44 +00:00
meaz 3d68c6fa0c add information about the fact that pads can not be deleted by users (#41)
See issue [here](Disroot/Disroot-Project#223)

@avg_joe could you do the German translation?

Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: avg_joe <jh@disroot.org>
Reviewed-on: #41
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2022-09-06 14:54:12 +00:00
meaz 7c442f12a8 Remove framadate and ethercalc (#38)
To be merged on the 1st of March

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #38
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2022-03-01 21:38:03 +00:00
meaz c6ac90dd7b
Merge branch 'master' into pleroma 2022-02-07 11:14:15 +01:00
Rainer Bielefeld a86cf64ba2 German Translation for PP. Additionally I Changed 2 nabe-Tags for "Audio" and "CryptPad", which wrongly were "git". These changes also in .fr and .en (#36)
Seems that there are no objections, so: pull-request!

Co-authored-by: RainerBielefeld <rainerbielefeldng@bielefeldundbuss.de>
Co-authored-by: shadowsword <shadowsword@disroot.org>
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #36
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: Rainer Bielefeld <rainerbielefeld@no-reply@disroot.org>
Co-committed-by: Rainer Bielefeld <rainerbielefeld@no-reply@disroot.org>
2022-01-31 19:13:52 +00:00
meaz fadbf20957
replace hubzilla by pleroma in federated services list 2022-01-26 21:37:36 +01:00
meaz 188e0a37e6 French translation of PS 2020-04-14 09:20:13 +02:00