|
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 |
|
|
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 |
|
|
560a2d4a46
|
Blog Deck - it translation - last part
|
2020-09-16 10:40:32 +02:00 |
|
|
e21458ce99
|
Blog "Deck" - it translation - fixed some small mistake
|
2020-09-16 10:34:12 +02:00 |
|
|
593a449388
|
Blog "Deck" - it translation
|
2020-09-16 10:29:23 +02:00 |
|
|
60424c09b9
|
IT- traduction
|
2020-09-14 21:33:16 +02:00 |
|
|
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 |
|
|
beed451478
|
Header image fix
|
2020-09-14 09:17:18 -03:00 |
|
|
3031ffce78
|
Header image fix
|
2020-09-14 09:13:43 -03:00 |
|
|
d8c0379eec
|
Fixed header image
|
2020-09-14 11:55:28 +00:00 |
|
|
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 |
|
|
fa6482e9f3
|
NC Deck blogpost by AvJoe
|
2020-09-12 12:32:27 -03:00 |
|
|
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 |
|
|
e678872a50
|
Blog it-translation first half of 2020 and disroot is 5
|
2020-08-10 10:38:43 +02:00 |
|
|
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 |
|
|
a52e8c96e8
|
Website: small updates and fixes plus Blogpost translations
|
2020-08-09 03:29:19 -03:00 |
|
|
1a4f70a3d8
|
blogs - half year 2020;disroot is 5 (#154)
|
2020-08-07 20:40:15 +00:00 |
|
|
264271188e
|
Merge branch 'master' into muppdev
|
2020-08-07 16:11:23 +00:00 |
|
|
c88fd9b486
|
uploaded smaller image of sunflowers
|
2020-08-07 18:06:04 +02:00 |
|
|
726c57bd77
|
blogs - half year 2020;disroot is 5
|
2020-08-07 17:59:57 +02:00 |
|
|
7ccf905e52
|
updated report
|
2020-08-07 09:28:40 +02:00 |
|
|
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 |
|
|
244ef9a6c8
|
2019 yearly report
|
2020-08-06 15:01:27 +02:00 |
|
|
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 |
|
|
b350419420
|
new conversations picture
|
2020-08-06 14:34:08 +02:00 |
|
|
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 |
|
|
3fe6e0f156
|
Merge branch 'master' into goals
|
2020-08-06 12:07:16 +00:00 |
|
|
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 |
|
|
d4a083ed91
|
Merge branch 'master' into goals
|
2020-07-18 19:17:16 +00:00 |
|