Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Code Issues Releases Activity
2,139 Commits 7 Branches 917 Tags 2 GiB
1284c29534
Commit Graph

1410 Commits

Author SHA1 Message Date
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
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
d72ff27e62 Improved invoice design form layout 2016-01-10 20:40:04 +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
08fd14a4c1 Added a 'Live Preview' option when using a large font 2016-01-10 16:22:40 +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
steenrabol
d89dc2e827 Expenses 2016-01-08 19:01:00 +01:00
David Bomba
9050c8790e Bug Fixes 2016-01-08 09:56:06 +11: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
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
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
Hillel Coren
c91b15590c Fixes #601 2016-01-06 09:55:36 +02:00
Hillel Coren
e3e497bb8c Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-06 09:52:33 +02:00
Hillel Coren
18155a9482 Working on data import tranformers 2016-01-06 09:52:26 +02:00
David Bomba
35027dd139 API Put Stubs 2016-01-06 15:01:52 +11:00
David Bomba
f66539b0da Integrate Payments into API 2016-01-05 23:51:27 +11:00
steenrabol
d3ee8ed813 Expense module 2016-01-05 12:47:03 +01: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
Hillel Coren
598a112101 Fixes #595 2016-01-02 22:37:45 +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
Hillel Coren
139088086f Fixed problem with empty fields in CSV import 2016-01-01 10:34:32 +02: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
06c1534093 Added getString helper to CSV import 2015-12-31 17:09:45 +02:00
Hillel Coren
2144870b96 Removed getInvoiceId from non-Wave transformers 2015-12-31 16:14:30 +02:00
Hillel Coren
e5ca3973d8 Revert "Revert "Re-revert "Improve Import Support"""" 2015-12-31 16:11:44 +02:00
Hillel Coren
f5530a30b2 Revert "Re-revert "Improve Import Support""" 2015-12-31 15:36:53 +02:00
Hillel Coren
e60c52e93c Revert "Revert "Improve Import Support"" 2015-12-31 15:06:30 +02:00
Hillel Coren
fc0313bade Revert "Improve Import Support" 2015-12-31 13:46:56 +02:00
Hillel Coren
7e325662bf Merge pull request #586 from joshuadwire/wave-invoice-import 
Improve Import Support
 2015-12-31 13:39:54 +02:00
Hillel Coren
debc22d7d2 Bug fixes 2015-12-31 13:31:50 +02:00
Hillel Coren
35bb36fd34 Bug fixes 2015-12-31 12:23:39 +02:00
Hillel Coren
c2c51360dd Fixes for #584 2015-12-31 10:04:12 +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
Joshua Dwire
6af5084e0a Finish import changes 2015-12-30 09:42:41 -05:00
Joshua Dwire
5932a837dd Improve Import Support 
* Add support for payment imports
* Add support for Wave Invoice import
* Add ability to merge invoice line items into a single invoice
 2015-12-30 00:14:14 -05:00
