Commit Graph

1379 Commits (d81edcf62346a8054ed310b3aa7e73388987935c)

Author SHA1 Message Date
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
max.mehl 38a55b08e6
Merge remote-tracking branch 'upstream/pr/233' 2018-03-08 15:41:50 +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
Max Mehl 1d7f4b9ec5 Merge branch 'osweekends' of janwey/website into master 2018-03-08 09:33:27 +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
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