Hillel Coren
632f4058d8
Merge fix for #970
2016-07-28 12:19:36 +03:00
Hillel Coren
a82739de70
Moved faker from require-dev
2016-07-26 09:59:53 +03:00
Hillel Coren
c9ea294d80
Added barryvdh/laravel-debugbar back to require
2016-07-24 13:42:51 +03:00
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
81898338e0
Added back laravelcollective/bus to support maatwebsite/excel
2016-07-05 16:02:28 +03:00
Hillel Coren
4d9927d856
Update dependencies\add back dbal to support change() in migrations
2016-07-04 12:23:13 +03:00
Holger Lösken
f255bb5444
Remove unused packages from composer.json
...
- Fix #941 , resolve #941
- Remove unused packages from composer.json
- Update composer.lock
2016-07-02 22:01:12 +02:00
Holger Lösken
9e18ecec8e
Move Faker to require-dev section
...
- Fixes #940 and resolves #940
- Move Faker to dev section of composer.json
2016-07-02 21:31:51 +02:00
Holger Lösken
65daa6a5a7
Fix #933
2016-06-30 17:33:31 +00:00
Joshua Dwire
3835c62b0d
Fix composer.json
2016-05-17 15:08:08 -04:00
Joshua Dwire
4f3bb7eeb4
Merge remote-tracking branch 'upstream/develop' into wepay-integration
2016-05-17 15:07:53 -04:00
Joshua Dwire
43fade2339
Support app fees and Canadian users
2016-05-17 11:32:17 -04:00
Hillel Coren
88ffc4f08c
Added support for GAE filesystem
2016-05-17 11:49:18 +03:00
Hillel Coren
74343b710e
Added support for GAE filesystem
2016-05-17 11:45:14 +03:00
Joshua Dwire
88c9fc1ac1
Add WePay configuration UI
2016-05-11 22:55:37 -04:00
Joshua Dwire
c536bd8569
Add basic ACH support
2016-04-29 17:50:21 -04:00
Joshua Dwire
fe2a1fe66a
Add Braintree support
2016-04-26 19:59:52 -04:00
Joshua Dwire
42c1f537bc
Store/display credit card type, expiration and last 4 digits
2016-04-23 22:10:51 -04:00
Hillel Coren
4a8c02d5fd
Updated Omnipay
2016-04-18 12:58:21 +03:00
Hillel Coren
35cf9c61cf
Clean up white space
2016-04-10 15:51:53 +03:00
Hillel Coren
9aeea2f93a
Updated postmark driver for Laravel 5.2
2016-04-08 12:04:35 +03:00
Hillel Coren
be9e7beaed
Support for multiple tax rates
2016-03-31 12:29:01 +03:00
Joshua Dwire
e6056104bd
Display documents and zip download on client invoice page
2016-03-23 22:41:19 -04:00
Joshua Dwire
d810ba7f6b
Improved document support
2016-03-23 15:41:05 -04:00
Hillel Coren
aef4c6be98
Upgrade to Laravel 5.2
2016-03-02 15:36:42 +02:00
Hillel Coren
10dc9a3da1
Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop
...
Conflicts:
composer.lock
2016-03-01 10:52:14 +02:00
Hillel Coren
b2d9ac0468
Removed Neteller driver
2016-03-01 10:23:58 +02:00
David Bomba
50ddbcf609
iOS Push Notifications
2016-02-29 21:31:58 +11:00
Hillel Coren
105321bdbb
Upgraded to Laravel 5.1
2016-02-22 19:47:19 +02:00
Hillel Coren
65557fc0bd
Working on TravisCI
2016-02-18 11:49:07 +02:00
Hillel Coren
0380b951a5
Working on TravisCI
2016-02-17 20:25:20 +02:00
Hillel Coren
e11934a3b9
Working on TravisCI
2016-02-17 19:42:16 +02:00
Hillel Coren
b9cb5a92a8
Working on TravisCI
2016-02-17 19:16:29 +02:00
Hillel Coren
96479871bc
Working on TravisCI
2016-02-17 19:14:06 +02:00
Hillel Coren
8b81a40e06
Working on TravisCI - updated composer.json
2016-02-17 18:33:22 +02:00
Hillel Coren
922353107a
Working on TravisCI - updated composer.json
2016-02-17 18:32:43 +02:00
Hillel Coren
b5bb8d5011
Working on TravisCI - updated composer.json
2016-02-17 18:10:50 +02:00
Hillel Coren
66f2df132d
Working on TravisCI
2016-02-17 18:07:39 +02:00
Hillel Coren
efc9ab4f9e
Working on OFX support
2016-01-26 22:22:33 +02:00
Hillel Coren
dff7ad91c8
Merge: Bugfixed version of Vendor / Expense module ( #635 )
2016-01-21 00:09:10 +02:00
Hillel Coren
9287118cd0
Merging: Bugfixed version of Vendor / Expense module #635
2016-01-20 16:06:17 +02:00
Hillel Coren
bf778aa616
Initial work on OFX support
2016-01-20 01:07:31 +02:00
steenrabol
e7a658aaf6
Expenses bug fix
2016-01-19 14:01:19 +01:00
Hillel Coren
3d790d29a1
Update gocardless omnipay version #630
2016-01-18 20:23:26 +02:00
Hillel Coren
cbe2b2905e
Added autolink to emails and fixed checkout.com integration
2016-01-18 10:30:42 +02:00
Joshua Dwire
b7687967a6
Add custom CSS support
...
* Allow custom CSS for self-hosted white-label users or Pro
invoiceninja.com users
* Restrictive sanitization for CSS on invoiceninja.com
* Add .body class to body element to allow styling the body
* Add client_view_css column to accounts table
* English-only translation text
2015-12-30 13:11:51 -05:00
Hillel Coren
bb04eba0fe
Updated libraries
2015-12-29 13:54:47 +02:00
Maxim
5dbdd8a6ff
Fixed composer.json code style
2015-12-10 23:53:25 +07:00
Hillel Coren
cf458c52a2
Working on the API
2015-11-27 14:55:28 +02:00
Hillel Coren
f574a79fe6
Improved data export
2015-11-12 22:36:28 +02:00
