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

..

_bootstrap.php

Initial acceptance tests

2015-08-20 18:09:04 +03:00

AllPagesCept.php

Disabled user test

2016-07-11 22:16:06 +03:00

APICest.php

Changed vendorcontacts to vendor_contacts

2016-05-04 15:16:49 +03:00

CheckBalanceCest.php

Working on tests

2016-06-07 17:29:26 +03:00

ClientCest.php

Working on TravisCI

2016-02-18 14:48:24 +02:00

CreditCest.php

Working on TravisCI

2016-02-18 14:48:24 +02:00

ExpenseCest.php

Fix for travis test

2016-05-03 23:15:41 +03:00

GoProCest.php

Fix for go pro test

2016-06-28 21:21:01 +03:00

InvoiceCest.php

Fix for travis tests

2016-04-30 21:41:05 +03:00

InvoiceDesignCest.php

Working on TravisCI

2016-02-18 14:48:24 +02:00

OnlinePaymentCest.php

Fix for test

2016-06-21 12:31:38 +03:00

PaymentCest.php

Fix for tests after product_key change

2016-02-29 20:08:09 +02:00

QuoteCest.php

Added test for quotes

2016-03-13 17:38:55 +02:00

TaskCest.php

Working on TravisCI

2016-02-18 14:48:24 +02:00

TaxRatesCest.php

Fix for travis test

2016-05-05 09:35:39 +03:00