Hillel Coren
|
89088e5517
|
Fix product list filter
|
2016-10-18 21:15:08 +03:00 |
|
Hillel Coren
|
147df1ef91
|
Standardize archive/deleted behaviors
|
2016-10-10 11:40:04 +03:00 |
|
Hillel Coren
|
32f341f448
|
Fix for payment refund
|
2016-10-06 08:44:19 +03:00 |
|
Hillel Coren
|
92698f5c26
|
Improve expense import
|
2016-10-05 23:56:48 +03:00 |
|
Hillel Coren
|
48d0b1b9cf
|
Improve expense import
|
2016-10-05 23:46:15 +03:00 |
|
Hillel Coren
|
a1fcc3519a
|
Support validating OAuth token
|
2016-10-05 21:51:08 +03:00 |
|
Hillel Coren
|
7bd4026e4c
|
Working on importing expenses
|
2016-10-02 10:10:28 +03:00 |
|
Hillel Coren
|
249c89dbfd
|
Added products to main navigation
|
2016-09-23 17:00:47 +03:00 |
|
Hillel Coren
|
b35c44b1e8
|
Fixes for JSON import
|
2016-08-15 21:37:47 +03:00 |
|
Hillel Coren
|
f8fda5f241
|
Working on the bot
|
2016-08-07 22:42:32 +03:00 |
|
Hillel Coren
|
8dc1786eb2
|
Fix for archiving API token
|
2016-08-02 17:38:51 +03:00 |
|
Hillel Coren
|
498578cefc
|
Rollback to 2.6.5
|
2016-07-21 15:35:23 +03:00 |
|
Hillel Coren
|
7bb8f0ca4a
|
Merge https://github.com/codedge/invoiceninja into codedge-#904-Unify-js-no-public-js
Conflicts:
app/Http/Controllers/AccountController.php
resources/lang/en/texts.php
|
2016-07-20 10:49:08 +03:00 |
|
Hillel Coren
|
0caa865f7d
|
Fix for approving quotes
|
2016-07-20 10:03:46 +03:00 |
|
Hillel Coren
|
a0817d8de3
|
Check for payment driver
|
2016-07-19 20:15:03 +03:00 |
|
Hillel Coren
|
9d4c6a12dd
|
Use credits when autobilling invoices
|
2016-07-19 20:12:28 +03:00 |
|
Hillel Coren
|
bd70b4596c
|
Add batch limits for hosted imports
|
2016-07-19 18:57:01 +03:00 |
|
Hillel Coren
|
401851e212
|
Working on buy now buttons
|
2016-07-12 23:46:41 +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
|
e6b60c6f1a
|
Working on expense categories
|
2016-07-07 11:03:43 +03:00 |
|
Hillel Coren
|
cd9aae1e22
|
Working on expense categories
|
2016-07-06 21:35:16 +03:00 |
|
Hillel Coren
|
21a91ff0e1
|
Added expense category
|
2016-07-05 21:49:47 +03:00 |
|
Hillel Coren
|
b5f606df47
|
Added and as email template variables
|
2016-07-04 21:47:05 +03:00 |
|
Hillel Coren
|
637f298818
|
Fix for approving quote
|
2016-07-04 13:21:40 +03:00 |
|
Hillel Coren
|
9dffc95eab
|
Fixes for refactor
|
2016-07-04 10:02:18 +03:00 |
|
Holger Lösken
|
0fbda85a59
|
Code Refactoring
- Removed unused uses
- Type hinting for method parameters
- Removed commented code
- Introduced comments for classes and methods
- Short array syntax
|
2016-07-03 16:19:22 +00:00 |
|
Hillel Coren
|
6ad49cf281
|
Fixing payment hooks
|
2016-06-23 16:15:52 +03:00 |
|
Hillel Coren
|
c9a19cbd76
|
Fixes for WePay
|
2016-06-21 19:10:22 +03:00 |
|
Hillel Coren
|
5ff69c6f29
|
Payments refactor
|
2016-06-20 17:14:43 +03:00 |
|
Hillel Coren
|
1e837c2368
|
Clarified/documented refund logic
|
2016-06-07 10:54:20 +03:00 |
|
Joshua Dwire
|
5eb76df20e
|
Fix refunds on Stripe
|
2016-06-05 15:06:34 -04:00 |
|
Hillel Coren
|
a7f92d0726
|
Merge pull request #901 from joshuadwire/wepay-integration
Wepay integration
|
2016-06-03 11:20:31 +03:00 |
|
Hillel Coren
|
0acf4ff1fc
|
Support importing JSON file
|
2016-06-02 22:03:59 +03:00 |
|
Joshua Dwire
|
49d47bb9e3
|
Merge remote-tracking branch 'upstream/develop' into wepay-integration
|
2016-06-01 16:46:03 -04:00 |
|
Hillel Coren
|
42ac9507e5
|
Enabled importing products
|
2016-05-31 23:15:55 +03:00 |
|
Hillel Coren
|
8df844ea26
|
Fix for quotes list action dropdown
|
2016-05-29 15:45:37 +03:00 |
|
ben
|
dadac05532
|
add support to multiple invoice types
|
2016-05-29 12:02:44 +03:00 |
|
Joshua Dwire
|
1c119fe35a
|
ACH autobill bug fixes
|
2016-05-26 15:22:09 -04:00 |
|
Joshua Dwire
|
c9f00274b1
|
Support storing WePay bank tokens
|
2016-05-25 15:04:58 -04:00 |
|
Joshua Dwire
|
d19a3715f9
|
Warn user when editing an ACH auto bill invoice
|
2016-05-25 11:07:20 -04:00 |
|
Joshua Dwire
|
9d4b42a514
|
Mention in the invoice notification that the invoice will be auto billed on the due date
|
2016-05-24 23:14:19 -04:00 |
|
Joshua Dwire
|
a5fdb88d79
|
Add support for auto bill on due date
|
2016-05-24 22:49:06 -04:00 |
|
Joshua Dwire
|
1f11d88d6b
|
Store ip addresses for payments and payment methods
|
2016-05-24 18:00:59 -04:00 |
|
Hillel Coren
|
406df6f3d8
|
Fix for payment datatable list
|
2016-05-23 21:10:40 +03:00 |
|
Hillel Coren
|
b2beb8fb73
|
Updated vendors to new datatable class
|
2016-05-23 21:07:06 +03:00 |
|
Hillel Coren
|
541b19cd5f
|
Updated vendor expenses to new datatable class
|
2016-05-23 21:03:01 +03:00 |
|
Hillel Coren
|
e7bf0599db
|
Separated out entity datatable classes
|
2016-05-23 19:52:20 +03:00 |
|
Hillel Coren
|
6caf1ff30d
|
Minor fixes
|
2016-05-19 09:47:57 +03:00 |
|
Hillel Coren
|
ef65bb7d84
|
Merge pull request #879 from joshuadwire/wepay-integration
Wepay integration - Part 3
|
2016-05-18 19:22:44 +03:00 |
|
Joshua Dwire
|
f0d276be4c
|
Listen for WePay IPNs
|
2016-05-18 09:51:20 -04:00 |
|