Commit Graph

165 Commits

Author SHA1 Message Date
JM2L 3c756654fe Merge branch 'tr4ck3ur/various_fixes_2017' of JM2L/jm2l into master 2017-10-03 01:35:56 +02:00
tr4ck3ur aba43a7831 take in account asked changes on PLAN 2017-10-03 01:34:18 +02:00
JM2L bf8015e272 Merge branch 'tr4ck3ur/various_fixes_2017' of JM2L/jm2l into master 2017-10-01 17:23:42 +02:00
tr4ck3ur b5aa7e12b0 Put LeafLet to latest version, fix potential wrong GPS coordinates 2017-10-01 17:21:35 +02:00
JM2L 0d65e1322c Merge branch 'tr4ck3ur/various_fixes_2017' of JM2L/jm2l into master 2017-10-01 13:00:47 +02:00
tr4ck3ur 9df505da5b fix missing slug on place table 2017-10-01 12:58:32 +02:00
JM2L e7ace7cfca Merge branch 'tr4ck3ur/various_fixes_2017' of JM2L/jm2l into master 2017-09-30 20:20:42 +02:00
tr4ck3ur e05339937a Handle follow media when rename room 2017-09-30 20:19:20 +02:00
JM2L 41c516b210 Merge branch 'tr4ck3ur/various_fixes_2017' of JM2L/jm2l into master 2017-09-30 15:23:29 +02:00
tr4ck3ur 74c3012f04 Added physical rooms list 2017-09-30 15:22:17 +02:00
JM2L 1fb19f573a Merge branch 'tr4ck3ur/various_fixes_2017' of JM2L/jm2l into master 2017-09-25 01:21:36 +02:00
tr4ck3ur 9ca738716e Fix for Issue #16 2017-09-25 01:20:04 +02:00
tr4ck3ur 084ac8d13e Add javascript confirmation before deletion 2017-09-24 22:25:58 +02:00
JM2L 25a1a52aee Merge branch 'tr4ck3ur/various_fixes_2017' of JM2L/jm2l into master 2017-09-24 18:36:07 +02:00
tr4ck3ur 7b30d125c4 Added csv export for issue #11 2017-09-24 18:35:27 +02:00
JM2L 1f24586847 Merge branch 'tr4ck3ur/various_fixes_2017' of JM2L/jm2l into master 2017-09-24 17:08:07 +02:00
tr4ck3ur b115e5e19d Fix for issue #14 2017-09-24 17:06:27 +02:00
JM2L 729263837d Merge branch 'tr4ck3ur/various_fixes_2017' of JM2L/jm2l into master 2017-09-24 16:04:56 +02:00
tr4ck3ur 78fb23e858 Add people role during event in ListParticipant 2017-09-24 16:00:13 +02:00
JM2L a9f4dd1975 Merge branch 'tr4ck3ur/various_fixes_2017' of JM2L/jm2l into master 2017-09-23 23:36:42 +02:00
tr4ck3ur 2a2cd02477 Some Fixes to take in account the year of JM2L event 2017-09-23 23:30:46 +02:00
tr4ck3ur a26c3b5d88 Ensure we don't overwrite staff profile, then remove wifi password awaiting valid one 2017-09-23 13:35:50 +02:00
JM2L 51c3da9685 Merge branch 'tr4ck3ur/various_fixes_2017' of JM2L/jm2l into master 2017-09-23 12:28:21 +02:00
tr4ck3ur 8f6f2bfd26 Take in account Km's remarks, thanks ! 2017-09-23 12:25:08 +02:00
JM2L 15644a442a Merge branch 'tr4ck3ur/various_fixes_2017' of JM2L/jm2l into master 2017-09-22 22:49:24 +02:00
tr4ck3ur d61c37ae98 Fix contact plan and HTML mail about wrong date, add day of week 2017-09-22 22:46:38 +02:00
JM2L 6a46fec0be Merge branch 'tr4ck3ur/various_fixes_2017' of JM2L/jm2l into master 2017-09-22 22:14:23 +02:00
tr4ck3ur dfcbcdf2f8 Give latest event date on e-mail template, Fix like sed -e 's/connection/connexion/g' string on email 2017-09-22 22:09:30 +02:00
JM2L d4af48e3c8 Merge branch 'master' of plhardy/jm2l into master 2017-05-30 19:18:04 +02:00
Philippe Lhardy 06cf17abe1 fix template to get 3 logos ( last is with marmots ). 2017-05-29 22:54:11 +02:00
Philippe Lhardy 8cd53ec7e0 proposition de logo pour des jm2l avcec marmottes 2017-05-29 22:14:51 +02:00
tr4ck3ur 81a0431dd9 Add multimedia on Home page 2016-10-09 00:44:17 +02:00
tr4ck3ur 7176eb1ca3 Fix year for Staff part 2016-10-08 23:50:13 +02:00
tr4ck3ur d888a45ef5 fix layout 2016-10-08 21:48:34 +02:00
tr4ck3ur 65abfb0e69 Fix issue with year for next edition 2016-10-08 21:42:16 +02:00
tr4ck3ur 1cd333acc0 Fix display justif issue 2015-12-05 14:01:03 +01:00
tr4ck3ur 27cf4dd24f Add compta part 2015-12-05 12:39:34 +01:00
tr4ck3ur 88cae4caaf Add FR3 vidéo 2015-11-29 17:47:37 +01:00
tr4ck3ur 7cb60f4412 Add FR3 vidéo 2015-11-29 17:38:38 +01:00
tr4ck3ur ef3db91741 Add FR3 vidéo 2015-11-29 17:17:48 +01:00
tr4ck3ur cfa767705b fixed salle 2015-11-28 14:52:42 +01:00
tr4ck3ur f78dd5dd08 fixed salle 2015-11-28 14:28:14 +01:00
tr4ck3ur d3c2abf3f3 screen 2015-11-28 12:42:22 +01:00
tr4ck3ur 604194228c redirect live user to backup 2015-11-27 13:26:05 +01:00
tr4ck3ur cfff312f38 Add stand print 2015-11-27 12:31:37 +01:00
tr4ck3ur 9a2eda2c99 Add Live page 2015-11-27 11:39:22 +01:00
tr4ck3ur b7797a9d58 add some legend to plan 2015-11-27 10:45:30 +01:00
tr4ck3ur 7c3a664302 Add parking 2015-11-27 10:20:33 +01:00
tr4ck3ur b2b10c5c75 add animated gif for screens 2015-11-26 02:59:18 +01:00
tr4ck3ur aab9b16318 typos 2015-11-21 15:58:14 +01:00