john stone
|
8761883bd3
|
bigger font for censor interface
to speed up censorship
|
2011-12-17 02:35:38 +01:00 |
|
john stone
|
da13020ef7
|
fixed bug in 5050 joker
enless loop, if more than 2 answers were correct
|
2011-12-16 20:49:42 +01:00 |
|
john stone
|
90272948c5
|
Merge branch 'master' of tuxcode.org:pentagameshow
|
2011-12-16 19:29:27 +01:00 |
|
john stone
|
2e81bcd083
|
leak joker deaktivated
|
2011-12-16 19:25:54 +01:00 |
Frank Becker
|
5f492f9716
|
evolution question update, added fields source and comment
|
2011-12-16 14:49:18 +01:00 |
|
Frank Becker
|
c116803ba0
|
Merge branch 'master' into 28c3a8
|
2011-12-16 14:44:55 +01:00 |
 Astro
|
f517236c0b
|
TODO update
|
2011-12-14 17:05:43 +01:00 |
|
Astro
|
5602b3ae94
|
nedap server: all errors are 503 Bad Gateway, Internetkurort
|
2011-12-14 17:05:10 +01:00 |
|
Astro
|
a1b0fbb25e
|
nedap server: avoid caching, back link
|
2011-12-14 16:56:35 +01:00 |
|
Astro
|
e436d347b7
|
TODO update
|
2011-12-14 13:29:10 +01:00 |
|
Astro
|
7fb8e91cfa
|
Merge branch 'master' of tuxcode.org:pentagameshow into 28c3
|
2011-12-14 01:41:44 +01:00 |
|
Astro
|
1c8ff2ab4c
|
TODO update
|
2011-12-14 01:39:58 +01:00 |
|
Astro
|
f51274309e
|
censor css: larger action links
|
2011-12-14 01:34:25 +01:00 |
|
Astro
|
6cdf26334d
|
css: more inline displaying of gif joker imgs
|
2011-12-14 01:26:37 +01:00 |
|
Astro
|
4726c4acf5
|
css: try avoiding joker line-breaks
|
2011-12-14 01:20:57 +01:00 |
klObs
|
a005fd7f89
|
Merge branch 'master' of john:pentagameshow
|
2011-12-14 00:20:30 +01:00 |
|
klObs
|
7c4375bf0b
|
Notes after testing round
|
2011-12-14 00:19:36 +01:00 |
|
john stone
|
cfba846a53
|
Merge branch 'master' of tuxcode.org:pentagameshow
|
2011-12-13 23:15:13 +01:00 |
|
Frank Becker
|
8eaa892b88
|
Merge branch 'master' of tuxcode.org:pentagameshow
|
2011-12-13 23:13:39 +01:00 |
|
Frank Becker
|
8e0c6a8760
|
round data updated
|
2011-12-13 23:13:13 +01:00 |
|
Frank Becker
|
f844c42f35
|
add data as webroot to static files
|
2011-12-13 23:13:00 +01:00 |
|
Astro
|
d856eb861c
|
fix ingame joker display
|
2011-12-13 23:05:26 +01:00 |
|
john stone
|
d146ee031b
|
Merge branch 'master' of tuxcode.org:pentagameshow
|
2011-12-13 22:17:30 +01:00 |
|
Astro
|
04f49f9cf3
|
index: joker pics
|
2011-12-13 22:17:13 +01:00 |
|
Frank Becker
|
eba5a9625b
|
Siri
|
2011-12-13 22:08:38 +01:00 |
|
john stone
|
5a632a2c36
|
Merge branch 'master' of tuxcode.org:pentagameshow
|
2011-12-13 21:45:47 +01:00 |
|
Frank Becker
|
cd6c035292
|
round_1 was missing
|
2011-12-13 21:43:32 +01:00 |
|
john stone
|
8ec8ac86f7
|
Merge branch 'master' of tuxcode.org:pentagameshow
|
2011-12-13 21:37:56 +01:00 |
|
Frank Becker
|
dd45608030
|
merged questions.yaml generated json
|
2011-12-13 21:30:26 +01:00 |
|
Frank Becker
|
300d84b218
|
fixed merge conflict, Facebook question got lost
|
2011-12-13 21:21:46 +01:00 |
|
Frank Becker
|
00b97c459b
|
generated rounds
|
2011-12-13 21:15:41 +01:00 |
|
Frank Becker
|
204732fc55
|
question update
|
2011-12-13 21:14:41 +01:00 |
|
john stone
|
1612040e8c
|
Merge branch 'master' of tuxcode.org:pentagameshow
|
2011-12-13 20:59:57 +01:00 |
|
Astro
|
6057c54e4b
|
gif joker picture
|
2011-12-13 20:58:09 +01:00 |
|
Astro
|
9d4b42d2c2
|
censor interface: max image size
|
2011-12-13 19:38:45 +01:00 |
|
Astro
|
0604db4344
|
nedap server: token validation for gif uploads too
|
2011-12-13 19:28:42 +01:00 |
|
Astro
|
c6ee661bf9
|
gif joker censor interface
|
2011-12-13 19:25:38 +01:00 |
|
john stone
|
aa9a56e623
|
changed to /dev/pentabuzzer
i wasnt able to automatically allow user access
|
2011-12-13 18:35:17 +01:00 |
|
Astro
|
d1f86d6648
|
gif joker displaying in frontend
|
2011-12-13 16:50:22 +01:00 |
|
Astro
|
0ae711b59c
|
gif upload working in nedap backend
|
2011-12-13 16:07:09 +01:00 |
|
Frank Becker
|
a642a1d762
|
added generated json files to repo - So astro doesn't have to generate 'em himself.
|
2011-12-13 11:27:58 +01:00 |
|
Frank Becker
|
7fee81e632
|
fixed everything to make the converter happy
|
2011-12-13 11:27:07 +01:00 |
|
Frank Becker
|
ef2b614d51
|
added few more ideas
|
2011-12-13 09:56:40 +01:00 |
|
john stone
|
dfce5b2515
|
Merge branch 'master' of tuxcode.org:pentagameshow
|
2011-12-13 04:00:00 +01:00 |
|
john stone
|
0a637b76ad
|
changed devicefile to by-id version
this is portable between diffrent linux computers and more relable
than using stuff like /ttyUSB5.
|
2011-12-13 03:56:42 +01:00 |
|
Frank Becker
|
4a9f8a7559
|
added some media files
|
2011-12-13 00:04:02 +01:00 |
|
klObs
|
80376a05c3
|
Merge branch '28c3-klobs'
|
2011-12-12 23:58:54 +01:00 |
|
klObs
|
bf36075795
|
28c3, 20 fragen mit quellen und bildern
|
2011-12-12 23:58:19 +01:00 |
|
Frank Becker
|
f822ace61a
|
3 rounds of questions
|
2011-12-12 23:57:14 +01:00 |
|
klObs
|
a1c5a9dc6a
|
Add sources
|
2011-12-12 23:07:29 +01:00 |