Commit Graph

1200 Commits

Author SHA1 Message Date
meaz c8c6546813 Vagrant (#37) 2019-11-05 13:35:57 +00:00
meaz d9ed5d05cf Merge branch 'german-nav-bar' of Disroot/Website into master 2019-11-05 13:09:21 +00:00
meaz 679dbc0c9f translated some words in German in nav bar 2019-11-05 14:07:14 +01:00
meaz 1b47928d19 Merge branch 'WEBSITE_Services_Fixes' of Disroot/Website into master 2019-11-05 12:20:34 +00:00
Fede.- d1d2d93ab4 Services redirect link fix in Ger + Spa + Ita 2019-11-04 17:36:41 -03:00
Fede.- c257944d6b Merge branch 'WEBSITE_new_home_ger' of Disroot/Website into master 2019-11-04 02:41:17 +00:00
shadowsword 2eb1307504 Cleaning up the mess.
_services section was faulty and didn't show on home page
2019-11-03 20:43:53 +01:00
Fede.- c2532117c9 Merge branch 'IT-domain-linking-form' of Disroot/Website into master 2019-11-03 14:08:30 +00:00
l3o e91a93591e IT - Update domain linking form 2019-11-03 14:53:36 +01:00
antilopa b3ed5290cb Merge branch 'calc-home' of Disroot/Website into master 2019-11-03 09:14:58 +00:00
meaz 61415da820 separate pad and calc tile on home page for each language 2019-11-03 07:49:12 +01:00
meaz aae1060b0a separate pad and calc tile on home page 2019-11-03 07:38:38 +01:00
antilopa ec9d0f76be Merge branch 'WEBSITE_Spanish_Translation' of Disroot/Website into master 2019-11-02 21:26:35 +00:00
antilopa bc9d912c86 Merge branch 'patch_fr_donation' of Disroot/Website into master 2019-11-02 21:23:30 +00:00
Fede.- d224521188 Actualizar 'pages/06.donate/_reports/3col.en.md' 2019-11-02 12:45:46 +00:00
Fede.- d2287084be Website Spanish translation update and fixes 2019-11-02 09:38:56 -03:00
meaz 4e3f0482d0 Merge branch 'IT-homepage-update' of Disroot/Website into master 2019-11-02 07:00:49 +00:00
meaz 21a25f6625 Merge branch 'master' into IT-homepage-update 2019-11-02 07:57:18 +01:00
meaz a5fe955dd9 Merge branch 'WEBSITE_new_home_ger' of Disroot/Website into master 2019-11-02 06:47:25 +00:00
meaz 84b48ecdfb fix a bit the German translation 2019-11-02 07:46:19 +01:00
l3o 01c923d42b Updated and translated homepage and fixed link to https://poll.disroot.org in all languages 2019-11-01 23:13:08 +01:00
meaz bfd3529281 Mise à jour de 'pages/01.home/_donation/2col-left.fr.md' 2019-11-01 15:16:18 +00:00
meaz 1351030e26 Mise à jour de 'pages/01.home/_donation/2col-left.fr.md' 2019-11-01 15:14:56 +00:00
meaz f676e80a49 Merge branch 'WEBSITE_Home_Sp_Update' of Disroot/Website into master 2019-11-01 15:05:17 +00:00
Fede.- ebf391a644 Spanish update of Homepage 2019-11-01 11:33:23 -03:00
shadowsword bb7b0ad2c1 New homepage translated to german 2019-11-01 14:53:59 +01:00
meaz b24bd77141 Merge branch 'financial_overview_sep_19' of Disroot/Website into master 2019-11-01 09:09:23 +00:00
antil0pa 1bbae285f8 new finacial overview september 2019 2019-11-01 09:47:25 +01:00
antilopa 7950ff733c Merge branch 'domain-linking-error' of Disroot/Website into master 2019-10-31 19:32:19 +00:00
antilopa 937052f374 Merge branch 'new_home' of Disroot/Website into master 2019-10-31 19:25:04 +00:00
antil0pa 3bbbae88f9 one last fix 2019-10-31 20:24:13 +01:00
antil0pa 42ba3873d1 fixed conflict 2019-10-31 20:22:09 +01:00
antil0pa 4350995d92 Merge branch 'master' into new_home 2019-10-31 20:19:15 +01:00
Muppeth 427f5d4c32 fixed broken link to xmpp webchat 2019-10-31 13:46:47 +01:00
meaz c45c72ff6c Prepare files of the new home page for translations + somes fixes 2019-10-31 09:33:41 +01:00
meaz e913d491af change ' to " for compatibility with languages that use ' 2019-10-31 09:16:44 +01:00
antil0pa ce2c21be38 removed some line breaks 2019-10-30 23:28:34 +01:00
antilopa 3471c0afb1 Merge branch 'new_home' of Disroot/Website into master 2019-10-30 22:01:27 +00:00
antilopa a5e2c7c317 Merge branch 'account-form-fr' of Disroot/Website into master 2019-10-30 21:56:13 +00:00
meaz cc26db0d3a Add missing </p> in FR and DE versions of domain link form 2019-10-30 21:47:00 +01:00
meaz d8227045b8 Update 'pages/forms/domain-linking-form/form.en.md'
remove an extra <br>
2019-10-30 20:44:15 +00:00
antil0pa 694efe1cc3 fixed layout of donations section 2019-10-30 21:38:47 +01:00
meaz 0ad5f841cd Update 'pages/forms/domain-linking-form/form.en.md'
Add a </p> to fix displaying issue
2019-10-30 20:38:36 +00:00
meaz 60ca96a6d3 Merge branch 'domain-linking-fr' of Disroot/Website into master 2019-10-30 20:17:30 +00:00
Fede.- 4f4bae2c0b Merge branch 'French-mission' of Disroot/Website into master 2019-10-29 02:32:51 +00:00
Fede.- 47d5575693 Merge branch 'WEBSITE_statement_contact_ger' of Disroot/Website into master 2019-10-27 13:30:06 +00:00
meaz fc30a4aedd update account registration form in french 2019-10-27 09:20:12 +01:00
meaz a92accdc12 update domain-linking form (french) 2019-10-27 08:01:15 +01:00
shadowsword 91cfe5b46d recent changes translated to german 2019-10-27 00:03:49 +02:00
meaz 46dc9ce53e update french for update of the paragraph B 2019-10-26 11:24:36 +02:00