Commit Graph

922 Commits

Author SHA1 Message Date
Jeremy Quinton 7952bed6d0
Merge pull request #640 from Attendize/gtm_container
Add GTM container
2019-05-29 14:56:08 +02:00
Etienne Marais e9719242b3
📦 NEW: Add GTM into <head> if the tag exists either on the organiser or event. Falls back to not rendering if both the codes are empty. Event GTM will render first and fallback to the organiser. 2019-05-14 15:06:44 +02:00
Etienne Marais 141e737b69
📦 NEW: Add event level GTM code 2019-05-14 14:53:48 +02:00
Etienne Marais b04c75b267
📦 NEW: Add GTM field on the organiser settings page 2019-05-14 14:47:35 +02:00
Etienne Marais 272b426593
📦 NEW: Add migrations for the gtm code to live on the organiser and event 2019-05-14 14:29:08 +02:00
Sam Bell 1103a86777
Merge pull request #634 from publicarray/colour-picker
Fix the colour picker
2019-05-11 12:32:30 +01:00
Sam Bell b5cf1e48f9
Merge pull request #638 from publicarray/fix-635
Fix #635
2019-05-08 12:58:38 +01:00
Sebastian Schmidt b4a5f02911
Fix #635 2019-05-08 21:55:10 +10:00
Sebastian Schmidt f00267761d
Add missing minicolor palate image 2019-05-06 20:36:15 +10:00
Sam Bell 9c7cd48342
Merge pull request #632 from mstaack/fix-qr-code-scanning
fix(qr-code scanning)
2019-05-06 11:19:33 +01:00
Sam Bell 82fbcf9b52
Merge pull request #616 from mrlexley/change_private_reference_number
Change Private Reference Number
2019-05-06 11:11:10 +01:00
mrlexley db67678b0c Change STR length private_reference_number from 10 to 15 2019-05-06 09:16:22 +02:00
Max Matteo Staack 74fcb2bfcb fix #614 2019-05-04 19:31:53 +02:00
mrlexley ecf19481e7 Update 2019_04_05_180853_change_private_reference_number_column_type.php 2019-05-04 11:29:05 +02:00
mrlexley 07e7866eee Readability changes 2019-05-02 16:46:19 +02:00
mrlexley b031e3d8b2 Some changes to check if token already exists 2019-05-02 13:51:59 +02:00
Sam Bell 8e699b5aac
Merge pull request #550 from DODMax/e-flyer-position
Added event image position option
2019-04-30 10:52:23 +01:00
Sam Bell 8ca55c320a
Merge pull request #610 from philip-loyd/patch-1
Fix for "Message" contains html tags #574
2019-04-30 10:50:52 +01:00
Jeremy Quinton fd6ff79269
Merge pull request #612 from mrlexley/fix-datepicker-disapear-chrome
Update datepicker to fix disapearing datepicker in chrome
2019-04-13 21:30:46 +02:00
Jeremy Quinton 4288d54939
Merge pull request #613 from mrlexley/dutch-translation
Dutch translation
2019-04-13 20:48:11 +02:00
mrlexley 33ea0250e0 Change Private Reference Number
This changes the Private Reference Number (Data in QR Code), less chance of getting double ID's and I think its more secure.
2019-04-05 20:13:32 +02:00
mrlexley a69eac17e6 Dutch translation
A Dutch translation for Attendize.
2019-04-04 11:04:32 +02:00
mrlexley b1d2e27519 Update datepicker to fix disapearing datepicker in chrome 2019-04-03 11:33:46 +02:00
philip-loyd 19e064c592
Fix for "Message" contains html tags #574
Fixed HTML email template
2019-03-30 16:45:08 -05:00
Jeremy Quinton 6a683d905f removed comment to old gateways 2019-03-22 17:05:40 +02:00
Jeremy Quinton ea3c66a8f5
Merge pull request #581 from matometaru/add-lang-japanese
Japanese translation
2019-03-22 16:50:34 +02:00
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
matometaru 240c391c60 fix 参加者 -> 出席者 2019-03-03 16:51:07 +09:00
matometaru d167d6e4d5 translation lang/* 2019-03-03 16:50:33 +09:00
matometaru b5698313fc translation views/* 2019-03-02 18:50:26 +09:00
matometaru 33207229f1 translation lang/* 2019-03-02 18:49:36 +09: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