 Fede.-
|
74516a534c
|
Merge branch 'master' into 'sp.website_02'
# Conflicts:
# pages/03.services/02.email/_email-x-storage/2col-left.es.md
|
2019-05-01 16:00:34 +02:00 |
|
Fede.-
|
1a53f0db58
|
_about doc fixed code
|
2019-05-01 15:33:15 +02:00 |
|
Fede.-
|
6b6b8e15b1
|
Merge branch 'sp.website_01' into 'master'
Spanish translations and fixes
See merge request disroot/website!77
|
2019-05-01 15:29:53 +02:00 |
|
Fede.-
|
8f58b56169
|
Spanish translations and fixes
|
2019-05-01 15:29:53 +02:00 |
 antil0pa
|
8d9313248d
|
Merge branch 'multiple_web_fixes' into 'master'
re-order modular pages in other languages
See merge request disroot/website!76
|
2019-05-01 12:18:58 +02:00 |
|
antil0pa
|
e7fb1d1921
|
re-order mudular pages - spanish
|
2019-05-01 12:18:25 +02:00 |
|
antil0pa
|
90b45b241c
|
re-order modular pages in other languages
|
2019-05-01 12:16:11 +02:00 |
|
antil0pa
|
33e0d64320
|
Merge branch 'multiple_web_fixes' into 'master'
changed range field to number
See merge request disroot/website!75
|
2019-05-01 10:44:39 +02:00 |
|
antil0pa
|
a52ebd5cb3
|
changed range field to number
|
2019-05-01 10:43:55 +02:00 |
|
antil0pa
|
0b7b531b98
|
Merge branch 'multiple_web_fixes' into 'master'
added x-storgae buttong to email service page and relevant form
See merge request disroot/website!74
|
2019-05-01 10:24:58 +02:00 |
|
antil0pa
|
396717452d
|
added x-storgae buttong to email service page and relevant form
|
2019-05-01 10:23:59 +02:00 |
 muppeth
|
4e53069b96
|
fix broken link to howto
|
2019-04-26 21:03:02 +02:00 |
|
Fede.-
|
83078f27f5
|
Merge branch 'it_update' into 'master'
Italian translation updates
See merge request disroot/website!73
|
2019-04-21 19:33:01 +02:00 |
 massimiliano
|
9366ddb870
|
Italian translation updates
|
2019-04-21 09:22:52 +02:00 |
|
muppeth
|
eacf6b1f3a
|
Merge branch 'french' into 'master'
french updates of forms
See merge request disroot/website!72
|
2019-04-20 09:28:40 +02:00 |
 meaz
