Vencislav Atanasov
|
af0f5020ec
|
Merge branch 'master' of https://github.com/initLab/initfest into schedule-rewrite
# Conflicts:
# schedule/load.php
|
2016-10-24 00:46:48 +03:00 |
Vencislav Atanasov
|
46d9f93ac3
|
Fix filtering by event type
|
2016-10-24 00:34:15 +03:00 |
Vencislav Atanasov
|
48a0fa9c5f
|
Remove unused variables, add filter by event type, rewrite CSS class generation
|
2016-10-24 00:16:00 +03:00 |
Vencislav Atanasov
|
a807406eb0
|
Rename variables, add vertical merging of slots
|
2016-10-23 23:16:13 +03:00 |
Vencislav Atanasov
|
e18f6d1eb7
|
Enable horizontal merging of slots
|
2016-10-23 00:44:27 +03:00 |
Vencislav Atanasov
|
06080c6249
|
Use the proper styles
|
2016-10-22 19:09:03 +03:00 |
Vencislav Atanasov
|
69058e8fab
|
Merge event slots horizontally
|
2016-10-22 17:22:04 +03:00 |
Vencislav Atanasov
|
3b74bc0053
|
Fix rendering of schedule for 2015
|
2016-10-22 03:30:31 +03:00 |
Vencislav Atanasov
|
da5810e68b
|
[WIP] Properly format the schedule, fix minor bugs/whitespace
|
2016-10-22 03:23:29 +03:00 |
Vencislav Atanasov
|
439d778f15
|
Add support for showing different conferences (2014-2016), simplify some of the HTML code generation
|
2016-10-19 21:49:50 +03:00 |
Vencislav Atanasov
|
0857039fc5
|
Split code to functions, add basic config
|
2016-10-16 21:50:09 +03:00 |
Vencislav Atanasov
|
ca4f0e0f73
|
Filter allowed hall ids
|
2016-10-16 21:13:25 +03:00 |
Vencislav Atanasov
|
33ecff552c
|
Add legend, fix issues with the locale
|
2016-10-16 21:01:19 +03:00 |
Vencislav Atanasov
|
bdd3caa101
|
Increate cut length from 50 to 70, use multibyte strlen
|
2016-10-16 20:46:27 +03:00 |
Vencislav Atanasov
|
117c405747
|
Fix closing tags, add placeholder for speaker URL
|
2016-10-16 20:43:36 +03:00 |
Vencislav Atanasov
|
159cd14a5e
|
Fix html of the test page
|
2016-10-16 20:30:50 +03:00 |
Vencislav Atanasov
|
4eddfb2d5a
|
Skip slots without matching event ID
|
2016-10-16 20:23:37 +03:00 |
Vencislav Atanasov
|
25379fab15
|
Add gitignore for cache
|
2016-10-16 20:03:05 +03:00 |
Vencislav Atanasov
|
b6b02e48b0
|
Revert to the initial version of schedule
|
2016-10-16 19:47:05 +03:00 |