Commit Graph

1305 Commits (91d11b3a9a228fa0b936866c98e0788b7ec9ebba)

Author SHA1 Message Date
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
max.mehl b11cc49f15
Merge PR #209 2017-12-21 12:17:55 +01:00
Sebastiano Pistore da69957d69 Update ITA translation 2017-12-20 16:26:43 +01:00
Carmen Bianca Bakker d8d724151f
Merge branch 'linuxmuster' 2017-12-20 11:22:44 +01:00
Carmen Bianca Bakker 34887f3445
Add linuxmuster.net 2017-12-20 11:22:33 +01:00
Carmen Bianca Bakker c5b153d8d6
Merge branch 'lliure' 2017-12-19 12:48:26 +01:00
Carmen Bianca Bakker e22c2321f1
Add Hacking Lliure 2017-12-19 12:48:09 +01:00
Carmen Bianca Bakker 1dc481a226
Merge branch 'samtgemeinde' 2017-12-15 12:40:21 +01:00
Carmen Bianca Bakker 102ced5457
Added Elbmarsch 2017-12-15 12:39:35 +01:00
Carmen Bianca Bakker c2627350d1
Merge branch 'typo3' 2017-12-12 15:53:00 +01:00
Carmen Bianca Bakker 6b0b5e0365
Add typo3 2017-12-12 15:52:27 +01:00
Max Mehl db2861a42c Merge branch 'test/test-commit' of max.mehl/pmpc-website into master 2017-12-12 11:20:32 +01:00
max.mehl 67f87d0c51
make a fake-commit for https://github.com/go-gitea/gitea/issues/2513 2017-12-12 11:18:53 +01:00
Carmen Bianca Bakker 9d73b0efc9
Merge branch 'sentilo' 2017-12-07 14:18:11 +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 cf86d9694d
Merge branch 'wilhelm' 2017-11-22 15:18:19 +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 29069d9446 fake-commit 2017-11-21 13:12:23 +01:00
Max Mehl bbdfdf2f0d Merge branch 'video-fr' of max.mehl/pmpc-website into master 2017-11-21 13:11:07 +01:00
max.mehl 6061f53801
Include FR version of video 2017-11-21 13:09:17 +01:00
Carmen Bianca Bakker 627fb64eef
Merge branch 'swisslinux' 2017-11-20 13:02:00 +01:00
Carmen Bianca Bakker abe4553a4a
Add SwissLinux 2017-11-20 13:00:59 +01:00
Carmen Bianca Bakker 69e3058c96
Merge branch 'openfab' 2017-11-13 12:54:31 +01:00
Carmen Bianca Bakker 186d408ff1
added openfabnet 2017-11-13 12:54:14 +01:00
Carmen Bianca Bakker 29a023011a
Merge branch 'dgs' 2017-11-09 10:36:28 +01:00
Carmen Bianca Bakker bcc7b22d43
added digital society switzerland 2017-11-09 10:36:12 +01:00
Carmen Bianca Bakker c4141f3a0a
Merge branch 'pep' 2017-11-09 10:06:37 +01:00
Carmen Bianca Bakker f7442d2cf3
Add pep foundation 2017-11-09 10:05:29 +01:00
Carmen Bianca Bakker 10384af016
Merge branch 'colectic' 2017-11-08 11:04:13 +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 baa8b09e61
Merge branch 'ccc-ch' 2017-11-06 10:07:29 +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
carmenbianca 3f700217e8 Merge branch 'master' of harald/website into master 2017-10-23 09:48:58 +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
carmenbianca 180a894247 Merge branch 'egna-vtt' of tomnor/website-SE into master 2017-10-18 10:14:01 +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