1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-23 01:41:34 +02:00
invoiceninja/app/Http/Controllers
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
..
Auth Code Refactoring 2016-07-03 16:19:22 +00:00
ClientAuth Code Refactoring 2016-07-03 16:19:22 +00:00
.gitkeep Add Files 2015-03-17 07:45:25 +10:00
AccountApiController.php Code Refactoring 2016-07-03 16:19:22 +00:00
AccountController.php Merge branch 'release-2.6' 2016-07-11 23:33:58 +03:00
AccountGatewayController.php Code Refactoring 2016-07-03 16:19:22 +00:00
ActivityController.php Code Refactoring 2016-07-03 16:19:22 +00:00
AppController.php Code Refactoring 2016-07-03 16:19:22 +00:00
BankAccountController.php Code Refactoring 2016-07-03 16:19:22 +00:00
BaseAPIController.php Merge branch 'release-2.6' 2016-07-11 23:33:58 +03:00
BaseController.php Code Refactoring 2016-07-03 16:19:22 +00:00
ClientApiController.php Code Refactoring 2016-07-03 16:19:22 +00:00
ClientController.php Merge pull request #946 from codedge/#942-Refactoring-dead-code-unused-uses 2016-07-04 09:38:50 +03:00
ClientPortalController.php Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-07-04 09:40:06 +03:00
Controller.php Code Refactoring 2016-07-03 16:19:22 +00:00
CreditController.php Merge branch 'release-2.6' 2016-07-11 23:33:58 +03:00
DashboardApiController.php Code Refactoring 2016-07-03 16:19:22 +00:00
DashboardController.php Code Refactoring 2016-07-03 16:19:22 +00:00
DocumentAPIController.php Code Refactoring 2016-07-03 16:19:22 +00:00
DocumentController.php Merge branch 'release-2.6' 2016-07-11 23:33:58 +03:00
ExpenseApiController.php Code Refactoring 2016-07-03 16:19:22 +00:00
ExpenseCategoryController.php Working on expense categories 2016-07-06 21:35:16 +03:00
ExpenseController.php Added support for taxes to expenses 2016-07-07 19:54:06 +03:00
ExportController.php Improved options when exporting data 2016-07-05 16:09:52 +03:00
HomeController.php Code Refactoring 2016-07-03 16:19:22 +00:00
ImportController.php Code Refactoring 2016-07-03 16:19:22 +00:00
IntegrationController.php Code Refactoring 2016-07-03 16:19:22 +00:00
InvoiceApiController.php Code Refactoring 2016-07-03 16:19:22 +00:00
InvoiceController.php Working on expense categories 2016-07-07 11:03:43 +03:00
NinjaController.php Code Refactoring 2016-07-03 16:19:22 +00:00
OnlinePaymentController.php Code Refactoring 2016-07-03 16:19:22 +00:00
PaymentApiController.php Code Refactoring 2016-07-03 16:19:22 +00:00
PaymentController.php Made 'viewable' scope default behavior 2016-07-04 19:49:01 +03:00
PaymentTermController.php Code Refactoring 2016-07-03 16:19:22 +00:00
ProductApiController.php Code Refactoring 2016-07-03 16:19:22 +00:00
ProductController.php Code Refactoring 2016-07-03 16:19:22 +00:00
QuoteApiController.php Code Refactoring 2016-07-03 16:19:22 +00:00
QuoteController.php Merge branch 'release-2.6' 2016-07-11 23:33:58 +03:00
RecurringInvoiceController.php Code Refactoring 2016-07-03 16:19:22 +00:00
ReportController.php Code Refactoring 2016-07-03 16:19:22 +00:00
TaskApiController.php Code Refactoring 2016-07-03 16:19:22 +00:00
TaskController.php Merge branch 'release-2.6' 2016-07-11 23:33:58 +03:00
TaxRateApiController.php Code Refactoring 2016-07-03 16:19:22 +00:00
TaxRateController.php Code Refactoring 2016-07-03 16:19:22 +00:00
TokenController.php Code Refactoring 2016-07-03 16:19:22 +00:00
UserApiController.php Code Refactoring 2016-07-03 16:19:22 +00:00
UserController.php Working on new hosted pricing 2016-07-11 20:08:43 +03:00
VendorApiController.php Code Refactoring 2016-07-03 16:19:22 +00:00
VendorController.php Code Refactoring 2016-07-03 16:19:22 +00:00