Commit Graph

493 Commits

Author SHA1 Message Date
Dave Earley e1956b2da9 Fix issue where widgets would refresh to full site on timeout (closes #235) 2016-11-06 21:56:35 +00:00
Dave Earley f3635841f7 Merge pull request #233 from Flightkick/master
Fixed typo
2016-11-03 21:05:49 +00:00
Dave Earley b06083c6bf Merge pull request #229 from nbdd0121/master
Correctly disable and un-disable fields
2016-11-03 21:05:20 +00:00
Flightkick 88373482a8 Fixed typo
Exipry --> Expiry
2016-10-31 18:03:10 +01:00
Gary Guo 66fea25464 Correctly disable and un-disable fields
when toggle between offline and online payment methods.
2016-10-26 18:13:43 -04:00
Dave Earley 09fa83c7ee Merge pull request #226 from nbdd0121/master
Two bugfixes
2016-10-26 21:17:21 +01:00
Dave Earley 581477fa21 Add callout to designers to readme 2016-10-26 20:43:32 +01:00
Gary Guo 28e124c6de Make tickets be sorted in ASC order
In EventTicketsController::postUpdateTicketsOrder, sort_order is generated in ascending order, however, when displaying tickets, tickets is sorted in descending order. 964e456 tries to solve the issue but it is the other way around.
2016-10-23 19:52:40 -04:00
Gary Guo a1dec16b1e Display as raw HTML after escaping and nl2br 2016-10-23 19:09:43 -04:00
Dave Earley 7f34fefd45 Move Google Analytics code to the head of organiser pages (closes #205) 2016-10-23 22:23:50 +01:00
Dave Earley 964e45688d Change default ticket sort on frontend to correspond with the backend 2016-10-23 18:18:05 +01:00
Dave Earley 6adfb9097a Change default sort order of tickets to 0 2016-10-23 18:11:13 +01:00
Dave Earley 2e73177f6b Fix typo 2016-10-23 18:07:12 +01:00
Dave Earley cc0c22a743 Added ability to order tickets (closes #214) 2016-10-23 17:51:46 +01:00
Dave Earley 16a125ff66 Remove CC number data from POST data during checkout (closes #207) 2016-10-23 16:39:54 +01:00
Dave Earley 98dd9aa71d Added a 503 error view (closes #209) 2016-10-23 00:08:31 +01:00
Dave Earley e6caab8852 Removing unused API related code which was causing errors 2016-10-23 00:02:48 +01:00
Dave Earley f62a6ba000 Add powered by link to embedded widgets 2016-10-22 23:58:45 +01:00
Dave Earley a3d1e946bc Hide tickets on embedded ticket lists (closes #225) 2016-10-22 23:18:36 +01:00
Dave Earley 7bfd12cf80 Remove unused service provider 2016-10-22 23:16:16 +01:00
Dave Earley c5a7bc328a Add ability to hide tickets (closes #218) 2016-10-22 17:06:34 +01:00
Dave Earley a9b06edee7 Merge pull request #222 from jharris70/patch-1
Update Order.php
2016-10-13 22:00:53 +01:00
jharris70 2e5916d603 Update Order.php 2016-10-13 13:57:07 -07:00
Dave Earley 5b2a24e063 Fix issue where all attendees appeared to be checked in in check-in section 2016-10-13 13:57:18 +01:00
Dave Earley 539a0c4fec Merge remote-tracking branch 'origin/master'
# Conflicts:
#	app/Http/Controllers/OrganiserCustomizeController.php
#	app/Models/Account.php
#	app/Models/AccountPaymentGateway.php
#	composer.lock
2016-10-11 21:25:47 +01:00
Dave Earley 852172b9a5 Add about section 2016-10-11 21:23:16 +01:00
Dave Earley 7ab41313cb Merge pull request #211 from jacobcat/master
Fix on MIGS payment gateway
2016-10-09 12:47:14 +01:00
Dave Earley cab32d6e01 Merge pull request #212 from shibby/master
Model FQN written instead of class name string
2016-10-09 12:46:32 +01:00
Dave Earley 6196367064 Merge pull request #210 from defiant/master
Correct typo in Event Model method
2016-10-09 12:45:54 +01:00
shibby c356c6b9f2 fix for wrong FQN 2016-10-08 01:51:04 +03:00
shibby 7f26093b49 Model relation's fully qualified class name's written instead of string usage 2016-10-08 01:48:54 +03:00
Jacob Catayoc 4fc9586a61 - Fix some problems with MIGS 2016-10-07 21:43:04 +08:00
Jacob Catayoc b219ca6413 Merge branch 'master' of https://github.com/Attendize/Attendize 2016-10-07 21:33:18 +08:00
Jacob Catayoc ece56a5280 Merge branch 'master' of https://github.com/jacobcat/Attendize 2016-10-07 21:31:21 +08:00
Sinan Taga f8be96a6fe Correct typo in Event Model method
Committer: Sinan Taga <sinantaga@gmail.com>
2016-10-07 13:46:35 +03:00
Dave Earley f03170f939 Merge pull request #194 from jacobcat/add_migs_payment_gateway
Add MIGS payment gateway
2016-09-28 19:51:02 +01:00
jacobcat df702a7f0f Merge pull request #2 from jacobcat/add_migs_payment_gateway
Add migs payment gateway
2016-09-24 22:58:36 +08:00
Jacob Catayoc ef826d4ff1 Merge branch 'master' into add_migs_payment_gateway 2016-09-24 22:51:35 +08:00
jacobcat d96ba4a825 Merge pull request #1 from Attendize/master
Update from approved pull requests from base
2016-09-24 22:49:50 +08:00
Jacob Catayoc e5d4f75559 - Returned some original defaults for Attendize 2016-09-19 06:58:36 +08:00
Dave Earley f728bc6ac0 Merge pull request #203 from jmowatt/feature/google-analytics-per-organiser-support
Per Organiser Google Analytics
2016-09-17 17:50:17 +01:00
James Mowatt a7698ef403 Make Google Analytics code conditional
Do not load the partial if an analytics code has not been set on the
Organiser.
2016-09-16 23:42:56 +01:00
James Mowatt 1212f71e18 Include Analytics at footer of Organiser page 2016-09-16 23:41:40 +01:00
James Mowatt a98a7835d8 Capture and Store GA Code
Capture and store a Google Analytics code per organiser.
2016-09-16 23:29:06 +01:00
Dave Earley fc5705afb6 Merge pull request #202 from kozi/master
Add DB_PREFIX property to .env to support shared databases
2016-09-15 17:17:48 +01:00
Dave Earley 52b29fe071 Merge pull request #199 from jmowatt/feature/ics-on-confirmation
Add user importable calendar to email
2016-09-15 17:13:35 +01:00
kozi 4cf4a2f613 Add DB_PREFIX property to .env to support shared databases 2016-09-15 14:05:50 +02:00
James Mowatt 4da066772d Add ICS link to confirmation email
This provides a download link for the generated ICS file.
2016-09-11 17:04:23 +01:00
James Mowatt ca4795e9bc Add Route and Controller for ICS download
Provide a route and method for people to download an ICS file
2016-09-11 16:50:12 +01:00
James Mowatt 9579dfb10c Retrieve ICS Content for a event
Add getIcsForEvent() method, this returns an ICS formatted text ready
for download or attaching to emails.
2016-09-11 16:49:27 +01:00