Commit Graph

307 Commits

Author SHA1 Message Date
Bastien d6c7b698b2 Fr translation of pagination.php and passwords.php 2018-10-06 19:19:10 +02:00
Bastien eb7303ef29 Organiser.php: fr translation done 2018-10-06 19:11:21 +02:00
Bastien 776a7eb2a7 Order.php: fr translation done 2018-10-06 18:37:51 +02:00
Bastien 4c92ab6b9b messages.php: fr translation done 2018-10-06 18:23:13 +02:00
Bastien 7532709165 Message.php: fr translation done 2018-10-06 17:55:23 +02:00
Bastien ba489fbe7d ManageEvent.php: fr translation done 2018-10-06 15:34:13 +02:00
Bastien f9d061ce14 ManageAccount.php: fr translation done 2018-10-06 14:24:07 +02:00
taniki c754b87e40 Merge branch 'fr_translation' of github.com:etalab/Attendize into fr_translation 2018-10-05 16:31:06 +02:00
taniki 624f8b1af1 user.php 2018-10-05 16:30:40 +02:00
Bastien 481de2f817 Javascript.php: fr translation done 2018-10-05 16:17:19 +02:00
taniki 595fe9af05 widget 2018-10-05 16:13:54 +02:00
Bastien 5028247975 Installer.php: fr translation done 2018-10-05 15:50:53 +02:00
Bastien ce69463ac9 File_format.php: no translation needed 2018-10-05 15:39:05 +02:00
Bastien cbae5eef56 Fees.php: fr translation done 2018-10-05 15:38:37 +02:00
Bastien 52ff7bc1d6 Event.php: fr translation done 2018-10-05 15:36:17 +02:00
Bastien 22afb44fb6 error.php: fr translation done 2018-10-05 15:29:44 +02:00
Bastien a759fd8b38 Email.php: fr translation done 2018-10-05 15:29:01 +02:00
Bastien e3b2f7172c Design.php: fr translation done 2018-10-05 15:27:24 +02:00
Bastien cac8fcbe25 Controllers.php: fr translation finished 2018-10-05 15:25:48 +02:00
Bastien 3df6bc1aeb Start translating resources/lang/fr/Controllers.php 2018-10-01 18:53:09 +02:00
johanricher c39587c571 started translation 2018-10-01 17:01:57 +02:00
johanricher a2da46ce5a setup to start translation 2018-10-01 16:58:08 +02:00
Jeremy Quinton bdcd12ca28 Merge branch 'master' of https://github.com/Attendize/Attendize 2018-11-04 21:21:01 +02:00
Jeremy Quinton c604d08e8d Fixed license references throughout codebase 2018-11-04 21:12:11 +02:00
Jeremy Quinton d4057e9241 updated license reference 2018-11-04 21:09:26 +02:00
Jeremy Quinton 09335d7aee added image reference 2018-11-04 21:06:17 +02:00
Jeremy Quinton c3cd0a60c7 fixes #414 #450 #434 2018-11-04 21:02:41 +02:00
Jeremy Quinton 920fbac64e replace lang with trans and escape html correctly for various views 2018-11-04 20:22:51 +02:00
Jeremy Quinton 81d67e4180 updated copy in install process 2018-11-04 20:15:21 +02:00
Jeremy Quinton b257eeb3d3 Merge pull request #446 from heilgar/445-surveys-list-bug
445 fix surveys bug after updating to L5.6
2018-09-02 19:40:45 +02:00
Jeremy Quinton db148aa45d use trans instead of lang so messages display correctly with html not escaped 2018-09-02 18:09:39 +02:00
heilgar 6d9fd0ccdc 445 fix surveys bug after updating to L5.6 2018-09-02 19:01:53 +03:00
Jeremy Quinton 5f2c4c8ac9 Merge pull request #424 from Attendize/upgrade-laravel-5.6
Upgrading to Laravel 5.6
2018-08-21 12:55:31 +02:00
Jeremy Quinton 73b7808ff4 When an order is refunded display the actual refunded amount.
When viewing a refunded order display the amount_refunded instead of the order amount.
2018-08-17 17:13:57 +02:00
Mohamed Ahmed bed28ef5cb Tickets available after event started 2018-08-17 10:46:30 +02:00
Jeremy Quinton ac5ff98f61 Removed migs and coinbase as default payment gateways
Going forward Attendize will only support Stripe and Paypal as defaults. In future we will add instructions on customising Attendize with your own payment gateway.
2018-08-16 15:50:12 +02:00
Jeremy Quinton 8d51cd348f Upgrading to Laravel 5.6
1) Changed method call from lists to pluck.
2) Use set put instead of session set.
3) Removed references to artisan optimize command.
4) Added additionl check to base controller if auth user not set redirect to login.
5) Flush the session on logout.
6) Updated Event and Route service providers to work with Laravel 5.6.
7) Added new default logging config file.
8) Bump PHP versions from 7.0.30 to 7.1.20.
9) Added missing translations.
10) Fixed some issues with the templates.
2018-08-15 13:26:10 +02:00
Jeremy Quinton 9eb5d1c062 Merge pull request #423 from Attendize/fix-language-translation
fixes #415
2018-08-14 19:20:06 +02:00
Jeremy Quinton 099ab7d2ff fixes #415
fixes issue where the number of events are not displaying correctly
2018-08-14 19:16:56 +02:00
Jeremy Quinton 8498f248e8 Merge pull request #416 from scottybo/master
Fix issue with inviting attendees
2018-08-14 18:31:35 +02:00
Haroen Viaene e962c903c6 fix untranslated string
fixes #418
2018-08-14 11:22:29 +02:00
Scott Bowler 97c461cd04 Restore strings incorrectly marked as obsolete 2018-08-13 10:01:37 +01:00
Jeremy Quinton ba7ca79df0 removed unnecessary footer from ticket 2018-07-26 14:16:25 +02:00
Sam Bell 8d86ca2003 Missing div close tag added 2018-07-26 11:48:58 +01:00
Jeremy Quinton cd213b56b3 Merge branch 'master' into charge-vat-at-organiser-level 2018-07-18 19:37:56 +02:00
Jeremy Quinton ebbd4d7b4d updating extra references
1) Updated some extra references to tax amounts in the blade templates
2018-07-18 18:23:36 +02:00
Jeremy Quinton dcd47ea543 Updating template
1) Found a stray template that did not get the latest tax updates so added the standard tax logic to the template
2018-07-18 17:50:06 +02:00
Sam Bell e2aad7914b Image URL fixed 2018-07-12 13:38:43 +01:00
Jeremy Quinton 1c7c8be8f7 Finalised Charging V.A.T
1) Added Javascript partial so display and hide of the Charge Tax functionality can be shared.
2) Moved @yield head for the the master without menus layout to the correct place. Using jQuery functionality @head anywhere wouldn't work as the library was included afterwards.
3) Moved the question for organisers about Tax and the labels for tax fields to the language file.
2018-07-11 19:51:11 +02:00
Jeremy Quinton 9b5d61ffdd Added Tax to emails and various views
1) When Taxed is charged display it on the various views where tax should be displayed. Orders Listing Page, Orders Summary page.
2) Use the Order service to display correct values in emails and views.
2018-07-11 13:47:41 +02:00