Commit Graph

1230 Commits (1480c431e03985ebeaab761758994a342788844c)

Author SHA1 Message Date
max.mehl fa1e90e4d9
use RU video 2018-06-07 16:12:35 +02:00
alex.busch 7df6cf6d13 Merge branch 'subs_according_to_video' of alex.busch/pmpc-website into master 2018-06-04 15:59:07 +02:00
Alexandra 630c649319 made changes because of different audio 2018-06-04 14:51:26 +02:00
alex.busch c5ba9ab31f Merge branch 'correction-RU' of alex.busch/pmpc-website into master 2018-05-31 10:13:45 +02:00
Alexandra 80a9ec83b0 correct a typo and action box 2018-05-31 10:11:23 +02:00
alex.busch ef1a8ede19 Merge branch 'add-ru-to-build' of alex.busch/pmpc-website into master 2018-05-30 16:20:51 +02:00
alex.busch 74203495dc Merge branch 'RU-translation-of-the-website' of alex.busch/pmpc-website into master 2018-05-30 16:14:51 +02:00
Alexandra 4648212d20 add RU to build.sh 2018-05-30 15:41:58 +02:00
Alexandra 89e3ecb008 changed the outdated file 2018-05-29 16:21:07 +02:00
Alexandra b6d6824cde russian translation for PMPC website 2018-05-29 12:00:39 +02:00
max.mehl 0313d7e6da
remove checked-by-default checkbox for newsletter 2018-05-28 11:27:05 +02:00
alex.busch 66b6c22247 Merge branch 'fix-typo' of alex.busch/pmpc-website into master 2018-05-18 15:15:32 +02:00
Alexandra ad0d8ba353 fixing a typo in RU subs 2018-05-18 15:09:40 +02:00
alex.busch 36b2d2b872 added RU to video subs pull-down menu (#282) 2018-05-18 14:51:47 +02:00
alex.busch f7d96fb6cc RU subs for a PMPC video (#280) 2018-05-18 11:42:56 +02:00
alex.busch cc7ceb4bbb add organisation Security without borders to PMPC supporters (#279) 2018-05-16 17:14:26 +02:00
alex.busch 6d92979092 added supporter organisation FSFWD to supporters (#277) 2018-05-16 12:15:47 +02:00
Max Mehl e28c159f84 Merge branch 'master' of olatusrooc/publiccodeITA into master
PR #276
2018-05-08 12:55:08 +02:00
Sebastiano Pistore 439e40ab4f ITA - translated it.toml; Added a DOT between two sentences in strings. 2018-05-07 18:46:57 +02:00
Vincent Lequertier e21afb4fbc Make sure container starts on server boot 2018-05-07 09:44:54 +02:00
max.mehl b5baa14ddd
Revert "Make hugo build the website during image generation. Take 2"
This reverts commit 27cef0ea3e. During build, the
signatures.json file is not available so it always takes the default file from the repo. We
will have to find a way to include the file from lund during docker build
2018-04-25 20:55:44 +02:00
max.mehl 159319700f
add another signature to test #272 2018-04-25 20:12:29 +02:00
Vincent Lequertier 27cef0ea3e
Make hugo build the website during image generation. Take 2 2018-04-25 11:03:06 +02:00
max.mehl 7228d4d78a
Revert "make hugo build the website during image generation"
This reverts commit 35c8cc50d5. The build/deploy process ran
forever, so this method doesn't seem to work as expected.
2018-04-24 23:19:29 +02:00
Max Mehl ef2370a4e8 Merge branch 'docker-build' of max.mehl/pmpc-website into master
PR #271
2018-04-24 23:12:53 +02:00
max.mehl 35c8cc50d5
make hugo build the website during image generation 2018-04-24 23:10:50 +02:00
Max Mehl 60b63f75b0 Merge branch 'video-pt' of max.mehl/pmpc-website into master
PR #270
2018-04-13 13:21:29 +02:00
max.mehl 04239812d7
include PT video version. Thanks to Rute! 2018-04-13 13:09:42 +02:00
Max Mehl aa62498f29 Merge branch 'add_luki_ngo' of vincent/website into master
PR #269
2018-04-12 14:57:21 +02:00
Vincent Lequertier 6b647a76b7
Add LUKi e.V. 2018-04-12 14:56:00 +02:00
Max Mehl cb4802df04 Merge branch 'translation/sq-fix1' of max.mehl/pmpc-website into master
PR #268
2018-04-11 17:24:39 +02:00
max.mehl 9afd70d628
fix space in link 2018-04-11 17:16:11 +02:00
max.mehl 871bfe0df2
also update vtt subtitles 2018-04-11 17:14:43 +02:00
Max Mehl 6f4339d279 Merge branch 'ci/edit-event' of max.mehl/pmpc-website into master
PR #267
2018-04-11 15:01:10 +02:00
max.mehl 5d4de975aa
do not try to deploy when running a PR 2018-04-11 14:55:10 +02:00
Max Mehl 2ff9421817 Merge branch 'translation/sq' of max.mehl/pmpc-website into master
PR #266
2018-04-11 14:08:41 +02:00
max.mehl c73bb2f518
add missing share files 2018-04-11 14:07:29 +02:00
max.mehl f0cdc91aa5
SQ translation, missing data/share dir 2018-04-11 13:06:21 +02:00
Max Mehl 7d6d6ceb51 Merge branch 'remove_fake-commit' of vincent/website into master 2018-04-09 14:58:59 +02:00
max.mehl 10d6c2f56f
add Albanian subtitles
Thanks to OpenLabs!
2018-04-04 17:10:46 +02:00
max.mehl 9b69e41706
Merge PR #265 2018-03-26 15:52:02 +02:00
Jan Weymeirsch 8041b4ef6d Add Cliss XII 2018-03-26 15:17:22 +02:00
max.mehl 5eaf187ce1
Merge PR #264 2018-03-26 14:55:56 +02:00
Jan Weymeirsch 8528728d8c Add Neutrinet 2018-03-26 14:00:21 +02:00
max.mehl e87a841f1e
Merge PR #263 2018-03-26 12:29:11 +02:00
Vincent Lequertier 8684ab343f Sort the organizations by name 2018-03-26 11:37:01 +02:00
max.mehl 7e95583b5d
Merge PR #262 2018-03-26 10:58:35 +02:00
Eric Cornelissen 98bb3a8cdf Fix typo in build.sh comments 2018-03-24 23:44:12 +01:00
Eric Cornelissen 80888b46b5 Change build.sh basedir
Use different method to get the basedir in site/build/build.sh allowing
the script to work on Windows as well.

Take from:
https://stackoverflow.com/questions/59895/getting-the-source-directory-of-a-bash-script-from-within
2018-03-24 17:30:32 +01:00
max.mehl 551ec0e133
mention subtitled in translation guide 2018-03-23 14:22:30 +01:00