fleg
/
DisrootWebsite
forked from Disroot/Website
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,618 Commits 29 Branches 0 Tags 221 MiB
Commit Graph

1618 Commits

Author SHA1 Message Date
meaz 78de38128c Merge branch 'master' into green_badge 2020-08-09 09:01:08 +00:00
meaz d512097002 move from home to about page + change background color 2020-08-09 10:58:53 +02:00
meaz acec97eb5f Merge pull request 'Website: small updates and fixes plus Blogpost translations' (#156) from Website_Blog_ES_updates into master 
Reviewed-on: Disroot/Website#156
 2020-08-09 08:31:18 +00:00
Fede.- a52e8c96e8 Website: small updates and fixes plus Blogpost translations 2020-08-09 03:29:19 -03:00
meaz 1a4f70a3d8 blogs - half year 2020;disroot is 5 (#154) 2020-08-07 20:40:15 +00:00
muppeth 264271188e Merge branch 'master' into muppdev 2020-08-07 16:11:23 +00:00
muppeth c88fd9b486 uploaded smaller image of sunflowers 2020-08-07 18:06:04 +02:00
muppeth 726c57bd77 blogs - half year 2020;disroot is 5 2020-08-07 17:59:57 +02:00
antil0pa 7ccf905e52 updated report 2020-08-07 09:28:40 +02:00
meaz 214200cecd Merge pull request '2019 yearly report' (#153) from annual_report_2019 into master 
Reviewed-on: Disroot/Website#153
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
 2020-08-07 06:26:38 +00:00
meaz 664c5028c2 Merge branch 'master' into green_badge 2020-08-07 06:25:34 +00:00
antil0pa 244ef9a6c8 2019 yearly report 2020-08-06 15:01:27 +02:00
antilopa 0a536ee4dd Merge pull request 'xmppbridges' (#151) from xmppbridges into master 
Reviewed-on: Disroot/Website#151
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
 2020-08-06 12:34:32 +00:00
antil0pa b350419420 new conversations picture 2020-08-06 14:34:08 +02:00
antil0pa 8d6ac56ddf fixed a typo, added a hyperlink. 2020-08-06 14:20:32 +02:00
antilopa 90288ab4f6 Merge branch 'master' into green_badge 2020-08-06 12:16:43 +00:00
antilopa efc52afbba Merge pull request 'goals' (#149) from goals into master 
Reviewed-on: Disroot/Website#149
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
 2020-08-06 12:08:54 +00:00
antilopa 3fe6e0f156 Merge branch 'master' into goals 2020-08-06 12:07:16 +00:00
meaz f6e54921c2 Merge pull request 'Fixed some spelling mistakes [English/Services/PrivateBin]' (#152) from lampenit/Website:master into master 
Reviewed-on: Disroot/Website#152
 2020-08-01 05:45:46 +00:00
lampenit e7a0dff300 Fixed some spelling mistakes 2020-07-20 14:18:06 +00:00
meaz d4a083ed91 Merge branch 'master' into goals 2020-07-18 19:17:16 +00:00
meaz 052494f227 Merge branch 'master' into green_badge 2020-07-17 06:34:55 +00:00
meaz 10703c943d Merge branch 'master' into xmppbridges 2020-07-17 06:33:20 +00:00
meaz aa6cd795b7 Merge pull request 'about' (#150) from about into master 
Reviewed-on: Disroot/Website#150
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
 2020-07-17 05:13:04 +00:00
meaz fa6aac2726 improve how matrix syntax is displayed 2020-07-13 17:31:46 +02:00
meaz 424e347857 add info about Disroot team 2020-07-13 17:24:00 +02:00
meaz 7078fbe4a9 Add syntax for Matrix 2020-07-11 00:06:01 +02:00
meaz 327cec52ac add syntax info for IRC channels 2020-07-10 23:28:44 +02:00
meaz fe32a3042e add bgcolor 2020-07-10 21:36:00 +02:00
meaz a76799446c add avatars 2020-07-10 10:29:07 +02:00
meaz bb32896f7f add donated graph in section, remove it in tile 2020-07-10 09:48:01 +02:00
antil0pa e5812374fb small adjustments to text 2020-07-06 14:07:21 +02:00
meaz c74b7f3d92 readd deleted image! 2020-06-27 15:39:34 +02:00
meaz c85871353e create goals tiles + change blocks order 2020-06-27 15:35:21 +02:00
meaz 6195e8a4b1 Merge pull request 'finacial overview till may 2020' (#147) from financial_overview_jun2020 into master 2020-06-05 18:50:27 +00:00
antil0pa fe85f0992c finacial overview till may 2020 2020-06-05 16:58:52 +02:00
antilopa 6a84a4f969 Merge pull request 'improve info about NC key resetting' (#131) from Faq into master 
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
 2020-05-27 10:54:15 +00:00
antilopa 0b065b5a0d Merge pull request 'Add mumble clients in En and Fr' (#141) from mumble_clients into master 
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
 2020-05-27 10:52:50 +00:00
l3o 26882c74ff Translated blog article: Roundcube (#146) 
Translated blog article: Roundcube

Co-authored-by: l3o <l3o@disroot.org>
 2020-05-21 12:50:38 +00:00
meaz dfff9295cd Merge pull request 'Roundcube announcement' (#145) from roundcube_post into master 
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
 2020-05-20 09:24:14 +00:00
Fede.- 243287b995 Roundcube announcement 2020-05-20 01:31:05 -03:00
antil0pa d26c785cb3 updated git settings 2020-05-08 11:32:29 +02:00
antilopa 193ae70991 Merge pull request 'Update donation address' (#143) from update_donation_page into master 2020-05-08 09:29:14 +00:00
antil0pa f95f7bf6b1 Update donation address 2020-05-08 11:26:30 +02:00
meaz 8018111118 change location of badge + fix error with bkground 2020-04-22 11:47:00 +02:00
meaz acf0a1b654 add green badge 2020-04-22 11:34:12 +02:00
meaz 4aa28acc1f Add mumble clients in En and Fr 2020-04-21 07:09:56 +02:00
meaz 6a5b83ab6e Merge pull request 'IT traduction - blog flisol' (#140) from IT-blog-flisol into master 2020-04-16 12:57:08 +00:00
l3o 887dbc1376 IT traduction - blog flisol 2020-04-16 14:42:06 +02:00
meaz 9e4095f4fc Merge pull request 'Post about Flisol' (#139) from flisol_blogpost into master 2020-04-14 06:47:23 +00:00