Commit Graph

334 Commits

Author SHA1 Message Date
Dave Earley 6e3ad53f93 Begin implementing transactions 2016-05-25 13:20:26 +01:00
Dave Earley 05d038af33 Merge remote-tracking branch 'origin/master' 2016-05-23 22:23:15 +01:00
Dave Earley 8e20164d56 Merge pull request #104 from ylecuyer/ui
UI fixes
2016-05-23 21:33:58 +01:00
Dave Earley bf0b93263d Merge pull request #109 from ylecuyer/107
Fixes #107
2016-05-23 21:33:39 +01:00
Dave Earley 0ba79c8ddd Merge pull request #111 from ylecuyer/checkin
Close webcam after finishing checkin
2016-05-23 21:33:29 +01:00
Dave Earley 00aa02563c working on redesign of organiser page 2016-05-23 21:26:56 +01:00
Yoann Lecuyer 4842a0924f Close webcam after finishing checkin 2016-05-22 18:57:50 -05:00
Yoann Lecuyer 628efc43b2 Fixes #107 2016-05-21 23:20:25 -05:00
Yoann Lecuyer 03f8e35acc Fixed typo 2016-05-21 17:41:46 -05:00
Yoann Lecuyer ba7ea61bff Fixed display for required field 2016-05-21 17:19:36 -05:00
Dave Earley 7322b3886c Merge branch 'organiser_page' 2016-05-21 22:17:25 +01:00
Dave Earley 48be489f61 Merge pull request #103 from ylecuyer/installer
Fixed installer
2016-05-21 22:17:03 +01:00
Dave Earley a0b0ead633 Started on redesign of organiser page 2016-05-21 22:16:26 +01:00
Yoann Lecuyer eb3d1b6123 Fixed installer 2016-05-21 13:23:18 -05:00
Dave Earley 9e29a7fc22 Working on custom event questions 2016-05-21 18:37:15 +01:00
Dave Earley da6a9d5610 Fixing issue where concatenating JS files lead to JS errors on the frontend 2016-05-21 17:16:01 +01:00
Dave Earley 82fff62d2e Fixing link in readme 2016-05-21 00:33:01 +01:00
Dave Earley 139c1b538c Updated readme 2016-05-21 00:30:02 +01:00
Dave Earley 765f6c9914 Updating path to jQuery in views 2016-05-21 00:18:46 +01:00
Dave Earley 1145b0610d Fixed powered by link color problem on PDF tickets 2016-05-21 00:11:15 +01:00
Dave Earley fe2c5d6223 Fixed issue where CSS was not being passed to the ticket view 2016-05-21 00:09:34 +01:00
Dave Earley cc911f7344 worked on implementing custom attendee questions 2016-05-20 23:56:47 +01:00
Dave Earley ab78f12950 Updated fallback organiser logo path in config 2016-05-14 14:22:41 +01:00
Dave Earley acbeffb0ef Updated mass messaging to work with the queue system 2016-05-13 10:55:15 +01:00
Dave Earley d719a0c5a5 Merge remote-tracking branch 'origin/master' 2016-05-13 10:30:19 +01:00
Yoann Lecuyer fed1cde69d Fix mass messaging (#99) 2016-05-13 10:30:11 +01:00
Dave Earley dccdd9c276 Started work on exporting survey answers 2016-05-12 23:33:23 +01:00
Dave Earley d256fecaf8 Fixed bug where PDF ticket generation would fail when no logo was passed (closes #97) 2016-05-12 13:33:34 +01:00
Dave Earley f689ff3b1e Fixed bug where incorrect currency symbol was showing on organiser dashbaord. 2016-05-12 11:44:42 +01:00
Dave Earley 25b1b03b68 Removed unnecessary use statement in logout controller (closes #96) 2016-05-12 11:19:12 +01:00
Dave Earley 4b9dd02a3d removed unsed attendees json from check-in page 2016-05-12 00:42:19 +01:00
Dave Earley 562250a9cf Merge remote-tracking branch 'origin/master' 2016-05-12 00:30:44 +01:00
Dave Earley 02e93e7adb Solved bug where Google+ checkbox in event customize section wasn't working (closes #88) 2016-05-12 00:27:25 +01:00
Dave Earley 95af1f79e2 Decreased the number of recent orders shown on the organiser dashboard (closes #95) 2016-05-12 00:18:03 +01:00
Yoann Lecuyer 04c1b1d307 Docker dev environment (#90) 2016-05-12 00:15:54 +01:00
Yoann Lecuyer 6198b4925d Postgresql compatibility (#91) 2016-05-12 00:15:30 +01:00
Yoann Lecuyer cd155f4571 Standalone ticket generator (#93) 2016-05-12 00:14:58 +01:00
Yoann Lecuyer 9b0a5f80b8 Added bower missing dependencies (#94) 2016-05-12 00:14:34 +01:00
Dave Earley d1b85ece61 Added VueJS to Git 2016-05-12 00:12:57 +01:00
Dave Earley 8470dffd23 Removed JS click event on calendar days left 2016-05-12 00:10:43 +01:00
Dave Earley 84b0a11203 Rewrote the Check-In page in VueJs and upgraded the UI 2016-05-12 00:07:57 +01:00
Dave Earley 4b2e6059f9 Merge branch 'master' into vue_checkin
# Conflicts:
#	resources/views/ManageEvent/Modals/CreateQuestion.blade.php
2016-05-09 17:47:22 +01:00
JapSeyz beba0a0786 Fix for non-unique modal IDs (#89) 2016-05-09 15:45:46 +01:00
Dave Earley becea4395c Fixed 'Undefined Variable' related to the calendar_events array on the Organiser Dashboard controller. 2016-05-08 16:36:26 +01:00
Dave Earley e4f6e8cb26 Fixed bug where checkout questions with multiple selections were not being saved + small checkout bug fixes 2016-05-06 00:18:52 +01:00
Dave Earley 49b0fac0f5 Removed the instructions field for event questions 2016-05-05 21:33:26 +01:00
Dave Earley 79f8de9653 Added a calendar to the organiser dashboard 2016-05-05 16:46:52 +01:00
Dave Earley 586d3dff8e Changed the color of the power by link 2016-05-04 23:26:52 +01:00
Dave Earley 5e5521c830 Started implementing vue.js 2016-05-03 21:44:18 +01:00
Dave Earley f9b4669c41 Fixed bug where attendees weren't displaying correctly on check-in page 2016-04-29 13:44:28 +01:00