Commit Graph

23 Commits

Author SHA1 Message Date
avg_joe 7910901962 count up to V1.2.1 and add changelog (#11)
Co-authored-by: avg_joe <jh@disroot.org>
Reviewed-on: #11
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2023-03-01 20:03:47 +00:00
meaz e44d862a4b better define commercial activities (#10)
See discussion here #9

If we agree on this, we need to do the translations.

Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: avg_joe <jh@disroot.org>
Co-authored-by: fede <fede@disroot.org>
Reviewed-on: #10
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: avg_joe <avg_joe@no-reply@disroot.org>
2023-02-23 13:47:26 +00:00
meaz baa2166761 change git address from master to main (#8)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #8
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2022-11-13 15:31:34 +00:00
avg_joe 20c470e4aa Merge pull request 'replace forum to blog and DE translation' (#7) from Translation-DE-Terms-of-Service into master
Reviewed-on: #7
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2022-05-04 18:39:10 +00:00
meaz be14467bc6
change French to match English update 2022-01-26 21:20:50 +01:00
avg_joe b400be5bdf replace forum to blog and DE translation 2022-01-23 12:02:58 +01:00
meaz 93c6d1b2ad translation in French of ToS (#6)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #6
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-07-28 09:50:18 +00:00
meaz ea7488e57d Merge pull request 'removes too many <br>' (#5) from brremoval into master
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2020-03-30 09:26:04 +00:00
meaz 0018b6e228 put <br> back after a anchor 2020-03-29 09:16:10 +02:00
meaz 3f810d6f9f Merge branch 'brremoval' of https://git.disroot.org/Disroot/Disroot-ToS into brremoval 2020-03-29 09:14:01 +02:00
meaz 0f0eeff735 remove br before a anchor 2020-03-29 09:13:56 +02:00
meaz f900d8f372 removes too many <br> 2020-03-28 08:04:50 +01:00
meaz 5af46c7b81 Merge pull request 'adjustments to tos background and text color' (#4) from tos_background into master
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2020-03-12 21:11:30 +00:00
antil0pa 84163181d5 removed line breaks 2020-03-12 13:10:44 +01:00
antil0pa 5a2d06881c adjustments to tos background and text color 2020-03-12 13:03:16 +01:00
meaz ed6f071f41 Merge pull request 'Update of ToS' (#3) from tos_last_changes into master
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2020-03-12 09:33:03 +00:00
Fede.- bfe167a2cd Update of ToS
Removed ToC, added "About this doc" section and few lines breaks (<br>).
2020-03-11 14:09:19 +00:00
Fede.- 90da8373cd Merge branch 'tos_revert_merge' of Disroot/Disroot-ToS into master 2020-03-10 22:20:33 +00:00
Fede.- b2ce3bf8d9 Revert "Final update and fixes"
This reverts commit d7aba8ad34.

Rollback of last merge and recovering of internal links code
2020-03-09 23:06:48 -03:00
Fede.- d7aba8ad34 Final update and fixes
Removed all non style related code
2020-03-08 14:14:03 +00:00
meaz 2bf5e801b2 Merge branch 'TOS_draft' of Disroot/Disroot-ToS into master 2020-02-10 06:48:02 +00:00
Fede.- 4e1756f360 Draft for version 1.2 of ToS.
Added minimum user age information
Link to changes on ToS
Fixed typos and lines
2020-02-09 17:22:01 -03:00
Fede.- 82eaa7505d First commit 2020-02-09 16:55:39 -03:00