eb08bd0826
Fix Adullact img name
2017-09-21 00:08:21 +02:00
739fd59b48
fix adullact name
2017-09-20 18:28:25 +02:00
f2738fb84b
Merge from 'master'
...
Merge branch 'master' of git.fsfe.org:pmpc/website
2017-09-20 18:17:36 +02:00
2d4bc20142
Add iisl
2017-09-20 18:16:33 +02:00
d0029c8e32
Merge branch 'master' of git.fsfe.org:pmpc/website
...
merge from upstream
2017-09-20 17:51:38 +02:00
4ae6c1c5d7
add adullact, aquilenet, fossasia, gnusolidario, gvsig, slovenskodigital
2017-09-20 17:51:24 +02:00
a98cd34cae
Merge branch 'more-robust-build' of max.mehl/pmpc-website into master
2017-09-20 17:34:05 +02:00
d177871e89
Fix HTML 5 subtitles
...
closes #155
2017-09-20 17:00:36 +02:00
01acc62526
Add meta keywords to head
2017-09-20 15:48:00 +02:00
ca9b41816a
add galpon
2017-09-20 15:06:49 +02:00
9a9593aa6a
add galpon
2017-09-20 15:01:17 +02:00
1f60072698
Merge branch 'master' of jordimas/website into master
2017-09-20 12:07:00 +02:00
818dbf3127
added GreekLUG to organisations
2017-09-20 11:15:30 +02:00
72c74432a3
add GreekLUG
2017-09-20 11:11:22 +02:00
1c23c2207f
Fix missing bracket in Catalan translation
2017-09-20 07:36:55 +02:00
a01b21728e
Merge branch 'master' of tekrei/website into master
2017-09-20 00:32:58 +02:00
01baa31e8b
Merge branch 'slovak_subtitles' of floriansnow/pmpc-website into master
2017-09-20 00:30:47 +02:00
005290ddb5
Try build 3 times before failing with exit code 1
2017-09-20 00:20:46 +02:00
d6489e9daf
add apti, facil, openmedia and software heritage
2017-09-19 22:06:25 +02:00
c88d3d2bb6
Merge remote-tracking branch 'upstream/master'
2017-09-19 21:59:11 +02:00
605b493523
add epicenterworks, gentoo, softcatala and wpia
2017-09-19 20:42:54 +02:00
8513cbf919
[TR] small updates to the Turkish translation
2017-09-19 19:48:06 +02:00
128064e21f
Add Slovak subtitles to video HTML
2017-09-19 18:53:26 +02:00
5bb238f208
Add Framasoft and Mageia to json
2017-09-19 18:26:13 +02:00
d93c4f6440
Minor fixes to Catalan translation
2017-09-19 18:24:23 +02:00
0c53a054a2
add Framasoft and Mageia logos and names
2017-09-19 18:20:51 +02:00
d0f564d639
Comment out AWS copy because it takes much time and we shouldn't need it any longer
2017-09-19 17:46:29 +02:00
85336ead0c
Show language-dependent video for selected languages
...
Currently, this is only valid for DE but it can be easily extended
2017-09-19 12:27:42 +02:00
df3a1dc29d
add do-foss org
2017-09-19 10:44:24 +02:00
451dffc552
Add WebVTT version of Slovak subtitles
2017-09-19 07:11:27 +02:00
df8793fb91
Update Slovak subtitles
2017-09-19 07:05:06 +02:00
33bca86adc
Merge branch 'master' of git.fsfe.org:pmpc/website
2017-09-18 19:27:46 +02:00
0afd237d05
add waag society
2017-09-18 19:27:24 +02:00
7bfec5ebb5
resize AFUL logo
2017-09-18 19:21:28 +02:00
8483ba71f1
added AFUL logo and name
2017-09-18 19:17:03 +02:00
248c6ba698
Outsource non-JS CSS to not mess with JS behaviour
2017-09-18 17:56:44 +02:00
7b4c98d8be
Make hamburger menu work on small screens with JS disabled
...
Thanks to Paul for helping with that in #39
2017-09-18 17:42:18 +02:00
56852ef5b8
Add Gnome to supporting organisations
...
Provided via patch by Tobias Mueller
2017-09-18 17:05:27 +02:00
7882b25a83
Merge branch 'master' of blues-man/website into master
2017-09-18 16:39:53 +02:00
56a949d57a
Translate 'Greek' to Greek
2017-09-18 16:37:15 +02:00
84e342dbfc
Merge branch 'master' into pr/156
2017-09-18 16:36:24 +02:00
23df70225b
add open knowledge international org
2017-09-18 15:48:34 +02:00
62367621dd
add open knowledge international logo
2017-09-18 15:46:10 +02:00
8957ad5585
Add Greek translation
2017-09-18 16:45:38 +03:00
17cc8bc624
add creative commons org
2017-09-18 15:17:45 +02:00
9ebfa7929b
add creative commons logo
2017-09-18 15:15:35 +02:00
ba92b39e0e
Update supporting organizations string with a better translation
...
Apart of the missing plural "organizzazione/organizzazioni" it
would be better to rely on the word "aderenti=adherents" rather
than "supportanti" which sounds not very good.
Another word suiatble could be "signatarie"
2017-09-18 14:26:42 +02:00
5d25c4e5f5
Merge branch 'master' of jordimas/website into master
2017-09-18 11:32:46 +02:00
9f25dde52c
Change baseurl to fix sitemaps
...
We need to check whether there are sick side effects due to this but this cannot be done in the local build
2017-09-18 11:03:52 +02:00
c03ef6cf9e
Switch from Vimeo to FSFE download server to serve video
2017-09-18 10:56:39 +02:00
max.mehl
Jonke Suhr
Erik Da Silva
Florian Snow
Jordi Mas
T. E. Kalayci
Tibor Repček
Jonke Suhr
Nikos Roussos
Natale Vinto