Commit Graph

203 Commits

Author SHA1 Message Date
Hillel Coren b233aa0744 Merge branch 'release-2.6'
Conflicts:
	.travis.yml
	CONTRIBUTING.md
	README.md
	app/Http/Controllers/AccountController.php
	app/Http/Controllers/AppController.php
	app/Http/Controllers/BaseAPIController.php
	app/Http/Controllers/CreditController.php
	app/Http/Controllers/DashboardController.php
	app/Http/Controllers/DocumentController.php
	app/Http/Controllers/PaymentController.php
	app/Http/Controllers/QuoteApiController.php
	app/Http/Requests/EntityRequest.php
	app/Http/routes.php
	app/Listeners/AnalyticsListener.php
	app/Models/Account.php
	app/Models/Credit.php
	app/Models/Document.php
	app/Models/EntityModel.php
	app/Models/Expense.php
	app/Models/Invoice.php
	app/Models/Task.php
	app/Models/VendorContact.php
	app/Ninja/Notifications/PushFactory.php
	app/Ninja/Repositories/DocumentRepository.php
	app/Ninja/Repositories/ExpenseRepository.php
	app/Ninja/Repositories/InvoiceRepository.php
	app/Services/PushService.php
	composer.json
	composer.lock
	database/migrations/2014_05_17_175626_add_quotes.php
	database/seeds/UserTableSeeder.php
	resources/lang/en/texts.php
	resources/views/accounts/customize_design.blade.php
	resources/views/accounts/invoice_design.blade.php
	resources/views/accounts/management.blade.php
	resources/views/expenses/edit.blade.php
	resources/views/header.blade.php
	resources/views/invoices/edit.blade.php
	resources/views/master.blade.php
	resources/views/payments/payment.blade.php
	resources/views/users/edit.blade.php
