acetone
/
Website
forked from Disroot/Website
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • a0566b9e01
         add changelog repo meaz 2021-03-20 11:23:34 +0100
  • ebc24b78a8 Merge pull request 'Add if to avoid errors + fix few other errors + fix erros with PP' (#194) from vagrant_if into master meaz 2021-03-09 13:38:47 +0000
  • f6ef0dd5e2 Merge branch 'master' into vagrant_if meaz 2021-03-03 10:51:15 +0000
  • 19bda7ef1e Merge pull request 'Correct typo in english form' (#205) from wallun/disroot-website:master into master meaz 2021-03-03 10:50:58 +0000
  • 57559db9ad
         Correct typo in english form Wallun 2021-03-03 10:22:26 +0100
  • 6dd7b8b18f update overview feb 2021 (#204) meaz 2021-03-02 13:05:04 +0000
  • 865dfb4896 update overview feb 2021 antilopa 2021-03-02 13:37:52 +0100
  • 1605fb86cd Merge pull request 'yearly overview 2020' (#203) from overview2020 into master meaz 2021-03-02 10:09:31 +0000
  • 22b6c2479b Merge branch 'master' into overview2020 meaz 2021-03-02 10:09:12 +0000
  • 14692da53c Merge pull request 'Update coffee index page link' (#202) from coffee into master antilopa 2021-03-02 09:52:18 +0000
  • 34dd1d576a yearly overview 2020 antilopa 2021-03-02 10:22:34 +0100
  • e79c8dbde4 Update coffee index page link meaz 2021-03-01 09:43:20 +0100
  • b0591bc818 Merge pull request 'Changed bank info and made other small fixes in ita translation' (#201) from it-bank-transfer into master meaz 2021-02-26 20:42:03 +0000
  • b0fcafc73b Fixed mistake in form l3o 2021-02-26 21:39:09 +0100
  • 8742ba27f4 Changed bank info and made other small fixes in ita translation l3o 2021-02-26 20:46:11 +0100
  • d557542946 Merge pull request 'bank transfer restricited to SEPA only' (#200) from sepa into master antilopa 2021-02-25 08:10:08 +0000
  • 911e0a4bc6 bank transfer restricited to SEPA only meaz 2021-02-25 09:04:27 +0100
  • da48afef5f Merge pull request 'remove link as it is not directing to the right website anymore' (#198) from exploitation into master Fede.- 2021-02-23 22:51:24 +0000
  • 1b4710079b Merge branch 'exploitation' of https://git.disroot.org/Disroot/Website into exploitation Fede.- 2021-02-23 19:50:33 -0300
  • c862174dbb remove link as it is not directing to the right website anymore meaz 2021-02-23 11:52:04 +0100
  • be2cc4e8d5 remove link as it is not directing to the right website anymore meaz 2021-02-23 11:52:04 +0100
  • 9006269c42 Merge pull request 'Spanish translation of last post' (#197) from Blog_Sp_translation into master meaz 2021-02-22 19:28:20 +0000
  • d716753d53 Spanish translation of last post Fede.- 2021-02-22 11:13:41 -0300
  • f6be008952 Merge pull request 'blog post about the downtime because of the loose cable' (#196) from cable_downtime into master antilopa 2021-02-22 13:31:20 +0000
  • 9a3d59f2f1 added a line break for readabilty antilopa 2021-02-22 14:30:47 +0100
  • 65882ccf66 corrected post date from 2020 to 2021 antilopa 2021-02-22 14:30:07 +0100
  • 7c93cc2be5 corrected some typos antilopa 2021-02-22 14:19:44 +0100
  • b8d9e419b3 blog post about the downtime because of the loose cable muppeth 2021-02-22 13:22:00 +0100
  • 592380c04f Fix typo in russian version meaz 2021-02-20 09:55:49 +0100
  • 6e29c5d74c Merge pull request 're-enable extra storage forms' (#195) from enable_storage_form into master meaz 2021-02-18 05:38:17 +0000
  • 881d33ed25 re-enable extra storage forms antilopa 2021-02-18 00:15:09 +0100
  • e1cd829666 Add if to avoid errors + fix few other errors + fix erros with PP meaz 2021-02-14 11:30:15 +0100
  • affd69dea1 Merge pull request 'Update contact with new gpg key for cryptdisroot' (#192) from contact_gpg into master antilopa 2021-02-13 07:34:54 +0000
  • 882ae50c89 antilopa's suggestion into other language page meaz 2021-02-13 06:10:34 +0100
  • 611ac540c4 Merge branch 'master' into contact_gpg meaz 2021-02-13 04:57:20 +0000
  • 9c3f317367 suggestion for better layout antilopa 2021-02-12 21:09:03 +0100
  • 027fec6c0f Merge pull request 'Remove badge from services' (#189) from badge into master antilopa 2021-02-12 19:43:08 +0000
  • 546955e508 Merge pull request 'fix error with grub when using vagrant' (#193) from vagrant_grub into master antilopa 2021-02-12 19:39:53 +0000
  • e19910ab3c Merge branch 'master' into badge meaz 2021-02-09 21:45:47 +0000
  • 6592f11d51 Merge branch 'master' into contact_gpg meaz 2021-02-09 21:45:07 +0000
  • 19c9560579 Merge branch 'master' into vagrant_grub meaz 2021-02-09 21:44:44 +0000
  • 8cb01a13e6 Merge pull request 'change Attachement size limit info to 64MB' (#191) from email_size into master meaz 2021-02-09 21:44:14 +0000
  • ecc4d0704b fix error with grub when using vagrant meaz 2021-02-09 22:43:10 +0100
  • 407990f10d Update contact with new gpg key for cryptdisroot meaz 2021-02-09 22:40:29 +0100
  • ec9e2ba313 Merge branch 'master' into email_size meaz 2021-02-09 05:47:25 +0000
  • d2d431b34c Merge pull request 'Choose what Grav version to install + minors improvments / if statement' (#190) from bootstrap into master meaz 2021-02-09 05:46:19 +0000
  • cbd0fdcfc6 change from 70 to 64 in case the calculation of the message size is off meaz 2021-02-07 08:37:17 +0100
  • bfcbd48d2d change Attachement size limit info to 70MB meaz 2021-02-07 08:34:42 +0100
  • 0b630c479d Choose what Grav version to install + minors improvments / if statement meaz 2021-02-06 00:20:12 +0100
  • 223f2e0776 Remove badge from services meaz 2021-02-04 06:34:53 +0100
  • 68238d1e38 Blogpost Spanish translation + fixed minor typos in English (#188) Fede.- 2020-12-31 17:07:59 +0000
  • 8cbcf4c100 Merge pull request 'blog post end 2020' (#187) from muppwrite into master meaz 2020-12-31 10:58:01 +0000
  • ffd65186db blog post end 2020 muppeth 2020-12-31 11:20:29 +0100
  • 09ba743ce3 emergancy push to update microshit blog post muppeth 2020-12-29 12:02:32 +0100
  • 61dfab4d54 Merge pull request '[Blog-it] Translate sticker contest post' (#185) from blog-it-sticker into master meaz 2020-12-15 13:01:07 +0000
  • a37a02316b [Blog-it] Translate sticker contest post l3o 2020-12-15 13:45:51 +0100
  • 1f0b6391cc Stickers contest blog post (#184) meaz 2020-12-08 15:12:06 +0000
  • 441c3ca33e Merge pull request 'add tagcloud plugin to vagrant + info about language-selector' (#182) from meazdev into master meaz 2020-12-05 23:19:20 +0000
  • face1b7435 add tagcloud plugin to vagrant + info about language-selector meaz 2020-12-06 00:17:27 +0100
  • 8c388fafe2 Merge pull request 'Update to debian10' (#181) from debian10 into master meaz 2020-12-05 22:45:31 +0000
  • 6bc4f1fef5 Merge branch 'master' into debian10 meaz 2020-12-05 23:37:32 +0100
  • c4ba122df4 Merge pull request 'Remove Diaspora from FAQ' (#180) from meazdev into master meaz 2020-12-05 22:27:19 +0000
  • 83829622fa Remove Diaspora from FAQ meaz 2020-12-05 23:25:49 +0100
  • bcbc3d4d9b Merge pull request 'remove matrix from FAQ' (#179) from meazdev into master meaz 2020-12-05 22:03:45 +0000
  • b4ac5a9903 remove matrix from FAQ meaz 2020-12-05 23:01:20 +0100
  • 5de456a08b Merge pull request 'Fix link from FAQ to 2FA' (#178) from meazdev into master meaz 2020-12-05 21:54:19 +0000
  • f3d48ad7fc Merge branch 'master' into meazdev meaz 2020-12-05 21:53:56 +0000
  • ca85e35d53 Fix link from FAQ to 2FA meaz 2020-12-05 22:52:32 +0100
  • 74ce93fefb Merge pull request 'Fix typos' (#177) from meazdev into master meaz 2020-12-05 21:48:34 +0000
  • 0a2685e4ab Fix typos meaz 2020-12-05 22:47:15 +0100
  • d0627fa6d6 Merge pull request 'change double quotes by single ones' (#175) from fix_russian into master meaz 2020-11-25 21:10:47 +0000
  • 82e1b58a64 change double quotes by single ones meaz 2020-11-25 22:09:32 +0100
  • c4da86b148 Merge pull request 'FAQ translated to Russian language' (#174) from acetone/Website:master into master meaz 2020-11-23 13:08:54 +0000
  • 1ca8fe8efa more Russian correctly master acetone 2020-11-23 08:26:43 +0300
  • 48b00c8020 green energy and other bit corrects acetone 2020-11-23 08:19:21 +0300
  • a3b50ff089 Merge branch 'master' into master acetone 2020-11-23 05:13:54 +0000
  • 813e5336a5 Merge pull request 'add green badge' (#142) from green_badge into master meaz 2020-11-22 20:40:23 +0000
  • 16a20c27f0 Merge branch 'master' into green_badge meaz 2020-11-22 20:39:56 +0000
  • d1535eb2a4 for nice look acetone 2020-11-22 21:03:55 +0300
  • d77a69e5d5 Merge branch 'master' into master acetone 2020-11-22 16:26:51 +0000
  • d8ccb141ff hardware donations acetone 2020-11-22 19:18:00 +0300
  • d740f65cb2 endless edits acetone 2020-11-22 19:08:03 +0300
  • fa26a358cc More correct russian language acetone 2020-11-22 18:58:26 +0300
  • d462a5c3a6 FAQ translated to Russia language acetone 2020-11-22 15:38:14 +0300
  • 4928ebf716 Merge pull request 'Translated main pages to russian language' (#173) from acetone/Website:master into master meaz 2020-11-22 10:46:22 +0000
  • de6699c420 "Мы" instead "О нас" acetone 2020-11-22 13:41:43 +0300
  • 4aa4a9ffeb I hate Windows standard encoding. Ave UTF-8! acetone 2020-11-22 13:30:56 +0300
  • b1972d1bf6 God save the Putin and russian symbol encoding acetone 2020-11-22 13:24:37 +0300
  • 754d528834 Encoding symbols correct acetone 2020-11-22 10:17:26 +0000
  • bbab805d0e DisrootTeam and Transparency acetone 2020-11-22 13:12:10 +0300
  • 8aed6fa4c7 Corrected russian translate acetone 2020-11-22 12:50:03 +0300
  • 73b5738da8 Synchronization acetone 2020-11-22 12:45:18 +0300
  • 0af32399c1 in process... acetone 2020-11-22 12:44:45 +0300
  • 07a0d464d5 Merge branch 'master' into master acetone 2020-11-22 09:31:49 +0000
  • 451b48bcc3 Updated the monthly overview for few month, corrected the donation graph (#172) meaz 2020-11-21 21:26:37 +0000
  • 4271367909 oops:) acetone 2020-11-21 18:22:02 +0300
  • 5f2ee27a31 acetone with love from Russia acetone 2020-11-21 18:18:28 +0300
  • 79e70e6e67 Updated the monthly overview for few month, corrected the donation graph thelongwaitingoverview antil0pa 2020-11-21 10:42:30 +0100
  • 24b8026382 Merge pull request 'disabled forms, added line on contact page about chat bridge' (#171) from muppdev into master meaz 2020-11-15 07:55:52 +0000
  • 4facb4615b disabled forms, added line on contact page about chat bridge muppdev muppeth 2020-11-15 08:40:43 +0100