Commit Graph

168 Commits

Author SHA1 Message Date
Dave 7857670088 Fixed bug in migrations related to L5.2 upgrade 2016-04-01 17:18:25 +01:00
Dave 21f48d8a3b - Cleanup Gruntfile 2016-03-31 15:41:38 +01:00
Dave bff0396a16 - Remove credit card logos if the event is free
- Minor wording changes
2016-03-31 13:34:10 +01:00
Dave Earley feeed8d3c5 Update readme.md 2016-03-31 13:23:12 +01:00
Dave Earley d8890ba3d1 Update readme.md 2016-03-31 13:22:41 +01:00
Dave Earley fbb20a7639 Merge pull request #65 from mercuryseries/patch-1
Add myself to the contributors
2016-03-31 13:05:24 +01:00
Honoré HOUNWANOU 603832c2a4 Add myself as a contributor
Add my name to contributors,
2016-03-30 16:31:36 -04:00
Dave 9289cab01e Merge remote-tracking branch 'github/master' 2016-03-30 14:40:25 +01:00
Dave 99d71ff237 Few minor fixes related to L5.2 update 2016-03-30 14:39:18 +01:00
Dave Earley 78f7fa3ba1 Update readme.md 2016-03-30 13:25:47 +01:00
Dave beab5d64a5 Merge remote-tracking branch 'github/master'
# Conflicts:
#	composer.lock
2016-03-30 13:23:39 +01:00
Dave ea7aa19202 Merge branch 'jncampbell-update-to-laravel-5.2' 2016-03-30 13:18:44 +01:00
Dave c053ef7901 Merge branch 'update-to-laravel-5.2' of https://github.com/jncampbell/Attendize into jncampbell-update-to-laravel-5.2 2016-03-30 13:11:30 +01:00
Dave Earley b24daaf3ca Merge pull request #64 from mercuryseries/qrcode-check-in
Add Event Check-in with QR Code Scanning
2016-03-30 13:07:56 +01:00
Honore Hounwanou 0f18177911 Use Event ID for double checking 2016-03-30 01:06:58 -04:00
Honore Hounwanou c87f519375 Remove unnecessary images and go back to previous cipher 2016-03-30 01:00:55 -04:00
Honore Hounwanou 9708f601e8 Remove unnecessary code from webqr.js and qrcode template 2016-03-30 00:57:08 -04:00
Honore Hounwanou f275210756 Add QRCode Scanning 2016-03-29 21:37:38 -04:00
James Campbell 9ffd1197e2 Updates Laravel to 5.2 2016-03-29 20:30:02 -04:00
Dave 61e18f01de Added option to hide organiser page from public view 2016-03-28 00:19:30 +01:00
Dave 2cc3bbd6ae Removing unused barcode from ticket template 2016-03-27 23:35:34 +01:00
Dave a8aa0e64b4 Add event question JS to app.js 2016-03-27 21:12:44 +01:00
Dave Earley e7b29cf6d8 Merge pull request #60 from G0dLik3/implementAttendeesQuestions
Made a start on implementing the 'Attendees Question' feature.
2016-03-27 20:46:48 +01:00
marian 01bbeb975e Made a start on implementing the 'Attendees Question' feature.
- Created a migration (based on @daveearley 's migration) to add the
question_types, questions, question_options, event_question and
question_ticket tables.
- Created a seeder for the question_types table.
- Implemented event question add modal.
- Done a bit of refactoring to the ajax form submission error handling.
- Questions are now displayed on the event customization page, under the
Order form tab.
2016-03-27 16:40:34 +03:00
Dave 0baa62580d -Work on organiser profile design / settings page 2016-03-25 13:02:02 +00:00
Dave Earley a3b7f407a2 Updated readme 2016-03-25 11:22:51 +00:00
Dave 780d7917fe - Version bump
- Add missing use statement
2016-03-24 12:59:06 +00:00
Dave 310521fff8 Fix issue where checkout would fail if there were no payment gateways set. 2016-03-23 01:09:44 +00:00
Dave 6fe8346a1b Fix issue where plain text URL printed on the event dash was causing display issues 2016-03-23 00:53:02 +00:00
Dave fa584a8611 Update db config to recognize the .env DB_TYPE 2016-03-22 21:54:27 +00:00
Dave 87429f84db L5 updates 2016-03-22 15:31:18 +00:00
Dave 20b7361178 Fix bug where non-Stripe refunds were failing 2016-03-22 15:24:31 +00:00
Dave Earley f82648c1f7 Merge pull request #52 from bretto36/css-update
Added css update to make color picker display
2016-03-22 13:58:27 +00:00
brettninja 579a61fe6d Added css update to make color picker display 2016-03-21 23:37:08 -04:00
Dave fbf1ccefdb - added WhatsApp as a share option to event pages 2016-03-22 02:26:16 +00:00
Dave aa7251e1e6 - updated RRSSB lib and ChartJs
- Created migration to add social_show_whatsapp to the events table
2016-03-22 02:14:50 +00:00
Dave 5253fd88a3 - remove unused JS from check-in page 2016-03-22 01:59:44 +00:00
Dave 59a8c5153d Merge branch 'master' of https://github.com/Attendize/Attendize 2016-03-21 23:42:24 +00:00
Dave f7788db704 - Work on ticket design (issue #18) 2016-03-21 23:42:11 +00:00
Dave Earley d955d115bb Merge pull request #51 from bretto36/recent-change-fixes
Fixes for recent changes
2016-03-21 23:09:14 +00:00
brettninja 4a847957ca Fixes for recent changes 2016-03-21 18:57:10 -04:00
Dave ff206ba61d Merge branch 'tugis-ISSUE7_Organiser_Page' 2016-03-21 20:11:06 +00:00
Dave 77e3778c53 - working on ticket design (issue #18) 2016-03-21 20:11:03 +00:00
Luis Carneiro 33b1a1728b Issue 7: Changing link attribute to something meaningful 2016-03-21 19:35:20 +00:00
Luis Carneiro cd4e64c93d Issue 7: Load FB SDK js on partial; Fix bug on Event page Organiser section 2016-03-21 19:27:41 +00:00
Luis Carneiro be25664247 Issue 7: Organiser page initial version 2016-03-21 19:10:40 +00:00
Dave 5411a6cdea - remove multi-line comments from event customize page (https://github.com/Attendize/Attendize/issues/13#issuecomment-199406482) 2016-03-21 18:12:43 +00:00
Dave 6b13bca3b9 - Fix issue where free tickets were displaying '€0.00' instead of 'FREE' 2016-03-21 17:43:58 +00:00
Dave c94c91d18d - Updated order process so order session is cleared before we queue jobs. Prevents double orders in some cases. 2016-03-21 16:39:36 +00:00
Dave 8668b580d2 - Updating Wkhtml2PDF config (checkouts were failing when debug=true) 2016-03-21 16:36:40 +00:00