Commit graph

1850 commits

Author SHA1 Message Date
ce95533a35 Merge pull request 'add stripe in forms' (#223) from stripe into master
Reviewed-on: #223
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-04-13 18:34:39 +00:00
8b28928854 Merge branch 'master' into stripe 2021-04-13 08:20:50 +00:00
6c285178ff
add stripe in forms 2021-04-13 10:17:39 +02:00
26b3c4ea42 Merge pull request 'updated monthly overview' (#222) from overview_march_2021 into master
Reviewed-on: #222
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-04-12 10:26:01 +00:00
8d072460e3 updated monthly overview 2021-04-11 21:27:04 +02:00
16f21a0faf Merge pull request 'fix display issue with title on about page in mobile view' (#221) from about_mobile into master
Reviewed-on: #221
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-04-11 15:01:22 +00:00
70a145172f fixed line breaks on all languages 2021-04-11 13:22:13 +02:00
b3982468fc fixed some line breaks 2021-04-11 13:16:53 +02:00
ea24ff9a69 Merge branch 'master' into about_mobile 2021-04-11 07:51:24 +00:00
e0319f9dd6
fix display issue with title on about page in mobile view 2021-04-11 09:39:51 +02:00
187cb44466 Merge pull request 'Fix link on home page FR' (#216) from meaz-patch-1 into master
Reviewed-on: #216
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2021-04-09 06:24:39 +00:00
55dab37937 Merge branch 'master' into meaz-patch-1 2021-04-09 06:24:24 +00:00
4ba1e576a2 Merge pull request 'Fixed dead link to Account Administration' (#215) from FIX_ABOUT_LINK into master
Reviewed-on: #215
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-04-09 06:03:58 +00:00
8aa7d3a5d1 Merge branch 'FIX_ABOUT_LINK' of https://git.disroot.org/Disroot/Website into FIX_ABOUT_LINK 2021-04-09 03:03:14 -03:00
c969df7025 Removed howto link + Text update 2021-04-09 03:02:56 -03:00
86563bff2b Fixed dead link to Account Administration 2021-04-09 03:02:56 -03:00
44e5a6fab1 Merge pull request 'fix-dead/broken-links-on-website' (#218) from fix-dead/broken-links-on-website into master
Reviewed-on: #218
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2021-04-08 20:16:13 +00:00
ab83a9d4fa Removed howto link + Text update 2021-04-08 17:16:11 -03:00
52d10c9072 git: add https for valid link 2021-04-08 18:11:36 +02:00
e67095748f valid mumble link 2021-04-08 18:08:35 +02:00
5fc8d5c4a8 DE taiga scrum wiki 2021-04-08 18:03:40 +02:00
840be13020 tos: replace disource announcement with blog 2021-04-08 17:59:48 +02:00
bf0d782863 xmpp: search.jabber.network 2021-04-08 17:34:18 +02:00
e21f23c0cb clients: mumble-web 2021-04-08 17:29:18 +02:00
ef4e972c49 faq pw change 2021-04-08 17:25:43 +02:00
8c12b5158e Fix link on home page FR 2021-04-08 09:16:10 +00:00
85168ecc13 Fixed dead link to Account Administration 2021-04-07 18:06:17 -03:00
a5353221bd update 2019 annual report for DE (#214)
Co-Authored-By: avg_joe <avg_joe@no-reply@disroot.org>
Co-Committed-By: avg_joe <avg_joe@no-reply@disroot.org>
2021-04-07 19:11:24 +00:00
e90b0e264c Merge pull request 'it-blog-rss' (#213) from it-blog-rss into master
Reviewed-on: #213
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-04-07 09:47:46 +00:00
l3o
da3d9a320b Fixet small mistakes 2021-04-07 10:32:06 +02:00
l3o
1558071b67 It translation blog post killing ncnews 2021-04-07 10:25:20 +02:00
c762edb48f Merge pull request 'Killing_NCNews_SP' (#212) from Killing_NCNews_SP into master
Reviewed-on: #212
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2021-04-07 02:44:03 +00:00
333e2e18bf Fixed few typos. 2021-04-06 18:05:12 -03:00
67c605f6a9 Spanish translation of NC News post 2021-04-06 17:57:47 -03:00
0c86baa10e Merge pull request 'added blog post about killing ncnews' (#211) from killing_ncnews into master
Reviewed-on: #211
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2021-04-06 20:20:18 +00:00
fe5d35de72 Merge branch 'killing_ncnews' of https://git.disroot.org/Disroot/Website into killing_ncnews 2021-04-06 17:16:43 -03:00
7de5ba5990 Fixed few typos, added/removed spaces between paragraphs & changed a couple of words. 2021-04-06 17:16:26 -03:00
21d73cbff5 better emphasize on complete shutdown phrase 2021-04-06 17:16:26 -03:00
4027a5dc5f proof reading #1 2021-04-06 17:16:26 -03:00
58906a71bb added blog post about killing ncnews 2021-04-06 17:16:26 -03:00
a8b380638b Merge branch 'master' into killing_ncnews 2021-04-06 20:14:10 +00:00
491f7d9684 Merge pull request 'Add changelog to website' (#207) from changelog into master
Reviewed-on: #207
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-04-06 20:11:34 +00:00
61f1c778fe Merge branch 'master' into changelog 2021-04-06 18:32:15 +00:00
459647fd96 Fixed few typos, added/removed spaces between paragraphs & changed a couple of words. 2021-04-05 23:51:58 -03:00
ab6f7566b4
better emphasize on complete shutdown phrase 2021-04-05 20:25:49 +02:00
e8b55fb4ce proof reading #1 2021-04-05 16:57:08 +02:00
2aa5a6289b
added blog post about killing ncnews 2021-04-05 16:31:21 +02:00
3318812003 removed the rss news post 2021-04-05 16:29:23 +02:00
127b799286 killing nc news post 2021-04-05 16:25:05 +02:00
dea3ec202c
Added git.ignore since we need that as fullbar comes from other repo 2021-04-02 12:02:43 +02:00