acetone
/
Website
forked from Disroot/Website
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,702 Commits 17 Branches 0 Tags 101 MiB
Commit Graph

1702 Commits

Author SHA1 Message Date
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
meaz ae0c7a1c09 fix yahoo 2020-11-07 19:07:25 +01:00
meaz 0d55f88147 Merge pull request 'Blog post about MS issue' (#164) from MS into master 
Reviewed-on: Disroot/Website#164
 2020-11-07 17:17:10 +00:00
meaz ccc1c6c4fa Merge branch 'master' into MS 2020-11-07 17:02:16 +00:00
Fede.- f28bd16f44 Merge pull request 'update not EN contact pages with NC Talk' (#167) from contact_NC into master 
Reviewed-on: Disroot/Website#167
 2020-11-07 13:29:12 +00:00
Fede.- a68e57dd80 Updated Spanish translation and minor fixes on English post 2020-11-07 10:23:58 -03:00
meaz 395ea4f058 Remove the blocking part + some fixes 2020-11-07 05:20:09 +01:00
meaz 553db9c2cb replace yahoo by hotmail 2020-10-28 09:09:43 +01:00
meaz 3633b8957b bump vagrant to 2.10 version 2020-10-28 09:04:09 +01:00
meaz 7fbf918cf0 add disroot blog link 2020-10-28 08:42:11 +01:00
Fede.- 6b848975b2 Small fixes on text, added MS support contact page 2020-10-27 16:54:08 -03:00
Fede.- c4ef5f3e36 Merge branch 'MS' of https://git.disroot.org/Disroot/Website into MS 2020-10-27 16:00:06 -03:00
Fede.- 9d9c1e6969 Spanish translation of MS post 2020-10-27 15:55:21 -03:00
Fede.- efb026f6c2 MS post 
Few typos fixed
 2020-10-27 15:55:21 -03:00
meaz 302e89eb81 Blog post about MS issue 2020-10-27 15:55:21 -03:00
meaz ba8ed68809 update not EN contact pages with NC Talk 2020-10-27 11:28:47 +01:00
antilopa c3a9473d52 Merge pull request 'adds Nextcloud Talk link on contact page' (#165) from nextcloud_contact into master 
Reviewed-on: Disroot/Website#165
 2020-10-26 12:50:34 +00:00
antilopa 5bc48936cc Merge branch 'master' into nextcloud_contact 2020-10-26 12:50:05 +00:00
antilopa f858fef529 Merge pull request 'blog_vagrant' (#166) from blog_vagrant into master 
Reviewed-on: Disroot/Website#166
 2020-10-26 12:48:11 +00:00
meaz 7cb17c76d5 Add themer annd fix wwwuser var 2020-10-25 00:15:21 +02:00