Hillel Coren
60daef8d58 Bug fixes 2015-12-29 19:49:40 +02:00
Hillel Coren
d1de95303b Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-12-28 12:16:03 +02:00
Hillel Coren
2ead34fef0 Enabled setting reminder before/after due date or invoice date 2015-12-28 12:15:56 +02:00
David Bomba
4bcf8c1922 date formatting products 2015-12-28 20:14:21 +11: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
Hillel Coren
ddd5915ca1 git update 2015-12-27 09:36:22 +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
991b19b2a2 Bug fixes 2015-12-24 13:17:11 +02: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
8739a1b46b Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-12-21 21:58:02 +02:00
Hillel Coren
9603c43277 Bug fixes 2015-12-21 21:57:55 +02:00
David Bomba
68ee5d04a4 Tax Rate Transformer added 2015-12-21 18:36:29 +11:00
David Bomba
083e995e2b Working on API Transformers 2015-12-20 08:30:06 +11:00
David Bomba
79bef21e82 Added currency_id to client transformer 2015-12-18 19:33:14 +11:00
Hillel Coren
14152fd3f1 Added HTML formatting to system emails 2015-12-17 20:03:32 +02:00
Hillel Coren
b57866456c Bug fixes 2015-12-17 10:21:31 +02:00
Hillel Coren
c854f6ba16 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-12-17 10:20:02 +02:00
Hillel Coren
372ffb0ea9 Bug fixes 2015-12-17 10:19:56 +02:00
David Bomba
75fa8566c3 custom taxes boolean added to transformer 2015-12-17 13:33:40 +11:00
Hillel Coren
4dc7a8d5f1 Working on email markup 2015-12-16 13:49:26 +02:00
Hillel Coren
f4863d3ec0 Added email settings page 2015-12-15 23:06:42 +02:00
Hillel Coren
399ad76fc3 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-12-15 22:25:19 +02:00
Hillel Coren
08a4c4dcb4 Added email settings page 2015-12-15 22:25:12 +02:00
David Bomba
bc41eb0c42 Working on API 2015-12-15 22:03:01 +11:00
Hillel Coren
e893d74b41 Added company website 2015-12-14 23:05:17 +02:00
Hillel Coren
c5c5ff3458 Working on data import 2015-12-14 22:07:48 +02:00
Hillel Coren
5547f222e1 Added warning for token mismatch error 2015-12-13 23:22:06 +02:00
Hillel Coren
19d5d49e63 Working on #427 2015-12-13 22:12:54 +02:00
Hillel Coren
4b328acc67 Working on #427 2015-12-10 21:36:34 +02:00
Hillel Coren
1783cb5129 Working on data import 2015-12-10 15:35:40 +02:00
Hillel Coren
ff139bc09c Working on data import 2015-12-10 12:57:51 +02:00
Hillel Coren
d98a185c04 Fix for #557 2015-12-09 18:08:24 +02:00
Hillel Coren
3a5f2ebaf7 Fix for #557 2015-12-09 17:54:24 +02:00
Hillel Coren
0aca2e7fb4 Added check for account data 2015-12-09 17:47:14 +02:00
Hillel Coren
6fc8f76ea8 Working on data import 2015-12-08 12:10:20 +02:00
Hillel Coren
e46d804cd7 Working on importing data from more providers 2015-12-07 23:41:48 +02:00
Hillel Coren
f600cbb6dd Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-12-07 15:35:02 +02:00
Hillel Coren
1a474f362f Added support for country specific Euro formatting 2015-12-07 15:34:55 +02:00
David Bomba
def729bfac Added additional fields to invoice transformer 2015-12-04 10:02:31 +11:00
David Bomba
7182078acb Added additional fields to transformer 2015-12-04 10:00:39 +11:00
Hillel Coren
19ce3e3063 Add settings help texts 2015-12-03 17:35:41 +02:00
Hillel Coren
c5a1abf66f Added HTML email designs 2015-12-02 15:26:06 +02:00
rafael.sisweb
c182b67408 Remove action header again 2015-11-30 06:29:43 -05:00
Hillel Coren
b4f05440e5 Updated version and lang files 2015-11-30 09:21:46 +02:00
Hillel Coren
165ecd0bf0 Added support for Stripe.js 2015-11-29 22:13:50 +02:00
Hillel Coren
30631b2bc4 Optimized client view page 2015-11-29 18:00:50 +02:00
Hillel Coren
44336fd7c4 Bug fixes 2015-11-29 12:58:40 +02:00
Hillel Coren
72d906d6d2 Auto increment invoice number counter 2015-11-29 12:41:32 +02:00
Hillel Coren
68bb3c8a82 Added .env field for MySQL strict mode 2015-11-29 12:12:59 +02:00
Hillel Coren
64fec3b502 Updated to phantomjscloud v2 API 2015-11-28 22:00:24 +02:00
Hillel Coren
c6c9a34c04 Set default invoice values 2015-11-28 19:19:37 +02:00
Hillel Coren
cf458c52a2 Working on the API 2015-11-27 14:55:28 +02:00
Hillel Coren
1497b99b36 Update client API controller to use transformations 2015-11-25 13:44:43 +02:00
Hillel Coren
1a37a197a5 Working on CSV import 2015-11-25 11:35:24 +02:00
Hillel Coren
a324434375 Working on invoice CSV import 2015-11-24 23:10:09 +02:00
Hillel Coren
dbe7de2d05 Working on invoice CSV import 2015-11-24 22:54:04 +02:00
Hillel Coren
bc14df4658 Working on invoice CSV import 2015-11-24 22:41:08 +02:00
Hillel Coren
ae57fdf9a3 Updated readme 2015-11-24 21:45:38 +02:00
rafael.sisweb
5888fdf12a Missing action header on datatables 2015-11-24 06:59:30 -05:00
Hillel Coren
681e14c63e Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-11-22 12:00:03 +02:00
Hillel Coren
5d26eadb9c Removed ENV_PRODUCTION 2015-11-22 11:59:56 +02:00
David Bomba
78c74471cd Merge pull request #546 from turbo124/master 
Additional statics included in API
 2015-11-22 08:12:10 +11:00
David Bomba
f3960d799e Additional statics included in API 2015-11-22 08:11:23 +11:00
Hillel Coren
9b0426f4ab Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-11-21 23:10:35 +02:00
Hillel Coren
61ed298699 Minor improvements 2015-11-21 23:10:26 +02:00
David Bomba
6461ff3d4f added user_id to invoicetransformer 2015-11-21 20:31:31 +11:00
David Bomba
e8239bbf37 Added InvoiceStatus to static api call 2015-11-20 08:30:30 +11:00
Hillel Coren
d35b0f7f35 Added products to the API 2015-11-19 13:50:35 +02:00
Hillel Coren
01946f7bc8 Added static data to the API 2015-11-19 13:37:30 +02:00
David Bomba
43b6e749c3 transformation of IDs to PUBLIC_IDs 2015-11-19 19:42:53 +11:00
David Bomba
f2fdb7f51c Merge pull request #535 from turbo124/master 
swapped out user_id for public_id
 2015-11-19 14:03:16 +11:00
David Bomba
2866201416 swapped out user_id for public_id 2015-11-19 13:58:40 +11:00
Hillel Coren
dede870fed Bug fixes 2015-11-19 00:02:01 +02:00
Hillel Coren
4a0906a92c Bug fixes 2015-11-18 23:37:11 +02:00
Hillel Coren
947b9690d6 Cleaning up code 2015-11-18 19:42:09 +02:00
Hillel Coren
bcad8af535 Working on import 2015-11-18 19:16:23 +02:00
Hillel Coren
73a0192446 Working on import 2015-11-18 18:08:37 +02:00
Hillel Coren
5c6b2fe906 Working on import 2015-11-18 16:40:50 +02:00
Hillel Coren
24bcb0e2e5 Merging import changes 2015-11-17 15:53:14 +02:00
Hillel Coren
9f4cd62832 Add space 2015-11-17 15:42:54 +02:00
Hillel Coren
1d82881814 Removing payments of archived/deleted invoices from the dashboard 2015-11-17 10:55:33 +02:00
Hillel Coren
b4e5690103 Fixed problem creating client with invoice in the API 2015-11-17 10:46:14 +02:00
Hillel Coren
cd3aecdf5b Clarifying email errors 2015-11-16 21:51:34 +02:00
Hillel Coren
3767a8a6a7 Bug fixes 2015-11-16 21:29:22 +02:00
Hillel Coren
eaf73077b1 Bug fixes 2015-11-16 21:21:48 +02:00