Commit Graph

882 Commits

Author SHA1 Message Date
Jeremy Quinton 39ce03e9c5 Merge branch 'master' of https://github.com/Attendize/Attendize 2019-03-22 16:45:37 +02:00
Jeremy Quinton b812297491 fixed variables names 2019-03-22 16:45:22 +02:00
Jeremy Quinton c95072ef30
Merge pull request #605 from Attendize/event_currency_level
Event currency level
2019-03-22 16:08:11 +02:00
Jeremy Quinton bb6f0daf04 as events can be in different currencies remove the sum of all events from the dashboard 2019-03-22 15:58:14 +02:00
Jeremy Quinton f5588f1818 fixed spacking 2019-03-22 15:55:33 +02:00
James Dahlen 8ea420b2bc manage event currency 2019-03-12 09:37:43 -04:00
Jeremy Quinton c98f82578c
Merge pull request #567 from publicarray/remove-google-fonts
Remove google fonts and update node devDependencies
2019-02-28 22:30:49 +02:00
Jeremy Quinton 9f19d27027
Merge pull request #573 from Attendize/attendees
Unique attendee ID on data export
2019-02-28 22:07:09 +02:00
Jeremy Quinton 39e346faee
Merge pull request #586 from publicarray/http->https
Nits (https and fix a dev console warning)
2019-02-28 21:56:07 +02:00
Jeremy Quinton 9bdf0ae788
Merge pull request #571 from vikashsp/patch-1
Include log Facade
2019-02-28 17:30:56 +02:00
Jeremy Quinton d1ab4916af
Merge pull request #575 from ghoeffner/patch-1
Fixing feedback URL
2019-02-28 17:26:17 +02:00
Jeremy Quinton d83794b1e2
Merge pull request #588 from publicarray/translations2
Fixing Issue #465 - translatable strings
2019-02-28 17:09:33 +02:00
Jeremy Quinton 927d9a3539
Merge pull request #587 from publicarray/translations
Continuation from #495
2019-02-28 16:24:19 +02:00
Sebastian Schmidt f2e441eae5 Fixing Issue #465 - translatable strings
Credits to @kerrinhardy

4fa346f16b

Unfortunately due to merge conflict the
original author information was not retained.
2019-02-28 12:22:42 +11:00
Kerrin Hardy 29adb572a4
Updated 'You cancelled your payment. You may try again.' to be translatable 2019-02-28 12:08:39 +11:00
Kerrin Hardy de61912b0b
Updated 'Event Successfully Made Live! You can undo this action in event settings page.' to be translatable 2019-02-28 12:07:57 +11:00
Sebastian Schmidt b72e4e13f7 Fix SensorNotRequired warning in google geocoding API 2019-02-28 11:55:52 +11:00
Sebastian Schmidt a56ac1ce7c http -> https 2019-02-28 11:55:04 +11:00
Sebastian Schmidt f8e34c2072 Run grunt 2019-02-28 11:45:47 +11:00
Sebastian Schmidt e41b1a92fa Update devDependencies 2019-02-28 11:44:48 +11:00
Sebastian Schmidt 7242e0b633 remove gulp and add simple build frontend script 2019-02-28 11:44:48 +11:00
Sebastian Schmidt c54a4134c5 remove google fonts 2019-02-28 11:44:48 +11:00
Sam Bell a69523a53b
Update readme.md 2019-02-25 11:03:06 +00:00
German e943e7865b
Fixing feedback URL 2019-02-20 08:55:11 +01:00
Jeremy Quinton c7d86261d4 adding uncommented code back in 2019-02-19 14:50:45 +02:00
Jeremy Quinton 935170f256
Merge pull request #549 from DODMax/e-offline-pay
Allow offline payment when no gateway is defined
2019-02-18 09:31:44 +02:00
Jeremy Quinton 957c87c0e0
Merge pull request #560 from dillingham/patch-1
fix broken images
2019-02-17 18:59:02 +02:00
Jeremy Quinton 3bb4aaddb5
Merge pull request #566 from publicarray/fix-hide-social-icon
Fix #557
2019-02-17 18:55:15 +02:00
Jeremy Quinton be87806070
Merge pull request #565 from publicarray/fix-date-time-format-on-dash
fixes #556
2019-02-17 18:52:06 +02:00
Sam Bell 41ead8bdf1 Unique attendee ID on data export 2019-02-17 13:20:11 +00:00
Jeremy Quinton 4a4c71cd9d
Merge pull request #572 from Attendize/feature/access-code-delete-and-count
Feature/Discount code delete and usage count
2019-02-16 19:12:50 +02:00
Etienne Marais cc1e9613c9
Added an enmpty table cell if the remove link cannot be displayed because of usage. This makes the table look better 2019-02-14 17:17:00 +02:00
Etienne Marais 33d96905f6
Moved the duplicate checks (#568) to this PR as they are related 2019-02-14 17:12:07 +02:00
Etienne Marais 0cabc92200
Updated the lang file keys in the eventview controller 2019-02-14 17:04:31 +02:00
Etienne Marais 99de2c73ee
Renamed back to access codes since it explains it better 2019-02-14 17:02:24 +02:00
Etienne Marais 3b83e97827
Added the delete of the code if the code usage count on the specific event is zero. Also the delete is a soft delete 2019-02-13 16:16:56 +02:00
Etienne Marais 3b60ad95d4
Added a remove operation to each access code. Cannot remove from the frontend if the code has been used 2019-02-13 15:44:25 +02:00
Etienne Marais b525a561c8
Log usage when a code gets used from the front end. Also cleaned the frontend input when comparing against the database code 2019-02-13 15:35:48 +02:00
Etienne Marais e0f74356d6
Added usage count and spaced the table listing a bit better 2019-02-13 15:14:12 +02:00
Etienne Marais 3738c912ea
Added the migration for the event access codes table to contain a usage count 2019-02-13 15:04:53 +02:00
Etienne Marais b11c3fa09c
Fixed the page title to say discount codes 2019-02-13 15:01:25 +02:00
Etienne Marais 068c3b1ffa
Moved the discount table to be full length. Added typography helpers to align text 2019-02-13 11:02:22 +02:00
Etienne Marais 68fe2ca882
Added a missing translation on the hidden ticket modal 2019-02-13 10:26:36 +02:00
Etienne Marais 9101dd00fd
Renamed all the mentions of access codes to be called discount codes and removed the access codes translation file 2019-02-13 10:24:52 +02:00
Etienne Marais 2872909c03
Moved the old access code code to the new discount codes controller 2019-02-13 10:12:33 +02:00
Etienne Marais be74112c33
Fixed the success message to be translated and changed the message to read discount code instead of access 2019-02-13 10:10:52 +02:00
Etienne Marais 74d60c5c0d
Moved the access codes to a new section called discount codes in the event tools section. Made the redirect to the new route and removed the customize tab content 2019-02-13 09:57:12 +02:00
Etienne Marais b275c5804b
Moved the access codes to a new section called discount codes in the event tools section. Made the redirect to the new route and removed the customize tab content 2019-02-13 09:52:08 +02:00
Vikash Sharma 810f40c1e3
Include log Facade 2019-02-13 11:46:45 +05:30
Sebastian Schmidt 7120b60845 fix https://github.com/Attendize/Attendize/issues/557 2019-02-02 12:52:12 +10:00