1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 08:51:34 +02:00
Commit Graph

2046 Commits

Author SHA1 Message Date
David Bomba
dab86580ba Merge pull request #616 from turbo124/master
Working on API
2016-01-12 20:30:32 +11:00
David Bomba
4e6d44fa87 Merge branch 'master' of https://github.com/turbo124/invoice-ninja 2016-01-12 20:28:34 +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
Hillel Coren
bdec20487a Updated version 2016-01-12 11:19:09 +02:00
Hillel Coren
b5cf87bc0d Bug fixes 2016-01-12 11:18:35 +02:00
Hillel Coren
5dbdec43f3 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-12 08:57:28 +02:00
Hillel Coren
90e7d5dafa Bug fixes 2016-01-12 08:57:19 +02:00
David Bomba
e26539b56d Merge pull request #615 from turbo124/master
Increase scope of /api/v1/invoices GET call
2016-01-12 13:05:37 +11:00
David Bomba
3e0b6948b5 Send down all quotes and recurring invoices in invoices GET call 2016-01-12 13:02:08 +11:00
David Bomba
0febd95381 Merge branch 'master' of github.com:turbo124/invoice-ninja 2016-01-12 09:50:21 +11:00
David Bomba
2a23e16bd5 Merge remote-tracking branch 'upstream/master' 2016-01-12 07:42:39 +11:00
steenrabol
172c1a0548 update 2016-01-11 20:56:12 +01:00
steenrabol
bcffedcbd3 update from master 2016-01-11 20:41:02 +01: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
f90c759078 Expense module 2016-01-11 20:20:42 +01:00
Hillel Coren
cf24684adb Check user is pro to use custom fonts 2016-01-11 14:50:17 +02:00
Hillel Coren
904627e5b4 Use buttons by default in styled emails 2016-01-11 14:40:48 +02:00
Hillel Coren
61f3bedc48 Added check for mail config settings 2016-01-11 13:07:41 +02:00
Hillel Coren
26e1a0df8d Added license for UKai font 2016-01-11 12:30:02 +02:00
David Bomba
a76e908fa8 Merge branch 'master' of https://github.com/turbo124/invoice-ninja 2016-01-11 19:53:09 +11:00
David Bomba
d9bbafa3ca Merge remote-tracking branch 'upstream/master' 2016-01-11 19:52:46 +11:00
David Bomba
2d2b2fbbe4 Merge remote-tracking branch 'upstream/master' 2016-01-11 07:39:04 +11:00
Hillel Coren
d72ff27e62 Improved invoice design form layout 2016-01-10 20:40:04 +02:00
Hillel Coren
9436f5a51e Fixed issue where a tab on the client page can be blank on page load 2016-01-10 20:25:15 +02:00
Hillel Coren
5fbe59fa8b Auto-set last used design as account default for non pro 2016-01-10 20:17:55 +02:00
Hillel Coren
36859c8262 Only show header on the first page of the PDF 2016-01-10 16:31:56 +02:00
Hillel Coren
08fd14a4c1 Added a 'Live Preview' option when using a large font 2016-01-10 16:22:40 +02:00
Hillel Coren
c6ff456d4d Fixes #608 2016-01-10 14:37:23 +02:00
steenrabol
3e9e28f06f Expense module 2016-01-10 11:25:05 +01:00
steenrabol
d8cb1b436d Expense module 2016-01-09 09:08:24 +01:00
steenrabol
d0bfe82512 Expense module 2016-01-09 06:24:43 +01:00
David Bomba
3b348380f9 Merge remote-tracking branch 'upstream/master' 2016-01-09 11:14:29 +11:00
David Bomba
730b60809b Merge branch 'master' of https://github.com/turbo124/invoice-ninja 2016-01-09 11:14:09 +11:00
David Bomba
e792e66aaa merge 2016-01-09 11:13:23 +11:00
steenrabol
d89dc2e827 Expenses 2016-01-08 19:01:00 +01:00
David Bomba
dd1fb28cc6 Merge pull request #607 from turbo124/master
Bug Fixes
2016-01-08 10:05:38 +11:00
David Bomba
9050c8790e Bug Fixes 2016-01-08 09:56:06 +11:00
Hillel Coren
56d4aaef66 Added support for Chinese 2016-01-08 00:19:44 +02:00
steenrabol
d8a501ed95 Posibility to modify payment terms 2016-01-07 20:39:51 +01:00
steenrabol
eed8ee55a1 Vendor 2016-01-07 16:21:13 +01:00
steenrabol
17af1e2b9c Expenses 2016-01-07 16:14:11 +01:00
Hillel Coren
acbfa46062 Bug fix 2016-01-07 13:16:12 +02:00
Hillel Coren
2dc3ce9128 Added early_access field 2016-01-07 13:11:09 +02:00
Hillel Coren
ecaf31ec95 Added early_access field 2016-01-07 13:09:21 +02:00
steenrabol
4a0a9a3c99 expense 2016-01-07 12:08:20 +01:00
steenrabol
a52364a039 expense 2016-01-07 12:04:01 +01:00
steenrabol
45ba7ffc3b test 2016-01-07 09:11:18 +01:00
Hillel Coren
4549643fdc Bug fix 2016-01-07 09:40:46 +02:00
Hillel Coren
ecad65c088 Corrected custom font field labels 2016-01-07 09:34:26 +02:00
Hillel Coren
77f9e89b40 Added _id to header/body font properties 2016-01-07 09:19:57 +02:00