David Bomba
3e0b6948b5
Send down all quotes and recurring invoices in invoices GET call
2016-01-12 13:02:08 +11: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
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
e792e66aaa
merge
2016-01-09 11:13:23 +11:00
steenrabol
d89dc2e827
Expenses
2016-01-08 19:01:00 +01: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
steenrabol
a52364a039
expense
2016-01-07 12:04:01 +01:00
Hillel Coren
77f9e89b40
Added _id to header/body font properties
2016-01-07 09:19:57 +02:00
Hillel Coren
14192846e8
Merging: custom font support
2016-01-07 09:08:30 +02: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
Hillel Coren
9dc890d4f0
Include archived data when loading account data with the API
2016-01-06 19:33:34 +02:00
steenrabol
d1bef24ede
Expenses
2016-01-06 16:49:06 +01:00
steenrabol
dba3a39559
Vendor management
2016-01-06 15:23:58 +01:00
Hillel Coren
6e98e9b60d
Merge pull request #594 from joshuadwire/more-payment-terms
...
Add due date settings for recurring invoices
2016-01-06 12:07:05 +02:00
David Bomba
35027dd139
API Put Stubs
2016-01-06 15:01:52 +11:00
Hillel Coren
cd2599fe58
Fix for #597
2016-01-04 00:02:13 +02:00
Hillel Coren
0140da0ae2
Renamed client view to client portal
2016-01-03 21:10:20 +02:00
Hillel Coren
56330c1281
Merge pull request #588 from joshuadwire/custom-css
...
Add custom CSS support
2016-01-03 14:45:16 +02:00
Joshua Dwire
103bce3f48
Make recurring invoice due date settings more translatable
2016-01-01 17:37:47 -05:00
hanne@hannenijhuis.nl
e460f154a5
Bug fix typo in TaskController
2016-01-01 15:32:09 +01:00
Joshua Dwire
7e336ec118
Add due date settings for recurring invoices
...
* Specific due date settings for weekly and monthly/annual cycles
* Display scheduled due dates in editor
* English-only text
2015-12-31 23:59:02 -05:00
Hillel Coren
debc22d7d2
Bug fixes
2015-12-31 13:31:50 +02:00
Hillel Coren
565b26ba27
Bug fixes
2015-12-30 20:45:52 +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
60daef8d58
Bug fixes
2015-12-29 19:49:40 +02:00
Hillel Coren
2ead34fef0
Enabled setting reminder before/after due date or invoice date
2015-12-28 12:15:56 +02:00
Hillel Coren
9943c824dd
Bug fixes
2015-12-27 14:45:57 +02:00
Hillel Coren
8d61925e06
Merge branch 'master' of github.com:hillelcoren/invoice-ninja
2015-12-27 13:38:01 +02:00
Hillel Coren
6f2c3c76a3
Bug fixes
2015-12-27 13:37:54 +02:00
David Bomba
5b87821774
Merge remote-tracking branch 'upstream/master'
2015-12-27 22:34:16 +11:00
Hillel Coren
c493f6e49a
Working on the API
2015-12-27 13:08:58 +02:00
David Bomba
5a03b923db
Merge branch 'master' of https://github.com/turbo124/invoice-ninja
2015-12-25 11:16:11 +11:00
Hillel Coren
c0409b86fd
Added custom labels to email variables
2015-12-23 16:21:48 +02:00
Hillel Coren
3f1891fa3b
Bug fixes
2015-12-23 13:49:49 +02:00
Hillel Coren
9341ea0c87
Bug fixes
2015-12-22 14:06:53 +02:00
David Bomba
d044cffa44
Merge remote-tracking branch 'upstream/master'
2015-12-22 22:19:43 +11:00
David Bomba
087b60a503
additional GET for user_accounts
2015-12-22 22:19:21 +11:00
Hillel Coren
9603c43277
Bug fixes
2015-12-21 21:57:55 +02:00
Hillel Coren
14152fd3f1
Added HTML formatting to system emails
2015-12-17 20:03:32 +02:00
Hillel Coren
08a4c4dcb4
Added email settings page
2015-12-15 22:25:12 +02:00
Hillel Coren
e893d74b41
Added company website
2015-12-14 23:05:17 +02:00
Hillel Coren
19d5d49e63
Working on #427
2015-12-13 22:12:54 +02:00
Hillel Coren
6fc8f76ea8
Working on data import
2015-12-08 12:10:20 +02:00