wallun
/
disroot-website
forked from Disroot/Website
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,772 Commits 17 Branches 0 Tags 102 MiB
Commit Graph

1772 Commits

Author SHA1 Message Date
meaz 61dfab4d54 Merge pull request '[Blog-it] Translate sticker contest post' (#185) from blog-it-sticker into master 
Reviewed-on: Disroot/Website#185
 2020-12-15 13:01:07 +00:00
l3o a37a02316b [Blog-it] Translate sticker contest post 2020-12-15 13:45:51 +01:00
meaz 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: Disroot/Website#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
meaz 441c3ca33e Merge pull request 'add tagcloud plugin to vagrant + info about language-selector' (#182) from meazdev into master 
Reviewed-on: Disroot/Website#182
 2020-12-05 23:19:20 +00:00
meaz face1b7435 add tagcloud plugin to vagrant + info about language-selector 2020-12-06 00:17:27 +01:00
meaz 8c388fafe2 Merge pull request 'Update to debian10' (#181) from debian10 into master 
Reviewed-on: Disroot/Website#181
 2020-12-05 22:45:31 +00:00
meaz 6bc4f1fef5 Merge branch 'master' into debian10 2020-12-05 23:37:32 +01:00
meaz c4ba122df4 Merge pull request 'Remove Diaspora from FAQ' (#180) from meazdev into master 
Reviewed-on: Disroot/Website#180
 2020-12-05 22:27:19 +00:00
meaz 83829622fa Remove Diaspora from FAQ 2020-12-05 23:25:49 +01:00
meaz bcbc3d4d9b Merge pull request 'remove matrix from FAQ' (#179) from meazdev into master 
Reviewed-on: Disroot/Website#179
 2020-12-05 22:03:45 +00:00
meaz b4ac5a9903 remove matrix from FAQ 2020-12-05 23:01:20 +01:00
meaz 5de456a08b Merge pull request 'Fix link from FAQ to 2FA' (#178) from meazdev into master 
Reviewed-on: Disroot/Website#178
 2020-12-05 21:54:19 +00:00
meaz f3d48ad7fc Merge branch 'master' into meazdev 2020-12-05 21:53:56 +00:00
meaz ca85e35d53 Fix link from FAQ to 2FA 2020-12-05 22:52:32 +01:00
meaz 74ce93fefb Merge pull request 'Fix typos' (#177) from meazdev into master 
Reviewed-on: Disroot/Website#177
 2020-12-05 21:48:34 +00:00
meaz 0a2685e4ab Fix typos 2020-12-05 22:47:15 +01:00
meaz d0627fa6d6 Merge pull request 'change double quotes by single ones' (#175) from fix_russian into master 
Reviewed-on: Disroot/Website#175
 2020-11-25 21:10:47 +00:00
meaz 82e1b58a64 change double quotes by single ones 2020-11-25 22:09:32 +01:00
meaz c4da86b148 Merge pull request 'FAQ translated to Russian language' (#174) from acetone/Website:master into master 
Reviewed-on: Disroot/Website#174
 2020-11-23 13:08:54 +00:00
acetone 1ca8fe8efa more Russian correctly 2020-11-23 08:26:43 +03:00
acetone 48b00c8020 green energy and other bit corrects 2020-11-23 08:19:21 +03:00
acetone a3b50ff089 Merge branch 'master' into master 2020-11-23 05:13:54 +00:00
meaz 813e5336a5 Merge pull request 'add green badge' (#142) from green_badge into master 
Reviewed-on: Disroot/Website#142
 2020-11-22 20:40:23 +00:00
meaz 16a20c27f0 Merge branch 'master' into green_badge 2020-11-22 20:39:56 +00:00
acetone d1535eb2a4 for nice look 2020-11-22 21:03:55 +03:00
acetone d77a69e5d5 Merge branch 'master' into master 2020-11-22 16:26:51 +00:00
acetone d8ccb141ff hardware donations 2020-11-22 19:18:00 +03:00
acetone d740f65cb2 endless edits 2020-11-22 19:08:03 +03:00
acetone fa26a358cc More correct russian language 2020-11-22 18:58:26 +03:00
acetone d462a5c3a6 FAQ translated to Russia language 2020-11-22 15:38:14 +03:00
meaz 4928ebf716 Merge pull request 'Translated main pages to russian language' (#173) from acetone/Website:master into master 
Reviewed-on: Disroot/Website#173
 2020-11-22 10:46:22 +00:00
acetone de6699c420 "Мы" instead "О нас" 2020-11-22 13:41:43 +03:00
acetone 4aa4a9ffeb I hate Windows standard encoding. Ave UTF-8! 2020-11-22 13:30:56 +03:00
acetone b1972d1bf6 God save the Putin and russian symbol encoding 2020-11-22 13:24:37 +03:00
acetone 754d528834 Encoding symbols correct 2020-11-22 10:17:26 +00:00
acetone bbab805d0e DisrootTeam and Transparency 2020-11-22 13:12:10 +03:00
acetone 8aed6fa4c7 Corrected russian translate 2020-11-22 12:50:03 +03:00
acetone 73b5738da8 Synchronization 2020-11-22 12:45:18 +03:00
acetone 0af32399c1 in process... 2020-11-22 12:44:45 +03:00
acetone 07a0d464d5 Merge branch 'master' into master 2020-11-22 09:31:49 +00:00
meaz 451b48bcc3 Updated the monthly overview for few month, corrected the donation graph (#172) 2020-11-21 21:26:37 +00:00
acetone 4271367909 oops:) 2020-11-21 18:22:02 +03:00
acetone 5f2ee27a31 acetone with love from Russia 2020-11-21 18:18:28 +03:00
antil0pa 79e70e6e67 Updated the monthly overview for few month, corrected the donation graph 2020-11-21 10:42:30 +01:00
meaz 24b8026382 Merge pull request 'disabled forms, added line on contact page about chat bridge' (#171) from muppdev into master 
Reviewed-on: Disroot/Website#171
 2020-11-15 07:55:52 +00:00
muppeth 4facb4615b disabled forms, added line on contact page about chat bridge 2020-11-15 08:40:43 +01:00
meaz c78b193336 Merge pull request 'readme_vagrant' (#168) from readme_vagrant into master 
Reviewed-on: Disroot/Website#168
 2020-11-15 06:25:39 +00:00
meaz 7616f6cb43 Merge branch 'master' into readme_vagrant 2020-11-15 06:25:13 +00:00
meaz 59c5abd458 Merge branch 'master' into green_badge 2020-11-15 06:23:30 +00:00
meaz 7212b16d40 Merge pull request 'fix yahoo' (#170) from quick_fix into master 
Reviewed-on: Disroot/Website#170
 2020-11-07 18:09:00 +00:00