Commit graph

1667 commits

Author SHA1 Message Date
4facb4615b disabled forms, added line on contact page about chat bridge 2020-11-15 08:40:43 +01:00
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
7616f6cb43 Merge branch 'master' into readme_vagrant 2020-11-15 06:25:13 +00:00
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
ae0c7a1c09 fix yahoo 2020-11-07 19:07:25 +01:00
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
ccc1c6c4fa Merge branch 'master' into MS 2020-11-07 17:02:16 +00:00
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
a68e57dd80 Updated Spanish translation and minor fixes on English post 2020-11-07 10:23:58 -03:00
395ea4f058 Remove the blocking part + some fixes 2020-11-07 05:20:09 +01:00
553db9c2cb replace yahoo by hotmail 2020-10-28 09:09:43 +01:00
3633b8957b bump vagrant to 2.10 version 2020-10-28 09:04:09 +01:00
7fbf918cf0 add disroot blog link 2020-10-28 08:42:11 +01:00
6b848975b2 Small fixes on text, added MS support contact page 2020-10-27 16:54:08 -03:00
c4ef5f3e36 Merge branch 'MS' of https://git.disroot.org/Disroot/Website into MS 2020-10-27 16:00:06 -03:00
9d9c1e6969 Spanish translation of MS post 2020-10-27 15:55:21 -03:00
efb026f6c2 MS post
Few typos fixed
2020-10-27 15:55:21 -03:00
302e89eb81 Blog post about MS issue 2020-10-27 15:55:21 -03:00
ba8ed68809 update not EN contact pages with NC Talk 2020-10-27 11:28:47 +01:00
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
5bc48936cc Merge branch 'master' into nextcloud_contact 2020-10-26 12:50:05 +00:00
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
7cb17c76d5 Add themer annd fix wwwuser var 2020-10-25 00:15:21 +02:00
d8e6507550 add missing / 2020-10-24 23:44:03 +02:00
46aef7ea7e add blog repo to vagrant 2020-10-24 23:16:17 +02:00
2802b37a6c adds Nextcloud Talk link on contact page 2020-10-24 11:11:50 +02:00
c6be15469d Change yahoo by hotmail 2020-10-23 18:56:41 +02:00
9f3c3c5243 Spanish translation of MS post 2020-10-23 09:43:03 -03:00
18e520619d MS post
Few typos fixed
2020-10-23 12:31:13 +00:00
00557444b0 Blog post about MS issue 2020-10-23 12:05:41 +02:00
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
b16e3b34d0 Spanish translation for Roadmap 4T post 2020-10-15 15:05:57 -03:00
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
b3e433f4c1 Spanish blogpost translation 2020-10-15 14:47:05 -03:00
520599e72c Merge branch 'master' into WEBSITE_BLOG_10_14_ES 2020-10-15 13:36:59 +00:00
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
2537117d5b Small fixes on posts links 2020-10-15 08:52:43 -03:00
5991f35c88 Spanish blogpost translation 2020-10-14 17:05:06 -03:00
834b84ee9f roadmap q4 2020 2020-10-14 21:11:38 +02:00
80e7d7f1a4 small fix to the blog post 2020-10-14 19:21:14 +02:00
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
56dc641bac switching some light off blog post 2020-10-14 08:28:50 +02:00
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
1b2a23e292 Header image fix
Reviewed-on: Disroot/Website#159
2020-09-14 12:18:31 +00:00
119d679ffa Merge branch 'deck_post' of https://git.disroot.org/Disroot/Website into deck_post 2020-09-14 09:17:28 -03:00