Commit Graph

606 Commits

Author SHA1 Message Date
Jeremy Quinton 55ada1bb80 added mysql configuration
Added configuration so that mysql is the default database.
2018-07-04 13:36:58 +02:00
Jeremy Quinton 6e94d5a2e1 Set the default development environment type back to MySQL
As the projects default setup uses Docker and MySQL default the DB adapter to MySQL.
2018-07-03 15:48:03 +02:00
Jeremy Quinton 78696e47de Added a composer image
1. Bumped the PHP version in the PHP Docker file so that composer can run successfully as some packages are depdendent on PHP 7.0.8 or higher
2. Added a composer image that is dependent on the same version of the PHP container so that there are no issues running composer.
2018-07-03 15:46:02 +02:00
Sam Bell 6e608b47ed Merge pull request #390 from jeremyquinton/fix-defaults
Changed the default db adapter
2018-07-02 20:31:34 +01:00
Jeremy Quinton d97dfdfb17 fixed incorrect typo 2018-06-29 18:49:56 +02:00
Jeremy Quinton 9f3f3fd450 changed the default db adapter
In the docker compose file we are using Postgres as the DB but the
default adapter is set to use MySQL so trying to create the default app
out the box does not work.
2018-06-29 18:44:34 +02:00
Sam Bell 55ef3545c7 Merge pull request #387 from deucecreative/fix-safari-qr-code-scanning
Fix QR code scanning in Safari (inc. iOS).
2018-06-28 17:24:50 +01:00
Sam Bell b3da2e9d6b Update readme.md 2018-06-27 20:44:05 +01:00
Sam Bell b56e17f188 Merge pull request #388 from Fohdeesha/master
Fix attendee email subject
2018-06-27 19:29:23 +01:00
BuildTools 95ae91dacc Fix attendee email subject 2018-06-22 00:08:50 -04:00
Matt Sims d43d2a4c5f Fix QR code scanning in Safari (inc. iOS). 2018-06-20 22:01:38 +01:00
Sam Bell ffb12f7a3b Merge pull request #384 from sukeesh/master
port variable set twice
2018-06-17 09:50:04 +01:00
Sukeesh 256e419809 port variable set twice
port variable in mysql has been set twice. So, removed the redundant var.
2018-06-16 21:17:34 +05:30
Sam Bell 7c0147855d Merge pull request #346 from SierraTecnologia/oficial
Fixing bugs while running command artisan route:list
2018-06-14 17:35:17 +01:00
Sam Bell cbeb79373d Missing translation 2018-06-12 15:12:05 +01:00
Sam Bell 9ba8852441 Merge pull request #381 from shadowm2/master
Fixed Typo
2018-06-07 11:42:19 +01:00
Mohammad Bagheri 10ef73a4e1 Update Sidebar.blade.php 2018-06-07 14:25:30 +04:30
Mohammad Bagheri 945939cde0 Update routes.php 2018-06-07 14:24:48 +04:30
Sam Bell 4aa442d017 Merge branch 'jmarianski-translations' 2018-06-04 17:28:44 +01:00
Sam Bell 89969e1b68 Merged pull request with localisation 2018-06-04 17:28:21 +01:00
Sam Bell d2180ea92b Merge pull request #380 from samdb/master
Addition of tax options
2018-06-04 17:03:47 +01:00
Sam Bell 932bdbcfa8 Merge pull request #378 from randomCards/patch-1
Update Dockerfile-php
2018-05-29 14:01:56 +01:00
Mirko Sacchetti f5ec83dafc Update Dockerfile-php
The package libpng12-dev was dropped after 16.04. It's been gone a long time.
2018-05-27 21:37:20 +02:00
Sam Bell 0a6ddf56f6 Logo URL fix 2018-05-06 13:12:37 +01:00
Sam Bell c519ae318b Hide unpublished listings from organizer page 2018-05-06 13:07:02 +01:00
Sam Bell 6b1867be89 Option to set DB port 2018-05-06 12:41:58 +01:00
Jacek Marianski 83205555d7 (localization) Several big changes:
1) Added localization components to the package. They allow usage of localized routes, like http://attendize.site/en/login
2) Added English and Polish localization files. They are ugly, repetitive, but mostly true to the original and relevant. It required rewriting several phrases, and certainly required editing most of the views and controllers.
3) Edited routes to accomodate point 1
4) Rewritten several rules regarding dates. In most cases using English notation (with English names for months) is bad in all other languages. I used environment wide date format that is used.
5) Updated installer. Haven't tested it yet, but should work. Rewrites .env.example file instead of creating it from scratch (by concatenating strings).

