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
meaz d8e6507550 add missing / 2020-10-24 23:44:03 +02:00
meaz 46aef7ea7e add blog repo to vagrant 2020-10-24 23:16:17 +02:00
meaz 2802b37a6c adds Nextcloud Talk link on contact page 2020-10-24 11:11:50 +02:00
meaz c6be15469d Change yahoo by hotmail 2020-10-23 18:56:41 +02:00
Fede.- 9f3c3c5243 Spanish translation of MS post 2020-10-23 09:43:03 -03:00
Fede.- 18e520619d MS post 
Few typos fixed
 2020-10-23 12:31:13 +00:00
meaz 00557444b0 Blog post about MS issue 2020-10-23 12:05:41 +02:00
meaz b2a676407b Merge pull request 'Spanish blogpost translation' (#163) from WEBSITE_BLOG_10_14_ES into master 
Reviewed-on: Disroot/Website#163
 2020-10-16 04:33:54 +00:00
Fede.- b16e3b34d0 Spanish translation for Roadmap 4T post 2020-10-15 15:05:57 -03:00
Fede.- 4665b31f80 Merge branch 'WEBSITE_BLOG_10_14_ES' of https://git.disroot.org/Disroot/Website into WEBSITE_BLOG_10_14_ES 2020-10-15 15:04:50 -03:00
Fede.- b3e433f4c1 Spanish blogpost translation 2020-10-15 14:47:05 -03:00
meaz 520599e72c Merge branch 'master' into WEBSITE_BLOG_10_14_ES 2020-10-15 13:36:59 +00:00
Fede.- e6aad5e508 Merge pull request 'roadmap q4 2020' (#162) from muppdev into master 
Reviewed-on: Disroot/Website#162
 2020-10-15 11:53:56 +00:00
Fede.- 2537117d5b Small fixes on posts links 2020-10-15 08:52:43 -03:00
Fede.- 5991f35c88 Spanish blogpost translation 2020-10-14 17:05:06 -03:00
muppeth 834b84ee9f roadmap q4 2020 2020-10-14 21:11:38 +02:00
muppeth 80e7d7f1a4 small fix to the blog post 2020-10-14 19:21:14 +02:00
meaz 266dae99ea Merge pull request 'switching some light off blog post' (#161) from muppdev into master 
Reviewed-on: Disroot/Website#161
 2020-10-14 16:20:14 +00:00
muppeth 56dc641bac switching some light off blog post 2020-10-14 08:28:50 +02:00
meaz 22394c40b4 Merge pull request 'blog-it-NC-deck' (#160) from blog-it-NC-deck into master 
Reviewed-on: Disroot/Website#160
 2020-09-16 12:17:28 +00:00
l3o 560a2d4a46 Blog Deck - it translation - last part 2020-09-16 10:40:32 +02:00
l3o e21458ce99 Blog "Deck" - it translation - fixed some small mistake 2020-09-16 10:34:12 +02:00
l3o 593a449388 Blog "Deck" - it translation 2020-09-16 10:29:23 +02:00
l3o 60424c09b9 IT- traduction 2020-09-14 21:33:16 +02:00
l3o 9f565a2be2 Start translation it 2020-09-14 21:18:09 +02:00
Fede.- 1b2a23e292 Header image fix 
Reviewed-on: Disroot/Website#159
 2020-09-14 12:18:31 +00:00
Fede.- 119d679ffa Merge branch 'deck_post' of https://git.disroot.org/Disroot/Website into deck_post 2020-09-14 09:17:28 -03:00
Fede.- beed451478 Header image fix 2020-09-14 09:17:18 -03:00
Fede.- 3031ffce78 Header image fix 2020-09-14 09:13:43 -03:00
Fede.- d8c0379eec Fixed header image 2020-09-14 11:55:28 +00:00
Fede.- 6fcdce971e Merge pull request 'NC Deck blogpost by AvJoe' (#158) from deck_post into master 
Reviewed-on: Disroot/Website#158
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
 2020-09-14 11:32:00 +00:00
Fede.- fa6482e9f3 NC Deck blogpost by AvJoe 2020-09-12 12:32:27 -03:00
meaz 12af2453d8 Merge pull request 'Blog it-translation first half of 2020 and disroot is 5' (#157) from blog-it-first-half-of-2020 into master 
Reviewed-on: Disroot/Website#157
 2020-08-10 09:44:33 +00:00
l3o e678872a50 Blog it-translation first half of 2020 and disroot is 5 2020-08-10 10:38:43 +02:00
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