 meaz
|
e1cd829666
|
Add if to avoid errors + fix few other errors + fix erros with PP
|
2021-02-14 11:30:15 +01:00 |
 antilopa
|
affd69dea1
|
Merge pull request 'Update contact with new gpg key for cryptdisroot' (#192) from contact_gpg into master
Reviewed-on: #192
|
2021-02-13 07:34:54 +00:00 |
|
meaz
|
882ae50c89
|
antilopa's suggestion into other language page
|
2021-02-13 06:10:34 +01:00 |
|
meaz
|
611ac540c4
|
Merge branch 'master' into contact_gpg
|
2021-02-13 04:57:20 +00:00 |
|
antilopa
|
9c3f317367
|
suggestion for better layout
|
2021-02-12 21:09:03 +01:00 |
|
antilopa
|
027fec6c0f
|
Merge pull request 'Remove badge from services' (#189) from badge into master
Reviewed-on: #189
|
2021-02-12 19:43:08 +00:00 |
|
antilopa
|
546955e508
|
Merge pull request 'fix error with grub when using vagrant' (#193) from vagrant_grub into master
Reviewed-on: #193
|
2021-02-12 19:39:53 +00:00 |
|
meaz
|
e19910ab3c
|
Merge branch 'master' into badge
|
2021-02-09 21:45:47 +00:00 |
|
meaz
|
6592f11d51
|
Merge branch 'master' into contact_gpg
|
2021-02-09 21:45:07 +00:00 |
|
meaz
|
19c9560579
|
Merge branch 'master' into vagrant_grub
|
2021-02-09 21:44:44 +00:00 |
|
meaz
|
8cb01a13e6
|
Merge pull request 'change Attachement size limit info to 64MB' (#191) from email_size into master
Reviewed-on: #191
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
|
2021-02-09 21:44:14 +00:00 |
|
meaz
|
ecc4d0704b
|
fix error with grub when using vagrant
|
2021-02-09 22:43:10 +01:00 |
|
meaz
|
407990f10d
|
Update contact with new gpg key for cryptdisroot
|
2021-02-09 22:40:29 +01:00 |
|
meaz
|
ec9e2ba313
|
Merge branch 'master' into email_size
|
2021-02-09 05:47:25 +00:00 |
|
meaz
|
d2d431b34c
|
Merge pull request 'Choose what Grav version to install + minors improvments / if statement' (#190) from bootstrap into master
Reviewed-on: #190
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
|
2021-02-09 05:46:19 +00:00 |
|
meaz
|
cbd0fdcfc6
|
change from 70 to 64 in case the calculation of the message size is off
|
2021-02-07 08:37:17 +01:00 |
|
meaz
|
bfcbd48d2d
|
change Attachement size limit info to 70MB
|
2021-02-07 08:34:42 +01:00 |
|
meaz
|
0b630c479d
|
Choose what Grav version to install + minors improvments / if statement
|
2021-02-06 00:20:12 +01:00 |
|
meaz
|
223f2e0776
|
Remove badge from services
|
2021-02-04 06:34:53 +01:00 |
 Fede.-
|
68238d1e38
|
Blogpost Spanish translation + fixed minor typos in English (#188)
Blogpost Spanish translation + fixed minor typos in English
Co-authored-by: Fede <fede@disroot.org>
Reviewed-on: #188
Co-Authored-By: Fede.- <fede@no-reply@disroot.org>
Co-Committed-By: Fede.- <fede@no-reply@disroot.org>
|
2020-12-31 17:07:59 +00:00 |
|
meaz
|
8cbcf4c100
|
Merge pull request 'blog post end 2020' (#187) from muppwrite into master
Reviewed-on: #187
|
2020-12-31 10:58:01 +00:00 |
 muppeth
|
ffd65186db
|
blog post end 2020
|
2020-12-31 11:20:29 +01:00 |
|
muppeth
|
09ba743ce3
|
emergancy push to update microshit blog post
|
2020-12-29 12:02:32 +01:00 |
|
meaz
|
61dfab4d54
|
Merge pull request '[Blog-it] Translate sticker contest post' (#185) from blog-it-sticker into master
Reviewed-on: #185
|
2020-12-15 13:01:07 +00:00 |
l3o
|
a37a02316b
|
[Blog-it] Translate sticker contest post
|
2020-12-15 13:45:51 +01:00 |
|
meaz
|
1f0b6391cc
|
Stickers contest blog post (#184)
color adjustment on image
Added hashtag + Spanish translation
change merch to gift
Fede's suggestions
Few small fixes
Stickers contest blog post
Co-authored-by: antilopa <antilopa@disroot.org>
Co-authored-by: Fede <fede@disroot.org>
Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-on: #184
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
|
2020-12-08 15:12:06 +00:00 |
|
meaz
|
441c3ca33e
|
Merge pull request 'add tagcloud plugin to vagrant + info about language-selector' (#182) from meazdev into master
Reviewed-on: #182
|
2020-12-05 23:19:20 +00:00 |
|
meaz
|
face1b7435
|
add tagcloud plugin to vagrant + info about language-selector
|
2020-12-06 00:17:27 +01:00 |
|
meaz
|
8c388fafe2
|
Merge pull request 'Update to debian10' (#181) from debian10 into master
Reviewed-on: #181
|
2020-12-05 22:45:31 +00:00 |
|
meaz
|
6bc4f1fef5
|
Merge branch 'master' into debian10
|
2020-12-05 23:37:32 +01:00 |
|
meaz
|
c4ba122df4
|
Merge pull request 'Remove Diaspora from FAQ' (#180) from meazdev into master
Reviewed-on: #180
|
2020-12-05 22:27:19 +00:00 |
|
meaz
|
83829622fa
|
Remove Diaspora from FAQ
|
2020-12-05 23:25:49 +01:00 |
|
meaz
|
bcbc3d4d9b
|
Merge pull request 'remove matrix from FAQ' (#179) from meazdev into master
Reviewed-on: #179
|
2020-12-05 22:03:45 +00:00 |
|
meaz
|
b4ac5a9903
|
remove matrix from FAQ
|
2020-12-05 23:01:20 +01:00 |
|
meaz
|
5de456a08b
|
Merge pull request 'Fix link from FAQ to 2FA' (#178) from meazdev into master
Reviewed-on: #178
|
2020-12-05 21:54:19 +00:00 |
|
meaz
|
f3d48ad7fc
|
Merge branch 'master' into meazdev
|
2020-12-05 21:53:56 +00:00 |
|
meaz
|
ca85e35d53
|
Fix link from FAQ to 2FA
|
2020-12-05 22:52:32 +01:00 |
|
meaz
|
74ce93fefb
|
Merge pull request 'Fix typos' (#177) from meazdev into master
Reviewed-on: #177
|
2020-12-05 21:48:34 +00:00 |
|
meaz
|
0a2685e4ab
|
Fix typos
|
2020-12-05 22:47:15 +01:00 |
|
meaz
|
d0627fa6d6
|
Merge pull request 'change double quotes by single ones' (#175) from fix_russian into master
Reviewed-on: #175
|
2020-11-25 21:10:47 +00:00 |
|
meaz
|
82e1b58a64
|
change double quotes by single ones
|
2020-11-25 22:09:32 +01:00 |
|
meaz
|
c4da86b148
|
Merge pull request 'FAQ translated to Russian language' (#174) from acetone/Website:master into master
Reviewed-on: #174
|
2020-11-23 13:08:54 +00:00 |
 acetone
|
1ca8fe8efa
|
more Russian correctly
|
2020-11-23 08:26:43 +03:00 |
|
acetone
|
48b00c8020
|
green energy and other bit corrects
|
2020-11-23 08:19:21 +03:00 |
|
acetone
|
a3b50ff089
|
Merge branch 'master' into master
|
2020-11-23 05:13:54 +00:00 |
|
meaz
|
813e5336a5
|
Merge pull request 'add green badge' (#142) from green_badge into master
Reviewed-on: #142
|
2020-11-22 20:40:23 +00:00 |
|
meaz
|
16a20c27f0
|
Merge branch 'master' into green_badge
|
2020-11-22 20:39:56 +00:00 |
|
acetone
|
d1535eb2a4
|
for nice look
|
2020-11-22 21:03:55 +03:00 |
|
acetone
|
d77a69e5d5
|
Merge branch 'master' into master
|
2020-11-22 16:26:51 +00:00 |
|
acetone
|
d8ccb141ff
|
hardware donations
|
2020-11-22 19:18:00 +03:00 |