a50c790f5e
Remove conflict file
2022-01-02 23:09:53 -03:00
a613e5993f
updated after review
2022-01-02 23:24:12 +01:00
e56254ee18
it-news03-2021 ( #307 )
...
I translated the disnews number 3 into Italian
Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: #307
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2022-01-02 22:35:59 +01:00
6a8721d111
review (typos + suggestions)
2022-01-02 21:00:17 +01:00
a79e479325
it-news03-2021 ( #307 )
...
I translated the disnews number 3 into Italian
Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: #307
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2022-01-02 07:34:45 +00:00
220488b87d
minor fixes & cryptpad translation
2022-01-01 22:40:56 +01:00
4ab26c3c7e
Merge branch 'master' into 20211231_Blog4Mewyear_DE
2021-12-31 20:54:38 +00:00
5cf029aed9
typo in blog post
2021-12-31 16:50:12 +01:00
47f7b3f5d6
fix faq quotation marks ( #299 )
...
Co-authored-by: avg_joe <jh@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: #299
Co-authored-by: avg_joe <avg_joe@no-reply@disroot.org>
Co-committed-by: avg_joe <avg_joe@no-reply@disroot.org>
2021-12-31 15:48:03 +00:00
1508ec9d02
4 Typos corrected
2021-12-31 15:57:57 +01:00
120421a3ad
German Translation for Hyppy New Year Blog Post. Related to #294
2021-12-31 11:08:54 +01:00
86533aff10
Merge branch 'master' into fix-german-translation-for-donation
2021-12-31 10:05:12 +00:00
7526b0c38c
translated into italian perks page ( #298 )
...
I translated perks page into Italian
I corrected a small typo (a space) in the Italian text of newsletter # 4
Co-authored-by: Alan <alan@alanleoni.ch>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: #298
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2021-12-31 07:54:20 +00:00
61c30a673d
avg_joe
2021-12-30 16:08:38 +01:00
9dac4063de
Fix lot of errors with forms ( #295 )
...
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #295
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-12-30 11:32:55 -03:00
9a6a8674d6
missed it
2021-12-30 14:35:32 +01:00
51598aaed0
fix about change de
2021-12-30 14:35:32 +01:00
19c3f476c8
inital commit trans don ger
2021-12-30 14:35:32 +01:00
e3b5ae237b
Fix lot of errors with forms ( #295 )
...
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #295
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-12-30 10:43:09 +00:00
f887459daa
Merge branch 'master' into disnews_4_FIX
2021-12-30 10:02:45 +00:00
df8736e06e
Fix link + texts on other languages on about page, privacy section ( #281 )
...
Fix #278 and #279
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #281
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-12-30 10:02:09 +00:00
1e9f8ac118
Merge branch 'master' into disnews_4_FIX
2021-12-30 09:36:59 +00:00
e2c23dff5e
finish mumble + about section ( #288 )
...
Co-authored-by: avg_joe <jh@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: #288
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: avg_joe <avg_joe@no-reply@disroot.org>
Co-committed-by: avg_joe <avg_joe@no-reply@disroot.org>
2021-12-30 09:36:24 +00:00
1cb3f07c2f
Frenh traduction of disnew 4
2021-12-30 10:34:35 +01:00
ed76abdc76
DisNews#4 Fixes
2021-12-29 22:41:12 -03:00
41975179a9
added image without white frame
2021-12-29 22:16:44 +01:00
b4a4ec8d15
typo in header
2021-12-29 22:11:47 +01:00
cc9426fb78
typo in header
2021-12-29 22:05:45 +01:00
68c67e3ba5
it-disneews4 ( #290 )
...
I translated the newsletter #4 into Italian ;)
Co-authored-by: Alan <alan@alanleoni.ch>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: #290
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2021-12-29 20:26:49 +00:00
7fd16ef6c7
fix error with mumble links ( #287 )
...
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #287
Reviewed-by: avg_joe <avg_joe@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-12-29 19:59:02 +00:00
ffb50af77b
uodated publish date
2021-12-29 10:30:22 +01:00
f1e21d8b0c
removed media order header
2021-12-29 10:25:33 +01:00
e974d6e043
remove capitalization from link
2021-12-29 10:10:13 +01:00
8e81329bcd
added some accents
2021-12-29 10:03:21 +01:00
ca5fc5fbdd
fixed image size
2021-12-29 09:45:42 +01:00
34c653af65
remove extra ;
2021-12-29 08:34:32 +01:00
d0d3b3d0b8
remove defaults grav pages!
2021-12-29 08:29:02 +01:00
e71589e89d
Fixed few typos on English post + Spanish translation
2021-12-29 04:10:07 -03:00
1707964b06
added more rojects
2021-12-29 01:36:52 +01:00
59b6c720c8
floss projects list
2021-12-29 01:17:11 +01:00
6610ba9f29
minor change
2021-12-29 00:34:30 +01:00
ceb46679d8
disnews #$
2021-12-29 00:04:25 +01:00
bb5a84b82d
German2021-12-21 ( #274 )
...
This branch is ready to bemerged with master.
Co-authored-by: RainerBielefeld <rainerbielefeldng@bielefeldundbuss.de>
Co-authored-by: avg_joe <jh@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: #274
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: Rainer Bielefeld <rainerbielefeld@no-reply@disroot.org>
Co-committed-by: Rainer Bielefeld <rainerbielefeld@no-reply@disroot.org>
2021-12-28 10:51:35 +00:00
a1a791398e
No Auto Discovery for RSS Feed #266 ( #275 )
...
Fix #266
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #275
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-12-27 06:27:37 +00:00
66bd2f2e15
Merge pull request 'moved menu item 'perks' to different positiong in top bar' ( #273 ) from change_menu_order into master
...
Reviewed-on: #273
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-12-22 19:25:48 +00:00
e6362f77f5
remove hubzilla contact ( #269 )
...
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #269
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-12-22 06:28:51 +00:00
e90f1588f4
moved menu item 'perks' to different positiong in top bar
2021-12-19 20:38:33 +01:00
e3d292373b
Second Second attempt to contribute Translation
2021-12-15 16:46:10 +01:00
666ce9e508
overview update
2021-12-09 16:02:32 +01:00
eea01abe24
Small fix on "clickbait" line.
2021-11-20 19:40:55 -03:00
a32a9c32da
Small modifications on text (as requested) (English and Spanish version)
2021-11-20 19:34:47 -03:00
463e88698a
Sp translation of blogpost: Small typo fixed
2021-11-20 17:12:40 -03:00
d63a854e2f
Poll link added + Spanish translation
2021-11-20 17:09:19 -03:00
c8d61c7b86
Blogpost #3
2021-11-20 02:32:38 -03:00
22201e9f4e
Fix tiny typo ( #264 )
...
Reviewed-on: #264
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: famubu <famubu@no-reply@disroot.org>
Co-committed-by: famubu <famubu@no-reply@disroot.org>
2021-11-16 09:58:23 +00:00
f67e334b05
remove mentions of alias on home page ( #263 )
...
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #263
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-11-15 16:17:42 +00:00
33a8e23db3
more fixes
2021-11-09 22:55:20 +01:00
eb50368cb2
small fixes to french translation
2021-11-09 22:53:28 +01:00
e2ea310fe9
removed contribution frequency from form
2021-11-07 21:32:06 +01:00
591bc1f7c3
Perks: Spanish translation
2021-11-04 22:15:04 -03:00
f0f16eb0a0
Fix typo on French translation
2021-11-04 09:02:46 +00:00
bab54463af
French translation of Perks page ( #258 )
...
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #258
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-11-04 08:47:26 +00:00
b65f0af795
small edits
2021-11-02 15:50:03 +01:00
6b760a52ea
Merge branch 'master' into customdomainchanges
2021-11-02 09:59:40 +00:00
74acccd923
Perks ( #247 )
...
Here is the new "perks" branch, where we can list how to get more storage + custom domain.
Co-authored-by: muppeth <muppeth@disroot.org>
Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: Fede <fede@disroot.org>
Co-authored-by: antilopa <antilopa@disroot.org>
Reviewed-on: #247
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
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-11-02 09:59:13 +00:00
ec48b98601
Merge pull request 'overview_sep_2021' ( #257 ) from overview_sep_2021 into master
...
Reviewed-on: #257
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-10-31 12:28:35 +00:00
f8391417cc
Update Contact page in other languages ( #256 )
...
Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: Fede <fede@disroot.org>
Reviewed-on: #256
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-10-29 05:36:18 +00:00
0f824428c7
improve image
2021-10-28 16:55:01 +02:00
876e482434
correct image
2021-10-28 16:52:33 +02:00
4dc3556eb8
monthly overview September 2021
2021-10-28 16:48:52 +02:00
c411a7a1f7
Merge pull request 'WEBSITE_SP_UPDATE' ( #255 ) from WEBSITE_SP_UPDATE into master
...
Reviewed-on: #255
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-10-06 18:25:35 +00:00
5d799da4d2
Contact page links color ( #254 )
...
change links color as it was not readable with the blueish color behind.
If you agree with this, then I'll implement it in other languages pages.
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #254
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-10-05 14:41:08 +00:00
3659cac6ca
Website's spanish translation update
2021-10-05 01:01:38 -03:00
87622a15cd
Website's spanish translation update
2021-10-05 00:30:54 -03:00
4f80ea3b48
typo
2021-10-01 14:13:01 +02:00
b1f4baacde
add missing quotes
2021-10-01 14:12:14 +02:00
412062ee1c
French translation
2021-10-01 14:11:04 +02:00
0572659f9b
custom domain - form and service-email page changes
2021-10-01 11:37:25 +02:00
15d2ab205a
update cryptpad with new icons + form ( #252 )
...
Fix [#251 ](#251 )
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #252
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-09-23 19:59:20 +00:00
5b7239514e
some errors in spreadsheet corrected
2021-09-06 11:03:47 +02:00
6383bc79fc
updated patreon's total donations
2021-09-06 10:25:42 +02:00
3f827420ca
Monthly overview july, august 2021
2021-09-03 12:51:41 +02:00
2998cc2414
add nocache to img link
2021-08-10 09:22:05 +02:00
7cb801adfc
Merge branch 'overview_june_2021' of git.disroot.org:Disroot/Website into overview_june_2021
...
update branch
2021-07-29 09:09:49 +02:00
30abe07f10
unlock goal 3 volunteers
2021-07-29 09:08:03 +02:00
a903cb436d
Merge branch 'master' into overview_june_2021
2021-07-28 09:44:57 +00:00
aafc302cd6
better graph capture
2021-07-27 22:18:42 +02:00
12cd00ca7d
donation overview june 2021
2021-07-27 22:16:32 +02:00
c939ce8825
remove covid kit
2021-07-27 22:13:24 +02:00
4f79c42d04
remove matrix in FAQ
2021-07-13 22:15:51 +02:00
f0ea35ffc3
The way the bank account details were set was causing confusion, adding a ':' to make it clearer
2021-06-18 11:17:16 +02:00
5607daa442
Merge branch 'master' into overview_may_2021
2021-06-15 04:32:43 +00:00
4b8a972f16
overview update april ,may
2021-06-13 13:46:50 +02:00
numnum
4158420d2c
Cryptpad storage space should be 250MB ( #238 )
...
Co-authored-by: ltGuillaume <ltguillaume@users.noreply.github.com>
Reviewed-on: #238
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: numnum <numnum@no-reply@disroot.org>
Co-committed-by: numnum <numnum@no-reply@disroot.org>
2021-06-10 17:40:25 +00:00
e9688aeb14
changed IRC channel info to liberachat on contact page ( #236 )
...
Co-authored-by: muppeth <muppeth@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: #236
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>
2021-06-04 11:20:38 +00:00
8dc9ffbd0a
DisNews-2 Spanish translation / Small fixes
2021-06-02 00:15:17 -03:00
ceee7da9fa
DisNews-2 Spanish Translation
2021-06-01 23:48:35 -03:00
9153c1ec69
Corrected small translation error in Italian
2021-05-31 22:04:49 +02:00
7938db5b0d
Translated into italian post disnews 2
2021-05-31 22:01:30 +02:00
8b2fefa94f
disnews #2 ( #233 )
...
Co-authored-by: muppeth <muppeth@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: #233
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: muppeth <muppeth@no-reply@disroot.org>
Co-committed-by: muppeth <muppeth@no-reply@disroot.org>
2021-05-31 06:57:32 +00:00
512bb3dc80
add the new yearly report and foos donations in 2020
2021-05-27 20:17:46 +02:00
577dac562d
Blogpost about FLISoL 2021
2021-04-16 23:13:26 -03:00
a5544c0443
Merge branch 'master' into forms_language
2021-04-13 18:35:05 +00:00
de114b0d1b
fix a bit links to forms so that it works better in vagrant
2021-04-13 10:22:35 +02: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
8d072460e3
updated monthly overview
2021-04-11 21:27:04 +02: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
55dab37937
Merge branch 'master' into meaz-patch-1
2021-04-09 06:24:24 +00: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
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
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
da3d9a320b
Fixet small mistakes
2021-04-07 10:32:06 +02:00
1558071b67
It translation blog post killing ncnews
2021-04-07 10:25:20 +02: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
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
dea3ec202c
Added git.ignore since we need that as fullbar comes from other repo
2021-04-02 12:02:43 +02:00
11150e3aff
Merge branch 'master' into changelog
2021-04-02 07:11:18 +00:00
c90d3082ba
Merge branch 'master' into changelog
2021-03-29 06:07:22 +00:00
d02a0d7a2d
Merge branch 'master' into BLOG_SP_01-2021-03
2021-03-28 20:12:34 +00:00
a16092b1a5
Corrected minor translation errors
2021-03-28 21:11:07 +02:00
ff1c5653aa
Translated article news 01 in italian
2021-03-28 20:58:04 +02:00
02be9051a7
Small fixes on SP translation
2021-03-27 16:48:17 -03:00
656d649a76
Last post translation into Sp + Fixed dead link in NC service section
2021-03-27 16:39:19 -03:00
5e22f63cc2
quick fix
2021-03-27 14:53:01 +01:00
cc1bc39b0d
DisNews #1 - March 2021
2021-03-27 13:54:26 +01:00
cb017dc04c
remove coronavirus image
2021-03-22 13:19:56 +01:00
e29311042d
While at it, corrected annoying white strip on the bottom of EN home page
2021-03-22 12:30:01 +01:00
b6cd258e8e
Moved Change Log item menu to footer, added new picture
2021-03-22 12:27:09 +01:00
e9c96371c5
add changelog to website
2021-03-20 11:48:20 +01:00
c1fe514ebb
add changelog symbolic link in gitignore
2021-03-20 11:47:50 +01:00
57559db9ad
Correct typo in english form
2021-03-03 10:22:26 +01:00
865dfb4896
update overview feb 2021
2021-03-02 13:37:52 +01:00
22b6c2479b
Merge branch 'master' into overview2020
2021-03-02 10:09:12 +00:00
34dd1d576a
yearly overview 2020
2021-03-02 10:22:34 +01:00
e79c8dbde4
Update coffee index page link
2021-03-01 09:43:20 +01:00
b0fcafc73b
Fixed mistake in form
2021-02-26 21:39:09 +01:00
8742ba27f4
Changed bank info and made other small fixes in ita translation
2021-02-26 20:46:11 +01:00
911e0a4bc6
bank transfer restricited to SEPA only
2021-02-25 09:04:27 +01:00
c862174dbb
remove link as it is not directing to the right website anymore
2021-02-23 19:50:20 -03:00
d716753d53
Spanish translation of last post
2021-02-22 11:13:41 -03:00
9a3d59f2f1
added a line break for readabilty
2021-02-22 14:30:47 +01:00
65882ccf66
corrected post date from 2020 to 2021
2021-02-22 14:30:07 +01:00
7c93cc2be5
corrected some typos
2021-02-22 14:19:44 +01:00
b8d9e419b3
blog post about the downtime because of the loose cable
2021-02-22 13:22:00 +01:00
592380c04f
Fix typo in russian version
2021-02-20 09:55:49 +01:00
881d33ed25
re-enable extra storage forms
2021-02-18 00:15:09 +01:00
882ae50c89
antilopa's suggestion into other language page
2021-02-13 06:10:34 +01:00
611ac540c4
Merge branch 'master' into contact_gpg
2021-02-13 04:57:20 +00:00
9c3f317367
suggestion for better layout
2021-02-12 21:09:03 +01:00
e19910ab3c
Merge branch 'master' into badge
2021-02-09 21:45:47 +00:00
6592f11d51
Merge branch 'master' into contact_gpg
2021-02-09 21:45:07 +00:00
407990f10d
Update contact with new gpg key for cryptdisroot
2021-02-09 22:40:29 +01:00
cbd0fdcfc6
change from 70 to 64 in case the calculation of the message size is off
2021-02-07 08:37:17 +01:00
bfcbd48d2d
change Attachement size limit info to 70MB
2021-02-07 08:34:42 +01:00
223f2e0776
Remove badge from services
2021-02-04 06:34:53 +01:00
68238d1e38
Blogpost Spanish translation + fixed minor typos in English ( #188 )
...
Blogpost Spanish translation + fixed minor typos in English
Co-authored-by: Fede <fede@disroot.org>
Reviewed-on: #188
Co-Authored-By: Fede.- <fede@no-reply@disroot.org>
Co-Committed-By: Fede.- <fede@no-reply@disroot.org>
2020-12-31 17:07:59 +00:00
ffd65186db
blog post end 2020
2020-12-31 11:20:29 +01:00
09ba743ce3
emergancy push to update microshit blog post
2020-12-29 12:02:32 +01:00
l3o
a37a02316b
[Blog-it] Translate sticker contest post
2020-12-15 13:45:51 +01:00
1f0b6391cc
Stickers contest blog post ( #184 )
...
color adjustment on image
Added hashtag + Spanish translation
change merch to gift
Fede's suggestions
Few small fixes
Stickers contest blog post
Co-authored-by: antilopa <antilopa@disroot.org>
Co-authored-by: Fede <fede@disroot.org>
Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-on: #184
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2020-12-08 15:12:06 +00:00
83829622fa
Remove Diaspora from FAQ
2020-12-05 23:25:49 +01:00
b4ac5a9903
remove matrix from FAQ
2020-12-05 23:01:20 +01:00
ca85e35d53
Fix link from FAQ to 2FA
2020-12-05 22:52:32 +01:00
0a2685e4ab
Fix typos
2020-12-05 22:47:15 +01:00
82e1b58a64
change double quotes by single ones
2020-11-25 22:09:32 +01:00
1ca8fe8efa
more Russian correctly
2020-11-23 08:26:43 +03:00
48b00c8020
green energy and other bit corrects
2020-11-23 08:19:21 +03:00
a3b50ff089
Merge branch 'master' into master
2020-11-23 05:13:54 +00:00
16a20c27f0
Merge branch 'master' into green_badge
2020-11-22 20:39:56 +00:00
d1535eb2a4
for nice look
2020-11-22 21:03:55 +03:00
d8ccb141ff
hardware donations
2020-11-22 19:18:00 +03:00
d740f65cb2
endless edits
2020-11-22 19:08:03 +03:00
fa26a358cc
More correct russian language
2020-11-22 18:58:26 +03:00
d462a5c3a6
FAQ translated to Russia language
2020-11-22 15:38:14 +03:00
de6699c420
"Мы" instead "О нас"
2020-11-22 13:41:43 +03:00
4aa4a9ffeb
I hate Windows standard encoding. Ave UTF-8!
2020-11-22 13:30:56 +03:00
b1972d1bf6
God save the Putin and russian symbol encoding
2020-11-22 13:24:37 +03:00
754d528834
Encoding symbols correct
2020-11-22 10:17:26 +00:00
bbab805d0e
DisrootTeam and Transparency
2020-11-22 13:12:10 +03:00
8aed6fa4c7
Corrected russian translate
2020-11-22 12:50:03 +03:00
73b5738da8
Synchronization
2020-11-22 12:45:18 +03:00
0af32399c1
in process...
2020-11-22 12:44:45 +03:00
07a0d464d5
Merge branch 'master' into master
2020-11-22 09:31:49 +00:00
4271367909
oops:)
2020-11-21 18:22:02 +03:00