There are some minor changes that were simple fixes or other funky requirements from my employer that kinda make sense:
1) QR code reader wasn't working in firefox, fixed it. Works in chrome/firefox on mobile on https sites.
2) Added subscript text in some instances: below ticket registration, below ticket. It is kinda dumb, but in most cases is necessary to receive less complaints from clients.
3) Fixed geocoding api by adding api key in env file. At some point in 2016-2017 it was required by google to use API key from developer console and this requirement wasn't challenged in the code.
4) Ticket has been displaying either flyer or site logo on the side. Now displays both (which may affect 1d barcode - it might need some fixin). Regarding the same issue - description of an event contained the flyer image on the side, it was removed, cause it didn't fit in here.
5) Ticket style was updated, because of the above and because it didn't fit longer character strings. Now it's slightly uglier, but works in all cases.
and other.

There are also some inconveniences, like:
1) Unfinished translations. It was impossible for me to create translations based on strings located inside of a database, which I ignored (I think it's only at one place - surveys).
2) Ugly translation files. At some point I thought it is going to be easier to locate when I try translating vased by file name. Later I divided it by topics, and then I segmented it even more. It might require some serious clean-up.
3) Redundancy. In some cases there are several definitions for the same phrase in my localization files. I used it mostly to protect myself from different contexts for the phrase usage in different languages.
4) File division. There are several files that are placed in dedicated language directory (in /view/, like /view/pl/ or /view/en/). These files don't use language phrases, but they are translated as a whole. Mostly because using language phrases would make those view files unreadable.
5) Localzation helper marks some phrases as obsolete (in file "basic"), because they are used in app/Helpers folder (where this plugin doesn't reach)
2018-05-03 23:41:22 +02:00
Sam Bell 2fc6e90432 Merge pull request #3 from Attendize/master
Realign with master project
2018-04-26 09:17:41 +01:00
Sam Bell 7514aa4ba8 Merge pull request #358 from githubertus/patch-2
Make charts on dashboard work
2018-04-25 08:17:51 +01:00
Sam Bell 47e9aaf4b0 Merge pull request #357 from githubertus/patch-1
Tickets Sold and Sales Volume charts working
2018-04-25 08:16:17 +01:00
githubertus f50d708b7a make Charts on dashboard work 2018-04-24 20:34:03 +02:00
githubertus 21d3234b88 make Tickets Sold and Sales Volume charts working
Honestly, I'm not a Laravel expert and maybe it's just a local issue, but firstOrNew didn't work for me (PHP 5.6) ...
2018-04-24 20:25:07 +02:00
Sam Bell 0bfe124514 Update readme.md 2018-04-24 14:38:57 +01:00
Sam Bell 8c5c0ad656 Merge pull request #2 from Attendize/master
Merge typos
2018-03-29 15:52:02 +01:00
Sam Bell 93ec2c3f76 Merge branch 'master' of https://github.com/samdb/attendize 2018-03-29 14:43:14 +00:00
Sam Bell e2dcf4e805 Updated incorrect page title 2018-03-29 15:25:05 +01:00
Sam Bell 86e9006333 Correct grammar in ticket cancellation email 2018-03-29 14:17:43 +01:00
Sam Bell cb98c6a161 Merge pull request #1 from Attendize/master
Update demo link
2018-03-29 14:03:50 +01:00
Sam Bell 88222eb50f Update demo link 2018-03-27 12:49:30 +01:00
Sam Bell 1f03d33fd0 Conflict resolution 2018-03-07 09:03:54 +00:00
Sam Bell ec36de54c5 Recompile styles 2018-03-06 20:45:52 +00:00
Sam Bell be526044ce Fix event logging issue on checkout 2018-03-06 20:45:32 +00:00
Sam Bell f5d392cc23 Revert config change to most users defaults 2018-03-06 20:44:14 +00:00
Sam Bell f8ea51dd97 Add VAT and updated totals to order confirmations 2018-03-06 20:40:49 +00:00
Ubuntu 9d3abc611e Revert PDF config to defaults 2018-03-05 09:08:46 +00:00
Sam Bell e0cfb98b8b iframe resize css fix 2018-03-04 22:53:23 +00:00
Sam Bell f033b115d1 iFrame resizing script included in all embed widgets 2018-03-04 18:21:35 +00:00
Sam Bell 3b630d5eef iFrame resizing script for optional auto-sizing of widget 2018-03-04 18:12:52 +00:00
Sam Bell f3e6e136f2 Smaller text for tax amount 2018-03-04 17:50:37 +00:00
Sam Bell e2e54d12ff Smaller text for tax amount 2018-03-04 17:49:57 +00:00