Commit Graph

1154 Commits (45bb3051157d280a2d71dd1a56b4979e1dd0885a)

Author SHA1 Message Date
Max Mehl f20412814f Merge branch 'PROSA' of mikini/pmpc-website into master 2018-03-07 09:11:42 +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
Max Mehl b3ea8a3d3a Merge branch 'civictech' of janwey/website into master 2018-03-06 17:13:24 +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
max.mehl e2e935be24
Merge PR #223 2018-02-26 17:11:51 +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
max.mehl 51958deab4
Merge PR #220 2018-02-23 16:22:53 +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
max.mehl fec1dcf104
Merge PR #219 2018-02-20 15:07:01 +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 4f6df6f17b
Merge PR #217 2018-02-07 12:49:52 +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
max.mehl 5b63eb940e
Merge PR #214 2018-01-31 10:48:23 +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
Max Mehl 2fe61e808f Merge branch 'fossgis' of janwey/website into master 2018-01-15 16:47:55 +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
Max Mehl e7b2ca2513 Merge branch 'master' of schiessle/pmpc-website into master 2018-01-12 17:04:01 +01:00
Bjoern Schiessle 525a665d9d
add 'Offene Kommunen NRW' 2018-01-12 16:59:12 +01:00
Carmen Bianca Bakker ff6d6ca837
Merge branch 'italian-vid' 2018-01-11 11:52:15 +01:00
Carmen Bianca Bakker 799114b557
Fix Italian video 2018-01-11 11:51:20 +01:00
Carmen Bianca Bakker 43d1c5e5e8
Merge branch 'gimp' 2018-01-10 10:12:49 +01:00
Carmen Bianca Bakker 56af3104d1
Added GIMP 2018-01-10 10:10:02 +01:00
Carmen Bianca Bakker be0d677779
Merge branch 'apertus' 2018-01-05 13:21:36 +01:00
Carmen Bianca Bakker bb1eee6a5d
Add apertus° 2018-01-05 13:20:48 +01:00
Carmen Bianca Bakker 8421db97ad
Merge branch 'lila' 2018-01-04 11:55:38 +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