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 |
|
max.mehl
|
2c693a7e4b
|
Merge pull request #199 (NB translation)
|
2017-10-17 14:43:17 +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 |
|
carmenbianca
|
aef7bc9780
|
Merge branch 'own' of tomnor/website-SE into master
|
2017-10-06 10:30:03 +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 |
|
carmenbianca
|
e839ba3d48
|
Merge branch 'add_new_subtitles' of floriansnow/pmpc-website into master
|
2017-10-05 15:13:42 +02:00 |