|
f554e8761e
|
french updates of forms
|
2019-04-20 08:28:13 +02:00 |
|
Fede.-
|
afc8f31b37
|
Small style fixes back
|
2019-04-20 07:24:45 +02:00 |
|
Fede.-
|
357562ef1c
|
Small style fixes back
|
2019-04-20 07:20:24 +02:00 |
|
Fede.-
|
19f816722e
|
Merge branch 'website_ES' into 'master'
Website es
See merge request disroot/website!71
|
2019-04-20 07:08:53 +02:00 |
|
Fede.-
|
8fd6fa09ce
|
Merge branch 'master' of https://git.fosscommunity.in/disroot/website into website_ES
Last minute changes were made while working on this branch
|
2019-04-20 07:08:53 +02:00 |
|
antil0pa
|
ad6b4f6232
|
Merge branch 'form_changes' into 'master'
changes to forms
See merge request disroot/website!70
|
2019-04-19 20:39:14 +02:00 |
|
muppeth
|
5153b91d48
|
changes to forms
|
2019-04-19 20:39:14 +02:00 |
|
antil0pa
|
94c8ef277f
|
Merge branch 'overview_march' into 'master'
update translations
See merge request disroot/website!69
|
2019-04-17 22:43:59 +02:00 |
|
antil0pa
|
bd835e4ab2
|
update translations
|
2019-04-17 22:43:29 +02:00 |
|
antil0pa
|
d8a10ed2c0
|
Merge branch 'overview_march' into 'master'
publish monthly report for March
See merge request disroot/website!68
|
2019-04-17 21:27:23 +02:00 |
|
antil0pa
|
2b886f4bd9
|
publish monthly report for March
|
2019-04-17 21:25:55 +02:00 |
|
muppeth
|
b60d6e3dc0
|
Merge branch 'vagrant' into 'master'
fixed vagrant files
See merge request disroot/website!67
|
2019-04-11 22:40:12 +02:00 |
|
muppeth
|
c5ace78d57
|
fixed vagrant files
|
2019-04-11 22:40:12 +02:00 |
|
antil0pa
|
f496aaccb7
|
Merge branch 'fix_contact_page' into 'master'
Fix contact page
See merge request disroot/website!66
|
2019-03-26 09:48:51 +01:00 |
|
antil0pa
|
b6171e39d9
|
Merge branch 'fix_contact_page' of git.fosscommunity.in:disroot/website into fix_contact_page
|
2019-03-26 09:48:00 +01:00 |
|
antil0pa
|
e0b6b0fb18
|
twig function 'safe_email' rmoved
|
2019-03-26 09:47:32 +01:00 |
|
antil0pa
|
5fc223b468
|
Merge branch 'fix_contact_page' into 'master'
attempt #3
See merge request disroot/website!65
|
2019-03-26 09:46:10 +01:00 |
|
antil0pa
|
71685e5486
|
Merge branch 'master' into 'fix_contact_page'
# Conflicts:
# pages/04.contact/_contact/2col-right.en.md
|
2019-03-26 09:45:25 +01:00 |
|
antil0pa
|
bf5b078682
|
attempt #3
|
2019-03-26 09:44:38 +01:00 |
|
antil0pa
|
ea4ed76d2e
|
Merge branch 'revert-69146f32' into 'master'
Revert "Merge branch 'fix_contact_page' into 'master'"
See merge request disroot/website!64
|
2019-03-26 09:43:48 +01:00 |
|
antil0pa
|
f4daa00a53
|
Revert "Merge branch 'fix_contact_page' into 'master'"
This reverts merge request !63
|
2019-03-26 09:42:16 +01:00 |
|
antil0pa
|
69146f32d7
|
Merge branch 'fix_contact_page' into 'master'
another attempt to hide a visible twig filter
See merge request disroot/website!63
|
2019-03-26 09:41:45 +01:00 |
|
antil0pa
|
9995dfbba5
|
another attempt to hide a visible twig filter
|
2019-03-26 09:41:17 +01:00 |
|
antil0pa
|
3428e804e2
|
Merge branch 'fix_contact_page' into 'master'
test |markdown function to hide other twig functions
See merge request disroot/website!62
|
2019-03-26 09:30:27 +01:00 |
|
antil0pa
|
8d2682ea8d
|
test |markdown function to hide other twig functions
|
2019-03-26 09:29:32 +01:00 |
|
antil0pa
|
f3dd702032
|
Merge branch 'add_creditcard_payment' into 'master'
fixing a couple of typos
See merge request disroot/website!61
|
2019-03-13 10:49:09 +01:00 |
|
antil0pa
|
bac5e9ad50
|
fixing a couple of typos
|
2019-03-13 10:48:45 +01:00 |
|
antil0pa
|
d7a2e73d4c
|
Merge branch 'add_creditcard_payment' into 'master'
more adjustment to layout
See merge request disroot/website!60
|
2019-03-13 10:45:36 +01:00 |
|
antil0pa
|
fe1e3ebbda
|
more adjustment to layout
|
2019-03-13 10:45:13 +01:00 |
|
antil0pa
|
471f52fb1c
|
Merge branch 'add_creditcard_payment' into 'master'
correction to type
See merge request disroot/website!59
|
2019-03-13 10:42:54 +01:00 |
|
antil0pa
|
5f410e7a2b
|
correction to type
|
2019-03-13 10:42:30 +01:00 |
|
antil0pa
|
603518a637
|
Merge branch 'add_creditcard_payment' into 'master'
Add creditcard payment
See merge request disroot/website!58
|
2019-03-13 10:39:07 +01:00 |
|
antil0pa
|
372bf7fb77
|
added explenation how to donate with credit cards
|
2019-03-13 10:38:06 +01:00 |
|
antil0pa
|
ee650f128c
|
vagrant files for website - WIP
|
2019-03-09 08:55:17 +01:00 |
|
antil0pa
|
4e869e7a0a
|
Merge branch 'overview_feb' into 'master'
Overview feb
See merge request disroot/website!57
|
2019-03-08 16:55:16 +01:00 |