2016-07-11 23:33:58 +03:00
Hillel Coren c8573df879 Disabled user test 2016-07-11 22:16:06 +03:00
Hillel Coren c339c66623 Fix for approving quote 2016-07-04 13:28:13 +03:00
Hillel Coren 637f298818 Fix for approving quote 2016-07-04 13:21:40 +03:00
Hillel Coren 46ad320962 Fix for go pro test 2016-06-28 21:21:01 +03:00
Hillel Coren 6836ed849b Fix for test 2016-06-21 12:31:38 +03:00
Hillel Coren b06b437e27 Fix for tests 2016-06-20 22:26:48 +03:00
Hillel Coren c5e4707ef5 Fix for tests 2016-06-09 11:27:22 +03:00
Hillel Coren ffa67cef3b Refactoring payments code... 2016-06-09 10:56:22 +03:00
Hillel Coren cc55cdc1b5 Working on tests 2016-06-07 17:29:26 +03:00
Hillel Coren 6b7542085a Working on tests 2016-06-07 17:18:52 +03:00
Hillel Coren a1f0461e02 Working on tests 2016-06-07 17:07:28 +03:00
Hillel Coren 3b9b4a049e Fix for online payment test 2016-06-06 21:59:27 +03:00
Hillel Coren 02b0840215 Fix for online payment test 2016-05-13 10:38:42 +03:00
Hillel Coren a00a86a578 Fix for travis 2016-05-05 10:23:09 +03:00
Hillel Coren 3b508f656b Fix for travis test 2016-05-05 09:35:39 +03:00
Hillel Coren db9d75ceff Changed vendorcontacts to vendor_contacts 2016-05-04 15:16:49 +03:00
Hillel Coren dfa6c518ab Fix for travis test 2016-05-03 23:15:41 +03:00
Hillel Coren 871456d402 Fix for travis test 2016-05-03 11:40:17 +03:00
Hillel Coren 0645cdddb1 Fix for travis tests 2016-05-03 09:47:47 +03:00
Hillel Coren 95fdda6e1b Fix for travis tests 2016-05-02 23:11:16 +03:00
Hillel Coren f74b30cdde Added automated tests for API 2016-05-02 22:51:22 +03:00
Hillel Coren 29a03179a9 Fix for travis tests 2016-05-02 22:34:30 +03:00
Hillel Coren 1b92f66482 Adding permissions to the API 2016-05-02 09:33:48 +03:00
Hillel Coren a9e10985a1 Fix for tests 2016-04-30 21:52:53 +03:00
Hillel Coren a24ae57b4e Fix for travis tests 2016-04-30 21:41:05 +03:00
Hillel Coren fb9a2de240 Working on TaxRates test 2016-04-15 10:25:26 +03:00
Hillel Coren 27f72a4730 Fix for tax rates test 2016-04-11 11:48:46 +03:00
Hillel Coren f32a497d0d Fix for tax rates test 2016-03-15 16:55:23 +02:00
Hillel Coren ad12557c78 Fix for tax rates test 2016-03-15 15:25:00 +02:00
Hillel Coren b076ed07ea Working on Travis tests 2016-03-15 13:50:33 +02:00
Hillel Coren 8f99fc0b87 Working on Travis tests 2016-03-15 13:13:46 +02:00
Hillel Coren 3a39da55fd Added test for quotes 2016-03-13 17:38:55 +02:00
Hillel Coren be922725cd Fix for taxes test 2016-03-09 17:02:16 +02:00
Hillel Coren bc3096f800 Fix for tax rate test 2016-03-08 23:39:05 +02:00
Hillel Coren bfe3262024 Fix for tax test 2016-03-08 22:05:56 +02:00
Hillel Coren cc03b4456c Working on tests 2016-03-02 19:23:20 +02:00
Hillel Coren 3f11969c7c Fix for tests after product_key change 2016-02-29 20:08:09 +02:00
Hillel Coren 4463030865 Added test for vendors and expenses 2016-02-26 13:36:50 +02:00
Hillel Coren ce2e8c149a Added test for vendors and expenses 2016-02-26 11:47:39 +02:00
Hillel Coren c9f38699d2 Updated Travis config 2016-02-22 21:58:16 +02:00
Hillel Coren 826d1b868b Enable auto renewing and updated Travis config 2016-02-22 21:23:15 +02:00
Hillel Coren 1cb199f491 Working on taxes test 2016-02-19 08:42:46 +02:00
Hillel Coren fed9078c42 Travis... 2016-02-18 23:05:30 +02:00
Hillel Coren fcc1d62d9b Fixing test payment in Travis 2016-02-18 16:59:50 +02:00
Hillel Coren dffe4a1b55 Working on TravisCI 2016-02-18 14:48:24 +02:00
Hillel Coren f8066492e6 Working on TravisCI 2016-02-18 13:36:47 +02:00
Hillel Coren 19a4978fe5 Working on TravisCI 2016-02-18 13:03:06 +02:00
Hillel Coren ec6922cca0 Working on TravisCI 2016-02-18 12:56:32 +02:00
Hillel Coren 73312502cc Working on TravisCI 2016-02-18 12:29:00 +02:00
Hillel Coren c834baa1b8 Working on TravisCI 2016-02-18 12:26:21 +02:00
Hillel Coren f060798721 Working on TravisCI 2016-02-18 12:11:09 +02:00
Hillel Coren 65557fc0bd Working on TravisCI 2016-02-18 11:49:07 +02:00
Hillel Coren cbbe56c38f Working on TravisCI 2016-02-18 11:30:29 +02:00
Hillel Coren 2eda30023c Working on TravisCI 2016-02-18 11:03:46 +02:00
Hillel Coren 44c638ea54 Working on TravisCI 2016-02-18 10:50:35 +02:00
Hillel Coren c3ba842273 Working on TravisCI 2016-02-18 10:10:46 +02:00
Hillel Coren 078736e9d2 Working on TravisCI 2016-02-18 10:06:06 +02:00
Hillel Coren b8417d5d36 Working on TravisCI 2016-02-18 10:02:24 +02:00
Hillel Coren 780cbbcee2 Changed dataviz to red/green 2016-02-18 09:20:53 +02:00
Hillel Coren 5c8b4f4ba3 Changed dataviz to red/green 2016-02-17 22:59:06 +02:00
Hillel Coren f5d008a607 Working on TravisCI 2016-02-17 22:08:57 +02:00
Hillel Coren 9f6aa99e86 Working on TravisCI 2016-02-17 22:02:14 +02:00
Hillel Coren 168e318a79 Working on TravisCI 2016-02-17 21:58:50 +02:00
Hillel Coren 92532c3a63 Working on TravisCI 2016-02-17 21:47:46 +02:00
Hillel Coren 21e178477c Working on TravisCI 2016-02-17 21:41:14 +02:00
Hillel Coren 1794811f9b Added two week trial for hosted pro plan 2016-02-11 17:12:27 +02:00
Hillel Coren e9cacf2fdf Added tax rates and localization to the API 2016-02-03 16:03:56 +02:00
Hillel Coren efc9ab4f9e Working on OFX support 2016-01-26 22:22:33 +02:00
Hillel Coren 79ab9f9c48 Working on acceptance test for tax rates 2016-01-18 15:11:37 +02:00
Hillel Coren cbe2b2905e Added autolink to emails and fixed checkout.com integration 2016-01-18 10:30:42 +02:00
Hillel Coren b4f05440e5 Updated version and lang files 2015-11-30 09:21:46 +02:00
Hillel Coren c6c9a34c04 Set default invoice values 2015-11-28 19:19:37 +02:00
Hillel Coren cf458c52a2 Working on the API 2015-11-27 14:55:28 +02:00
Hillel Coren 96a58ecf16 Bug fixes 2015-11-15 08:39:25 +02:00
Hillel Coren 9b840a24dd Enabled social login 2015-11-01 20:21:11 +02:00
Hillel Coren 0b2705b943 Enabled restoring deleted invoices and payments 2015-10-30 14:56:25 +02:00
Hillel Coren 404435a145 Refactored to events 2015-10-28 21:22:07 +02:00
Hillel Coren 971e538d0e Working on custom invoice numbers 2015-10-23 15:54:07 +03:00
Hillel Coren 17f853f907 Working on custom invoice numbers 2015-10-23 14:55:18 +03:00
Hillel Coren ab3de15381 Bug fixes 2015-10-21 15:40:31 +03:00
Hillel Coren 2c5667aacb Added new acceptance tests 2015-10-20 20:12:34 +03:00
Hillel Coren c24b2f352d Updated version 2015-10-16 08:32:02 +03:00
Hillel Coren 831c81a4b9 Improved settings navigation 2015-10-14 17:15:39 +03:00
Hillel Coren 2dfc053cbc Bug fixes 2015-10-13 10:11:44 +03:00
Hillel Coren 1d04bc2a05 Added custom invoice text fields 2015-10-11 17:41:09 +03:00
Hillel Coren 98cabd4138 Added auto-reminder emails 2015-09-17 22:01:06 +03:00
Hillel Coren 4741fad4be Added auto-billing and per-client language support 2015-09-10 20:50:09 +03:00
Hillel Coren 0183c02ef6 Added online payment acceptance test 2015-09-01 21:40:30 +03:00
Hillel Coren 01089d3562 Removed default test bootstrap file 2015-09-01 20:33:08 +03:00
Hillel Coren a5b7cc3e22 Update .gitignore 2015-09-01 20:31:19 +03:00
Hillel Coren ba50e701c8 Integration tests 2015-08-30 15:08:15 +03:00
Hillel Coren 95fd9a4c1c Initial acceptance tests 2015-08-20 18:09:04 +03:00
Hillel Coren 3da1e738d8 Working on tasks 2015-05-27 19:52:10 +03:00
Jeramy Simpson 04c392136e Add Files 2015-03-17 07:45:25 +10:00
root 2c696666df Initial Progress.
- Moved most files
- fixed composer dependencies
- Started fixing issues.
2015-03-12 13:39:52 +10:00
root 32e78ef3da Bring in Laravel5 framework. 2015-03-12 10:44:39 +10:00
root 872e9db581 Delete everything in prep for laravel 5. 2015-03-12 10:43:47 +10:00
Hillel Coren ccbbf6c6fa Bug fixes 2014-03-17 20:05:01 +02:00
alltheworld 12304ac9cc Codeception test:/clients/create form 2014-02-09 23:55:11 +02:00
alltheworld 7e3d202e83 Doing Phantom Js Faster
Lower Delay for PhantomJs
2014-02-09 11:51:05 +02:00
Hillel Coren 2d23bb1e3e bug fixes 2014-02-04 09:07:16 +02:00
Hillel Coren 466a026adb Added codeception 2014-02-04 00:56:23 +02:00