1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 20:22:42 +01:00
Commit Graph

238 Commits

Author SHA1 Message Date
Hillel Coren
f9fef333ec Support refunding manual payment 2017-01-16 14:51:43 +02:00
Hillel Coren
00ae1d4a1c Support entering payment for draft invoice 2017-01-13 13:53:06 +02:00
Hillel Coren
511375ba45 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2017-01-10 12:25:35 +02:00
Hillel Coren
91e3f5d7b9 Check for duplicates in the JSON import 2017-01-10 10:50:17 +02:00
David Bomba
6a41353a96 Firebase notifications for Android (#1269)
* revert error reporting

* fix for non boolean output

* Firebase notifications for Android
2017-01-10 14:35:30 +11:00
Hillel Coren
7711d0a456 Skip blank rows in CSV import 2017-01-08 16:13:23 +02:00
Hillel Coren
7b92eb62fe Improve export CSV import 2017-01-08 16:02:52 +02:00
Hillel Coren
4596ce4095 Support importing exported files 2017-01-08 14:19:40 +02:00
Hillel Coren
86af13f924 Fix for direct payment links 2017-01-08 13:51:53 +02:00
Hillel Coren
7a58108cd0 Refactored number genrating code 2017-01-04 10:11:32 +02:00
Hillel Coren
1a27e28ff5 Support importing products using JSON 2016-12-25 12:32:11 +02:00
Hillel Coren
67b7d6ff21 Make sure invoice is emailed if auto-billing fails 2016-12-22 19:42:21 +02:00
Hillel Coren
92a60221a5 Adjustments to task projects 2016-12-15 15:11:04 +02:00
Hillel Coren
d1f496023b Adjustments to task projects 2016-12-15 14:17:10 +02:00
Hillel Coren
338f3f0c7f CRUD 2016-12-09 13:17:04 +02:00
Hillel Coren
ad07599e92 Hide draft invoices from the client portal 2016-12-05 00:35:08 +02:00
Hillel Coren
8d8156f580 Hide draft invoices from the client portal 2016-12-04 23:26:38 +02:00
Hillel Coren
55340b8d13 Support editing credits 2016-11-30 20:21:50 +02:00
Hillel Coren
0731165d8f Fix for payment buttons in HTML emails 2016-11-29 20:21:17 +02:00
Hillel Coren
bbbf1237c5 Added task projects 2016-11-29 19:47:26 +02:00
Hillel Coren
408aede80a Fix for JSON payment import 2016-11-28 10:55:00 +02:00
Hillel Coren
12fd825de5 Working on datatables on vendor page 2016-11-25 16:02:39 +02:00
Hillel Coren
1323f21867 Working on datatables on client page 2016-11-25 12:53:35 +02:00
Hillel Coren
8bac6b6c27 Working on adding bulk actions to client page 2016-11-24 11:22:37 +02:00
Hillel Coren
b39f2f4ba5 Ensure invoice always has an invitation 2016-10-31 09:06:55 +02:00
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