1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-13 22:54:25 +01:00
Commit Graph

191 Commits

Author SHA1 Message Date
Hillel Coren
441f4aa667 Added public notes field to credits 2017-03-30 11:46:52 +03:00
Hillel Coren
cc63385e14 Added per client invoice counter #1344 2017-03-29 11:46:52 +03:00
Hillel Coren
ec613b1d90 Working on tests 2017-03-26 12:55:47 +03:00
Hillel Coren
5f9ffee8ea Fix to save invoice_item_type_id value 2017-03-26 10:54:04 +03:00
Hillel Coren
0d80ebdbbf Changed gateway_fee_location to gateway_fee_enabled 2017-03-26 10:37:32 +03:00
Hillel Coren
1df20adca4 Support reseting counters 2017-03-23 11:39:44 +02:00
Hillel Coren
1f01c006eb Support importing settings 2017-03-22 11:50:55 +02:00
Louis-Rémi Babé
79702cbf90 Fix header name for API token 2017-03-17 10:28:46 +01:00
Louis-Rémi Babé
9f1df5e924 Fix remaining swagger docs errors
+ Take @hillelcoren remarks into account
2017-03-09 11:11:45 +01:00
Louis-Rémi Babé
e16e730138 Implement missing resources methods
+ Fix Swagger doc
2017-03-08 17:15:30 +01:00
Hillel Coren
c0fbaf1e89 php-cs-fixer cleanup 2017-01-30 21:40:43 +02:00
Hillel Coren
1eb83a2642 php-cs-fixer clean up 2017-01-30 18:05:31 +02:00
David Bomba
75247248e4 Update AccountTransformer.php
Missing attribute
2017-01-17 08:07:25 +11:00
Hillel Coren
0f20fcc497 Fix for transformer timestamp 2017-01-08 12:31:32 +02:00
Hillel Coren
c4cdc45a93 Add inclusive tax rates #552 2017-01-02 13:38:58 +02:00
Hillel Coren
75900c296e Improved Swagger annotations 2016-12-29 18:17:17 +02:00
David Bomba
f88aa8f8e3 fix for non boolean output (#1201) 2016-12-18 14:17:20 +11:00
Hillel Coren
a0481310a3 Hide draft invoices from the client portal 2016-12-04 23:51:18 +02:00
Hillel Coren
bbbf1237c5 Added task projects 2016-11-29 19:47:26 +02:00
Hillel Coren
de2825750d Add eager loading to API tasks 2016-11-16 13:12:10 +02:00
Hillel Coren
a70380dd88 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-11-14 15:13:58 +02:00
David Bomba
b7a5ae6059 Handle null invoice object in task (#1153) 2016-11-14 21:25:16 +11:00
David Bomba
fa39434ac9 Tasks via API (#1152)
* revert error reporting

* Add Task attributes
2016-11-14 20:43:10 +11:00
Hillel Coren
94890af980 Updated readme 2016-11-13 23:47:51 +02:00
David Bomba
147a1b1a94 Add in additional fields for activities transformer (#1129)
* Expense categories

* add dependencies

* expense categories

* expense categories

* expense categories

* Change expense categories into a resource route

* add expenses, contacts, tasks and is_system to activity transformer
2016-10-29 18:48:58 +11:00
Hillel Coren
5b80e32fa7 Add ability to enable\disable modules 2016-10-27 11:57:51 +03:00
David Bomba
0bef2a0d1a Changed object back to 2016-10-26 12:01:36 +11:00
Hillel Coren
4320a72692 Add company plan to user account API response 2016-10-21 14:29:01 +03:00
David Bomba
c50f1a8f37 Added missing fields 2016-10-19 12:59:01 +11:00
Hillel Coren
767d4d148a Fix for null reference 2016-09-19 10:04:30 +03:00
David Bomba
05340d3e4a Add updated_at into Activity Transformer 2016-08-17 18:56:31 +10:00
Hillel Coren
ad5b185c7c Add key for activities 2016-08-17 10:55:50 +03:00
Hillel Coren
2ebd40f46e Added activities to API dashboard data 2016-08-15 16:43:26 +03:00
Hillel Coren
472ba842eb Working on the bot 2016-08-08 17:45:37 +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
e7c8ca50db API optimization 2016-07-19 10:07:56 +03:00
David Bomba
20c9d661ac Merge pull request #985 from turbo124/develop
Fix typo
2016-07-16 07:52:58 +10:00
David Bomba
cfb32f244a Fix typo 2016-07-16 07:52:00 +10:00
Hillel Coren
36e50e7bcb Fixes for the API 2016-07-15 16:47:18 +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
cd9aae1e22 Working on expense categories 2016-07-06 21:35:16 +03:00
Hillel Coren
251438dc41 Fix for expenseCategories 2016-07-04 20:19:22 +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
e36d23fcdc API changes for Zapier 2016-06-23 12:39:07 +03:00
Hillel Coren
725522ea21 API changes for Zapier 2016-06-23 12:38:06 +03:00
David Bomba
e540e98c80 Add company logo_url to UserAccount Transformer 2016-06-21 19:50:26 +10:00
David Bomba
851b3e963c Add company logo to UserAccount Transformer 2016-06-21 19:21:50 +10:00
David Bomba
5fdfa8c466 Add logo into Transformer 2016-06-18 17:56:09 +10:00
David Bomba
abafc4ce6f typo 2016-06-13 20:29:43 +10:00
David Bomba
fedbd74319 Integrating Expense categories into API 2016-06-13 20:18:30 +10:00
David Bomba
7237f25cba Expense Category Transformer 2016-06-13 20:05:28 +10:00
Hillel Coren
80202b6d92 Added support for searching by invoice number in the API 2016-06-06 19:04:57 +03:00
Hillel Coren
d032ae00fc Added support for searching by invoice number in the API 2016-06-06 19:04:24 +03:00
David Bomba
8b781746fe Update DocumentTransformer.php 2016-06-01 21:36:27 +10:00
David Bomba
7073343756 Update DocumentTransformer.php 2016-06-01 21:35:53 +10:00
Hillel Coren
59d0a1cb80 Fix to support mobile app 2016-05-29 14:22:25 +03:00
ben
dadac05532 add support to multiple invoice types 2016-05-29 12:02:44 +03:00
Hillel Coren
4aa11be28f Added user permission to tranformer 2016-05-22 22:02:42 +03:00
David Bomba
2034c11795 Include Documents in Invoice transformer 2016-05-19 09:43:03 +10:00
David Bomba
050b79cc75 user transformer - add fields 2016-05-10 09:26:44 +10:00
David Bomba
dbdd1ac155 working with permissions 2016-05-09 10:28:47 +10:00
David Bomba
5233047ab1 working with permissions 2016-05-09 10:09:51 +10:00
David Bomba
985c4eda34 working with permissions 2016-05-09 10:02:15 +10:00
David Bomba
f6abdedfac User Transformer permissions 2016-05-09 09:54:40 +10:00
Hillel Coren
89b5d73615 Fix for loading tokens 2016-05-08 10:05:16 +03:00
Hillel Coren
db9d75ceff Changed vendorcontacts to vendor_contacts 2016-05-04 15:16:49 +03:00
Hillel Coren
9ebb539cce API optimizations 2016-05-04 14:53:27 +03:00
Hillel Coren
2fcb1d66a5 Fix for travis tests 2016-05-04 09:53:43 +03:00
Hillel Coren
2d878b6480 API optimizations 2016-05-03 23:02:29 +03:00
Hillel Coren
c0a5084282 Added details to cybersource error 2016-05-03 19:06:38 +03:00
Hillel Coren
be420ad1fc API optimizations 2016-05-03 11:39:10 +03:00
Hillel Coren
6cd4ff025e API optimizations 2016-05-03 09:46:24 +03:00
Hillel Coren
325cac1603 Added DocumentTransformer 2016-05-02 20:02:15 +03:00
David Bomba
043e4ce729 Minor fix to invoice item transformer 2016-04-08 21:25:06 +10:00
David Bomba
e1b829c04b Bug fixes on invoice transformer 2016-04-04 20:10:00 +10:00
Hillel Coren
be9e7beaed Support for multiple tax rates 2016-03-31 12:29:01 +03:00
David Bomba
f323c8e06e user transformer fields 2016-02-26 18:48:06 +11:00
David Bomba
992802c164 Working on API functionality 2016-02-17 21:50:52 +11:00
David Bomba
6d09bda646 Working on API functionality 2016-02-17 21:16:13 +11:00
David Bomba
aef4658873 Api work/Bug fixes 2016-02-17 19:10:33 +11:00
David Bomba
f959164f2a Expense and Vendor Transformers for API 2016-02-17 14:32:20 +11:00
Hillel Coren
049c20f062 Zapier improvements 2016-02-16 17:30:09 +02:00
Hillel Coren
3520c0fa79 Added custom invoice text fields to transformer 2016-02-15 19:39:26 +02:00
Hillel Coren
88b9046ac7 Added users to the API 2016-02-04 22:35:28 +02:00
David Bomba
ead2b335d5 Added Credit Transformer 2016-02-03 14:21:13 +11:00
David Bomba
31b026d08f Added Archive Product via API 2016-02-01 13:32:12 +11:00
David Bomba
32acb8b86a Add send_invoice boolean in contact transformer 2016-01-29 10:08:11 +11:00
David Bomba
8d6b4af8ba Added quote_invoice_id to Invoice transformer 2016-01-28 09:19:54 +11:00
David Bomba
f80e738882 Bug Fix in taxrate transformer 2016-01-26 22:47:19 +11:00
Laurynas Sakalauskas
cfe1836770 Added invitation transformer 2016-01-24 18:55:36 +00:00
Laurynas Sakalauskas
91d44dd301 Add ability to include invoice invitations via API 2016-01-24 18:37:24 +00:00
Hillel Coren
dff7ad91c8 Merge: Bugfixed version of Vendor / Expense module (#635) 2016-01-21 00:09:10 +02:00
David Bomba
6c4fe3f613 Revert "Working on API" 2016-01-12 21:17:08 +11:00
David Bomba
2b784ee85d If no invoice_number is set from API, automatically generate invoice_number 2016-01-12 20:28:20 +11:00
steenrabol
6133c6ff07 Merge branch 'master' of https://github.com/invoiceninja/invoiceninja
# Conflicts:
#	app/Http/Controllers/InvoiceController.php
#	resources/lang/en/texts.php
#	resources/views/invoices/edit.blade.php
2016-01-11 20:39:18 +01:00
steenrabol
3e9e28f06f Expense module 2016-01-10 11:25:05 +01:00
steenrabol
eed8ee55a1 Vendor 2016-01-07 16:21:13 +01:00
Hillel Coren
7beeb78126 Enabled updating/archiving invoice through the API 2016-01-06 22:46:11 +02:00
steenrabol
48ce3f64e6 expenses 2016-01-06 20:52:09 +01:00