Commit Graph

818 Commits (ec7712952b23eba26ec031f99c0c44a3b9d02bb6)

Author SHA1 Message Date
Jan Weymeirsch 74f515b69a Add Elektra Initiative 2018-03-12 10:15:57 +01:00
max.mehl 924aeb54c5
Merge PR #240 2018-03-09 09:37:58 +01:00
Max Mehl 1e1e77dc35 Merge branch 'paillasse' of janwey/website into master 2018-03-09 09:27:18 +01:00
Max Mehl ba681d8a3c Merge branch 'pica' of janwey/website into master 2018-03-09 09:27:03 +01:00
Max Mehl ea080aee0e Merge branch 'startum' of janwey/website into master 2018-03-09 09:26:56 +01:00
Jan Weymeirsch ebcbee70d8 Add Konglomerat e.V. 2018-03-08 17:59:55 +01:00
Max Mehl 821c0361e9 Merge branch 'bfsf' of janwey/website into master 2018-03-08 17:50:53 +01:00
Jan Weymeirsch 3be1eb8b09 Add Pica Hacklab 2018-03-08 17:33:43 +01:00
Jan Weymeirsch 12cc1f5fa4 Friends is not part of the name 2018-03-08 16:53:29 +01:00
Jan Weymeirsch 233bad3d81 Add Stratum0 2018-03-08 16:32:28 +01:00
Jan Weymeirsch 293aeaee28 Add La Paillasse 2018-03-08 16:22:04 +01:00
Max Mehl d1673e45f4 Merge branch 'bfsf' of janwey/website into master 2018-03-08 15:49:29 +01:00
max.mehl 654836f624
Merge PR #234 2018-03-08 15:45:46 +01:00
Jan Weymeirsch a0ad735319 Add Barcelona Free Software Friends 2018-03-08 15:42:51 +01:00
Jan Weymeirsch 30599c9e89 Add Hackerspace.gr 2018-03-08 14:04:06 +01:00
Vincent Lequertier 1e6cae0c39 Add Communecter as international NGO 2018-03-08 13:45:30 +01:00
max.mehl 8ce3174195
Merge PR #232 2018-03-08 10:53:58 +01:00
Max Mehl b7ded1f0c9 Merge branch 'setem' of janwey/website into master 2018-03-08 10:53:21 +01:00
Jan Weymeirsch ad39265ef9 Add Bergamo Linux Users Group 2018-03-08 10:29:08 +01:00
Jan Weymeirsch 90742f2053 Add Setem Catalonia 2018-03-08 09:48:37 +01:00
Max Mehl 6b789b80ba Merge branch 'wikimediaczech' of janwey/website into master 2018-03-08 09:37:19 +01:00
Max Mehl 1f630b14e3 Merge branch 'thishostingrocks' of janwey/website into master 2018-03-08 09:36:03 +01:00
Jan Weymeirsch d0f2a285a3 Add Wikimedia Czech Republic 2018-03-07 15:06:48 +01:00
Jan Weymeirsch f80fc9050b Add ThisHosting.Rocks 2018-03-07 14:55:09 +01:00
Jan Weymeirsch a67d3503f6 Add OSWeekends 2018-03-07 11:12:34 +01:00
Mikkel Kirkgaard Nielsen 01af51262f Add orgtype and priority to PROSA. 2018-03-06 22:09:15 +01:00
Mikkel Kirkgaard Nielsen 5a81254d30 Merge branch 'master' into PROSA 2018-03-06 21:48:57 +01:00
Jan Weymeirsch 549407b558 Add CivicTech Romania 2018-03-06 16:49:27 +01:00
max.mehl 6154d53db5
add openuk logo 2018-03-02 12:18:08 +01:00
max.mehl 5845b0f691
add OpenUK, try 2 2018-03-02 12:16:11 +01:00
Vincent Lequertier 4cfa7b02ef Mark the expand arrow as visible in showAllOrgs() (fixes #222) 2018-02-26 09:00:15 +01:00
max.mehl 070c9e1070
add translations for new i18n strings introduced with PR #220 2018-02-23 16:24:05 +01:00
Vincent Lequertier 5fbf2920cb Remove no longer used variables 2018-02-23 16:08:41 +01:00
Vincent Lequertier 6fe2bfbc30 Proper translation handling 2018-02-23 16:05:09 +01:00
Vincent Lequertier 404b895812 Split Local NGOs into Regional and National ones 2018-02-21 10:44:08 +01:00
Vincent Lequertier cee4179acd Hide the expand arrow if there is not enough orgs displayed 2018-02-21 10:41:53 +01:00
Vincent Lequertier 1b91bc7787 Make the labels translatable 2018-02-21 10:41:53 +01:00
Vincent Lequertier 1953f767fc Change the buttons order 2018-02-21 10:41:53 +01:00
Vincent Lequertier a721955d56 NGO -> NGOs 2018-02-21 10:41:53 +01:00
Vincent Lequertier 99dff65f4f Comment out the "Corporate" filter 2018-02-21 10:41:53 +01:00
Vincent Lequertier ddcdc55bdb Add the GPL 3 header to the new JS file 2018-02-21 10:41:53 +01:00
Vincent Lequertier 7c2cf52be4 Add the ability to filter the organisations by type 2018-02-21 10:39:31 +01:00
Vincent Lequertier 5e422a2a84 Sort organisations by a priority 2018-02-20 13:58:55 +01:00
max.mehl 4f5cd3293f
improve wording 2018-02-09 15:05:04 +01:00
max.mehl 30b04921e7
Merge branch 'master' of git.fsfe.org:pmpc/website 2018-02-07 12:51:00 +01:00
Max Mehl f27a0bb826 Merge branch 'kersnikova' of janwey/website into master 2018-02-07 12:44:57 +01:00
Mikkel Kirkgaard Nielsen ae67463b92
Add PROSA as supporting organisation
PROSA is the "Danish Association of IT Professionals".

Verify their support in the newsletter at
http://nyhedsbrev.prosa.dk/t/t-e-khtlyud-ykdlijuhl-r/.

Ole Tange on behalf of PROSA also requested addition as supporting
organisation in email correspondance with contact@fsfe.org during
October/November 2017.
2018-02-01 15:45:08 +01:00
Jan Weymeirsch eea503ee11 Add Freifunk 2018-02-01 10:13:13 +01:00
Jan Weymeirsch 1201a850b4 Edit: Change URL of Kersnikova 2018-02-01 10:02:48 +01:00
max.mehl 399efd3a3b
Merge PR #215 2018-01-31 10:48:41 +01:00
Jan Weymeirsch f5887bb88d Add Rampa 2018-01-30 17:01:43 +01:00
Jan Weymeirsch 5cc40843a8 Add Kersnikova 2018-01-30 16:53:17 +01:00
pablohn 7c5e7ae2ed Spanish grammar fixes
I add ¿ and ! marks
2018-01-22 15:22:01 +01:00
max.mehl 692c0ce383
fix conflict 2018-01-15 16:51:06 +01:00
Jan Weymeirsch 36f09ab505 Add Software in Public Interest 2018-01-15 15:38:37 +01:00
Jan Weymeirsch 56dca1492a Add FOSSGIS 2018-01-15 09:57:57 +01:00
Bjoern Schiessle 525a665d9d
add 'Offene Kommunen NRW' 2018-01-12 16:59:12 +01:00
Carmen Bianca Bakker 799114b557
Fix Italian video 2018-01-11 11:51:20 +01:00
Carmen Bianca Bakker 56af3104d1
Added GIMP 2018-01-10 10:10:02 +01:00
Carmen Bianca Bakker bb1eee6a5d
Add apertus° 2018-01-05 13:20:48 +01:00
Carmen Bianca Bakker 6d011ca4ba
Added LILA 2018-01-04 11:55:24 +01:00
Carmen Bianca Bakker 007e398ae1
Merge branch 'drupal' 2017-12-22 12:11:07 +01:00
Carmen Bianca Bakker 93c1168b6e
Added Drupal 2017-12-22 12:10:54 +01:00
Sebastiano Pistore da69957d69 Update ITA translation 2017-12-20 16:26:43 +01:00
Carmen Bianca Bakker 34887f3445
Add linuxmuster.net 2017-12-20 11:22:33 +01:00
Carmen Bianca Bakker e22c2321f1
Add Hacking Lliure 2017-12-19 12:48:09 +01:00
Carmen Bianca Bakker 102ced5457
Added Elbmarsch 2017-12-15 12:39:35 +01:00
Carmen Bianca Bakker 6b0b5e0365
Add typo3 2017-12-12 15:52:27 +01:00
Carmen Bianca Bakker c0e2f7cff7
Added Sentilo 2017-12-07 14:17:57 +01:00
Carmen Bianca Bakker bc7981790d
Rename OpenSUSE to openSUSE 2017-11-29 18:10:33 +01:00
Carmen Bianca Bakker add15421bf
Added Otevrena mesta 2017-11-29 16:24:07 +01:00
Carmen Bianca Bakker 5a1a35b5ec
Added Fedora 2017-11-22 15:23:50 +01:00
Carmen Bianca Bakker 9d63300382
Added Wilhelm Tux 2017-11-22 15:18:09 +01:00
Carmen Bianca Bakker bc58534c0e
Merge branch 'bcn' 2017-11-22 10:24:56 +01:00
Carmen Bianca Bakker c743a077da
added bcn 2017-11-22 10:24:16 +01:00
max.mehl 6061f53801
Include FR version of video 2017-11-21 13:09:17 +01:00
Carmen Bianca Bakker abe4553a4a
Add SwissLinux 2017-11-20 13:00:59 +01:00
Carmen Bianca Bakker 186d408ff1
added openfabnet 2017-11-13 12:54:14 +01:00
Carmen Bianca Bakker bcc7b22d43
added digital society switzerland 2017-11-09 10:36:12 +01:00
Carmen Bianca Bakker f7442d2cf3
Add pep foundation 2017-11-09 10:05:29 +01:00
Carmen Bianca Bakker c4f002aa29
added colectic 2017-11-08 11:04:00 +01:00
Max Mehl 2eb19effa1 Merge branch 'master' of harald/website into master 2017-11-06 15:03:52 +01:00
Carmen Bianca Bakker ce10b35973
Add CCC-CH 2017-11-06 10:07:19 +01:00
erik.ds 0a2d91a48c Add OpenLabs, Democracy OS and ELLAK 2017-10-26 12:32:24 +02:00
erik.ds be2628b4ac Add OpenLabs, Democracy OS and ELLAK 2017-10-26 12:23:29 +02:00
harald db231d4b82 fixed vtt timecode format
The file had srt timecode format, causing the nb subtitle not being displayed when selected
2017-10-23 11:10:04 +02:00
harald d94bca94c7 added nb 2017-10-22 23:55:47 +02:00
erik.ds e002afdc28 Add P2P Foundation 2017-10-19 21:22:14 +02:00
erik.ds 837a079768 Add P2P Foundation 2017-10-19 21:21:02 +02:00
erik.ds d7f77802f7 Add Commons Institut and CMS Garden 2017-10-18 19:15:14 +02:00
erik.ds 24aeb15bda Add Commons Institut and CMS Garden 2017-10-18 19:11:13 +02:00
tomnor b798f3ce45 pmpc_sv.vtt: add egna to vtt subtitle file
This was done by the command
     $ ffmpeg -i srt/pmpc_sv.srt webvtt/pmpc_sv.vtt
2017-10-17 23:35:31 +02:00
max.mehl 0a745f0b94
Fix permissions and translate missing file 2017-10-17 14:38:51 +02:00
harald 179666d811 Upload files to 'site/build'
Norwegian bokmål (NB) translation of PMPC
2017-10-16 19:51:50 +02:00
harald adaad51be9 Upload files to 'site/data/share/nb'
Norwegian bokmål (NB) translation of PMPC
2017-10-16 19:50:28 +02:00
harald dcfcf87318 Upload files to 'site/content/openletter'
Norwegian bokmål (NB) translation of PMPC
2017-10-16 19:48:16 +02:00
harald 16dfca5407 Upload files to 'site/content'
Norwegian bokmål (NB) translation of PMPC
2017-10-16 19:47:25 +02:00
harald e97a33754b Upload files to 'site/languages'
Norwegian bokmål (NB) translation of PMPC
2017-10-16 19:46:24 +02:00
harald 5b058d7e3b Upload files to 'site/static/video-subs/webvtt'
Norwegian bokmål (NB) translation of PMPC
2017-10-16 19:45:20 +02:00
harald e10ecd956b Upload files to 'site/static/video-subs/srt'
Norwegian bokmål (NB) translation of PMPC
2017-10-16 19:44:40 +02:00
erik.ds c7455f5fc1 Add Allmend and saregune 2017-10-12 19:09:08 +02:00
erik.ds d787614772 Add Allmend and saregune 2017-10-12 19:05:41 +02:00
carmenbianca 1165230a1e Merge branch 'master' of dig-ark/website-PT into master 2017-10-08 21:41:11 +02:00
drsspam 73b78e9679 fixed a mistake 2017-10-08 20:26:46 +01:00
Carmen Bianca Bakker 4222860e86
Merge remote-tracking branch 'upstream/master' 2017-10-06 21:34:21 +02:00
Carmen Bianca Bakker db26be797f
typo 2017-10-06 21:33:50 +02:00
erik.ds 352617df6f Add ASL (Br), FAImaison, Tor Project 2017-10-06 18:51:14 +02:00
erik.ds 92e18c9474 Add ASL (Br), FAImaison, Tor Project 2017-10-06 18:50:57 +02:00
Carmen Bianca Bakker 8d9ca4af9a
Merge branch 'trans-it' 2017-10-06 10:42:15 +02:00
Carmen Bianca Bakker 9c6577e113
Tiny fixes 2017-10-06 10:41:51 +02:00
Carmen Bianca Bakker 76bf8a2c2b
Fix suggested by @taringamberini 2017-10-06 10:40:33 +02:00
Sebastiano Pistore 2f9a1afa4e Merge branch 'master' of https://git.fsfe.org/pmpc/website
# Conflicts solved:
#	site/build/build.sh
#	site/content/privacy.sv.md
#	site/languages/strings.sv.toml
#	site/layouts/partials/functions/video_fsfe.html
2017-10-05 20:00:38 +02:00
tomnor d9f8f02d91 pmpc_sv.srt: add "egna" to match original better 2017-10-05 19:15:58 +02:00
Florian Snow 5a2cf6a039 Keep campaign name in English in translations 2017-10-05 14:58:59 +02:00
Florian Snow 201819377b Add new subtitle tracks to HTML 2017-10-05 14:57:18 +02:00
Carmen Bianca Bakker 4eac54d4ed
Merge branch 'Danish' 2017-10-05 11:36:55 +02:00
Carmen Bianca Bakker 3552c9928d
Small fixes for Danish 2017-10-05 11:35:56 +02:00
Carmen Bianca Bakker f9eefb4e3e
Merge branch 'trans-pt' 2017-10-05 11:29:01 +02:00
Joni Silva 45323db362 Algumas alterações minimas mas importantes em quatro ficheiros. 2017-10-03 16:13:02 +00:00
Carmen Bianca Bakker 7cb0a06ea9
Merge branch 'trans-eo' 2017-10-03 15:14:21 +02:00
Carmen Bianca Bakker bca13c428b
Kiu gvatas la gvatistojn?
Proofread the proofreading
2017-10-03 15:07:50 +02:00
Carmen Bianca Bakker 4534d814b8
oops 2017-10-03 12:40:44 +02:00
Carmen Bianca Bakker fedf1cced6
Proofread strings.eo.toml 2017-10-03 12:37:21 +02:00
Tirifto 753858a58b Finished translation of strings.eo.toml 2017-10-03 11:06:17 +02:00
Mikkel Kirkgaard Nielsen e1e245655e
Uncapitalize "fri og open source software"
As per wordlist.da and discussion in #179.
2017-10-02 02:23:34 +02:00
Mikkel Kirkgaard Nielsen 558453f622 Merge branch 'master' of https://git.fsfe.org/pmpc/website into Danish 2017-10-02 01:40:45 +02:00
carmenbianca 93df0cce58 Merge branch 'privacy-rev' of carmenbianca/website into trans-eo 2017-09-30 14:43:33 +02:00
Carmen Bianca Bakker cb1cfaeeff
poliso → politiko 2017-09-30 14:42:54 +02:00
carmenbianca b03d44a435 Merge branch 'srt-rev' of carmenbianca/website into trans-eo 2017-09-30 14:40:01 +02:00
Carmen Bianca Bakker 773dcba1b4
compiled webvtt 2017-09-30 14:37:44 +02:00
Carmen Bianca Bakker 1b33478f20
Corrected corrections 2017-09-30 14:35:09 +02:00
Carmen Bianca Bakker 2e9cdfa310
Merge branch 'sv-subs' 2017-09-30 14:21:41 +02:00
Carmen Bianca Bakker 1a5c194318
add swedish webvtt 2017-09-30 14:20:38 +02:00
carmenbianca 0fffd06340 Merge branch 'sv-update' of tomnor/website-SE into master 2017-09-30 14:05:23 +02:00
Carmen Bianca Bakker 524dd20e70
Merge branch 'trans-hu' 2017-09-30 14:02:13 +02:00
Carmen Bianca Bakker 61e9c20552
Added Hungarian to build.sh 2017-09-30 14:01:26 +02:00
tomnor d7b87439fe [SV] hemsida -> webbsida (proof read) 2017-09-30 00:03:45 +02:00
tomnor e054e2f551 pmpc_sv.srt: proof read 2017-09-29 23:52:21 +02:00
tomnor 52a746a6eb pmpc_sv.srt: citation marks, capitalize and word change 2017-09-29 22:04:04 +02:00
tomnor bb99fa6a00 Merge branch 'master' into sv-subs 2017-09-29 21:39:57 +02:00
tomnor 6ddfe0519d pmpc_sv.srt: typo and utebasket --> gatubasket 2017-09-29 21:36:52 +02:00
Sebastiano Pistore 7d695ef042 update to latest version 2017-09-29 17:31:05 +02:00
Gergely Székely c3975ff261 Translating the yaml files 2017-09-28 19:41:41 +02:00
Carmen Bianca Bakker 34a9afba7b
kunhavigon → kunhavigadon 2017-09-28 17:29:06 +02:00
Carmen Bianca Bakker 2a104571a6
Proofread subtitles
TODO: Compile vtt from corrections
2017-09-28 17:08:39 +02:00
Carmen Bianca Bakker 8f89e2799f
Proofread privacy.eo.md 2017-09-28 16:37:11 +02:00
carmenbianca 838e4e5a91 Merge branch 'openletter-rev' of carmenbianca/website into trans-eo 2017-09-28 16:19:59 +02:00
Carmen Bianca Bakker 2150f4de22
Added VideoLAN to organisations 2017-09-28 13:00:00 +02:00
Mikkel Kirkgaard Nielsen 9de04a9af3 Merge remote-tracking branch 'upstream/master' into Danish 2017-09-28 03:24:22 +02:00
tomnor 93701b2108 pmpc_sv.srt: done 2017-09-27 23:35:15 +02:00