Commit Graph

247 Commits

Author SHA1 Message Date
Dave Earley 95af1f79e2 Decreased the number of recent orders shown on the organiser dashboard (closes #95) 2016-05-12 00:18:03 +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
Dave Earley 76eb5a4237 Version bump 2016-04-28 23:22:53 +01:00
Dave Earley a5627abd52 Added user login / signup tests 2016-04-28 00:15:49 +01:00
Dave Earley 433f8223cd Merge remote-tracking branch 'origin/master' 2016-04-28 00:13:18 +01:00
Dave Earley f90c764034 Design update (#85)
Design update & began working on tests
2016-04-28 00:10:39 +01:00
Dave Earley 2d32ba1c76 Merge branch 'tests' 2016-04-28 00:06:32 +01:00
Dave Earley 6b10a05563 Began work on tests 2016-04-28 00:06:17 +01:00
Dave Earley f897bc66de began setting up test env 2016-04-27 00:08:27 +01:00
Dave Earley 257d6574b2 Removed default value from social_share_text field on event table 2016-04-26 23:13:28 +01:00
Dave Earley 01cbaad353 Merge pull request #84 from Attendize/revert-81-revert-79-postgres
Revert "Revert "Postgres compatibility""
2016-04-26 23:12:04 +01:00
Dave Earley 862c74d3c3 Revert "Revert "Postgres compatibility"" 2016-04-26 23:10:52 +01:00
Dave Earley 304b9c6e1f Began working on tests 2016-04-26 22:33:16 +01:00
Dave Earley f6f26068da Updated incorrect page heading 2016-04-26 22:00:31 +01:00
Dave Earley cd5979f8f1 Working on UI redesign
Added recent orders to organiser dashboard
2016-04-26 14:36:43 +01:00
Dave Earley 03e491994c Working on UI update
Removed accidental double word on 'Create Organiser' page
2016-04-25 16:31:21 +01:00
Dave Earley c13b1a885a Working on UI update
Changed logo
2016-04-24 16:25:08 +01:00
Dave Earley 4580730f13 Working on UI update 2016-04-22 12:01:48 +01:00
Dave Earley 061673b172 Added check to see if bootstrap/cache is writable at install 2016-04-22 11:57:05 +01:00
Dave Earley 49502f1f2e Merge pull request #81 from Attendize/revert-79-postgres
Revert "Postgres compatibility" due to issue #80
2016-04-22 11:43:19 +01:00
Dave Earley 5426eeea19 Revert "Postgres compatibility" 2016-04-22 11:41:39 +01:00
Dave Earley 719f2a599c Merge pull request #79 from ylecuyer/postgres
Postgres compatibility
2016-04-21 14:28:48 +01:00
Yoann Lecuyer 17cf0b4a1c Postgres compatibility 2016-04-20 19:14:16 -05:00
Dave Earley 3f452cfb65 Merge pull request #78 from ylecuyer/hotfix
Fixed wrong link in BlankSurvey
2016-04-21 00:20:47 +01:00
Dave Earley 4e01badac4 Merge pull request #76 from DanHaas/master
Event Attendee Import
2016-04-21 00:14:59 +01:00
Yoann Lecuyer 345a8b1351 Fixed wrong link in BlankSurvey 2016-04-20 12:34:39 -05:00
greatmade 9a51d2d62d Event Attendee Import 2016-04-20 17:52:07 +01:00
Dave Earley 4737098b0e Merge pull request #75 from greatmade/patch-1
Update EventPage.blade.php
2016-04-20 01:50:25 +01:00
Dave Earley 63d26f821c Fix bug related to dashboard not appearing for new events. 2016-04-20 01:47:27 +01:00
greatmade f841e2d124 Update EventPage.blade.php
move frontend.js above $secondsToExpire
2016-04-19 14:25:35 +01:00
Dave Earley 47f2436785 Updating licence 2016-04-19 10:14:01 +01:00
Dave Earley d2b2449ed3 Fix for bug where creating organisers would fail on some installs 2016-04-19 00:21:26 +01:00
Dave Earley 72d2fa0f94 Fix organiser dashboard display bug 2016-04-18 23:08:15 +01:00
Dave Earley 4bd852c90f Fix install issue related to missing DB column 2016-04-18 20:53:21 +01:00
Dave Earley f24e80a929 Fixed bug where adding users failed 2016-04-17 23:41:19 +01:00
Dave Earley 46c2577606 Merge branch 'develop'
# Conflicts:
#	public/assets/stylesheet/check_in.css
#	resources/views/ManageEvent/Surveys.blade.php
2016-04-17 21:19:23 +01:00
Dave Earley 91759fff12 Work on event check-in page 2016-04-17 21:13:55 +01:00
Dave Earley e24efa30cc Work on event check-in page 2016-04-17 21:12:38 +01:00
Dave Earley 66a50d5040 Work on API 2016-04-17 21:12:38 +01:00