Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 15:13:29 +01:00
Code Issues Releases Activity
3,653 Commits 9 Branches 923 Tags 2 GiB
f42e8158c2
Commit Graph

781 Commits

Author SHA1 Message Date
David Bomba
aa4aae4797 Working on API 2016-03-01 21:31:23 +11:00
Hillel Coren
10dc9a3da1 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 
Conflicts:
	composer.lock
 2016-03-01 10:52:14 +02:00
Hillel Coren
3b5311e960 Added setting to show/hide client portal dashboard 2016-03-01 09:36:37 +02:00
David Bomba
6e3b1ecb4b Push Notifications 2016-03-01 15:06:54 +11:00
David Bomba
1aef96f027 Push Notifications 2016-03-01 14:44:14 +11:00
David Bomba
f1bc597034 Push Notifications 2016-03-01 13:57:59 +11:00
Joshua Dwire
6376302ed9 Add option for client portal password 2016-02-29 16:46:27 -05:00
Hillel Coren
553c548f31 Enabled setting recurring invoice number prefix 2016-02-28 20:36:11 +02:00
Hillel Coren
2153a8e227 Added custom invoice item fields 2016-02-28 13:59:52 +02:00
Hillel Coren
f2d7a01f94 Fix for report defaults 2016-02-27 23:00:27 +02:00
Hillel Coren
92e5bf60d8 Broke up seeders 2016-02-27 22:12:22 +02:00
Hillel Coren
308e5a1656 Improvements to search 2016-02-25 23:33:48 +02:00
Hillel Coren
4a749d5868 Improvements to custom designer 2016-02-25 20:34:23 +02:00
Hillel Coren
edda64bd0e Enabled all tests 2016-02-25 12:29:26 +02:00
Hillel Coren
01f9634237 Improvements to data export 2016-02-25 11:25:07 +02:00
Hillel Coren
fb959c1487 Refinements to reports 2016-02-25 10:32:31 +02:00
Hillel Coren
6cdbc15961 Implemented basic expense report 2016-02-24 23:54:56 +02:00
Hillel Coren
88fcc05902 Implemented basic expense report 2016-02-24 23:54:43 +02:00
Hillel Coren
a1d13cc84c Improvements to the tax report 2016-02-24 22:58:42 +02:00
Hillel Coren
1c864f4304 Added tax report 2016-02-23 23:32:39 +02:00
Hillel Coren
105321bdbb Upgraded to Laravel 5.1 2016-02-22 19:47:19 +02:00
Hillel Coren
6b64910c9d Prevent reloading page when showing/hiding archived 2016-02-18 20:14:48 +02:00
Hillel Coren
7e6d137504 Fixing test payment in Travis 2016-02-18 19:00:21 +02:00
Hillel Coren
5b743355fe Fixing test payment in Travis 2016-02-18 17:35:21 +02:00
Hillel Coren
f797497a8a Fix for invitations in the API 2016-02-18 15:46:44 +02:00
Hillel Coren
869febc1d3 Fix for Date in Expenses #731 2016-02-18 12:02:30 +02:00
Hillel Coren
b63f26f10b Working on TravisCI 2016-02-17 22:49:34 +02:00
Hillel Coren
ed941fef89 Enabled downloading PDF through route 2016-02-17 21:13:55 +02:00
Hillel Coren
25d2af4891 Working on download PDF route 2016-02-17 17:50:01 +02: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
a6e9c5198d Bug fixes 2016-02-17 14:46:28 +11:00
David Bomba
9428557e70 Bug Fixes 2016-02-17 14:43:25 +11:00
David Bomba
f959164f2a Expense and Vendor Transformers for API 2016-02-17 14:32:20 +11:00
David Bomba
a1be1f3529 Improving error reporting API 2016-02-17 09:45:28 +11:00
David Bomba
1fde9261e6 Improving error reporting API 2016-02-17 09:38:23 +11:00
David Bomba
170ee5a40b Improving error reporting API 2016-02-17 09:28:00 +11:00
David Bomba
31720b59fd Improving error reporting API 2016-02-17 09:12:34 +11:00
David Bomba
746b6ef362 Improving error reporting API 2016-02-17 09:09:32 +11:00
Hillel Coren
2295102b98 Adding back change from conflict 2016-02-17 00:07:05 +02:00
Hillel Coren
8735409753 Merge branch 'release-2.5.0.2' 
Conflicts:
	app/Http/Controllers/ClientApiController.php
 2016-02-17 00:03:23 +02:00
David Bomba
4a033ce925 Improving error reporting API 2016-02-17 08:57:06 +11:00
David Bomba
1ab4bb636f Improving error reporting API 2016-02-17 08:48:10 +11:00
Hillel Coren
81f08cdd17 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-02-16 17:30:30 +02:00
Hillel Coren
049c20f062 Zapier improvements 2016-02-16 17:30:09 +02:00
David Bomba
3c2b0ba45d Error handling 2016-02-16 10:30:28 +11:00
David Bomba
a295120015 Client API Error handling 2016-02-15 21:57:58 +11:00
David Bomba
f8fee3e8cd Error handling for API 2016-02-15 21:24:06 +11:00
Hillel Coren
0a2a97d89a Fixed an API issue when only setting product_key in an invoice 2016-02-11 19:24:41 +02:00
Hillel Coren
a30153cabe Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-02-11 17:12:34 +02:00
Hillel Coren
1794811f9b Added two week trial for hosted pro plan 2016-02-11 17:12:27 +02:00
David Bomba
ce58c581ef Delete Client from API 2016-02-08 15:27:42 +11:00
David Bomba
d401a6fb93 Bug in Client API not paginating all results 2016-02-08 10:37:38 +11:00
David Bomba
391d721180 Bug fixes 2016-02-07 22:30:36 +11:00
David Bomba
ccaabe2926 working on payments API 2016-02-07 22:01:39 +11:00
David Bomba
42f3cffca8 Delete a payment from the API 2016-02-07 21:24:21 +11:00
David Bomba
b3346011bc api bug fixes 2016-02-07 20:20:38 +11:00
David Bomba
7d2f635272 testing payment api 2016-02-07 19:39:51 +11:00
David Bomba
0c251392eb testing payment api 2016-02-07 19:32:43 +11:00
David Bomba
95e1baed29 testing payment api 2016-02-07 19:30:47 +11:00
David Bomba
138749ce6f update payment from API 2016-02-06 14:42:21 +11:00
Hillel Coren
88b9046ac7 Added users to the API 2016-02-04 22:35:28 +02:00
Hillel Coren
db4ec4fb62 Added statust to client view page 2016-02-04 20:36:39 +02:00
Hillel Coren
8a9eb97134 Working on enabling showing currency code 2016-02-04 16:19:49 +02:00
Hillel Coren
2b3e35687a Bug fixes 2016-02-04 16:12:22 +02:00
Hillel Coren
0ce9e426d9 Hid 'test email' button until issue updating connection info is resolved 2016-02-03 22:45:39 +02:00
Hillel Coren
a584973eea Adding https suggestion 2016-02-03 20:59:07 +02:00
Hillel Coren
e9cacf2fdf Added tax rates and localization to the API 2016-02-03 16:03:56 +02:00
Hillel Coren
021f195c45 Implemented UpdateAccountRequest 2016-02-03 14:41:40 +02:00
David Bomba
80d800fd36 Merge pull request #686 from turbo124/master 
Added Payments to API
 2016-02-03 21:08:34 +11:00
David Bomba
2c8d3e2013 Added Payments to API 2016-02-03 21:06:49 +11:00
Hillel Coren
65d3667600 Increased timeout when installing/updating 2016-02-03 10:07:44 +02:00
Hillel Coren
1284c29534 Enabled setting expense currency 2016-02-02 00:07:09 +02:00
Hillel Coren
1a2c2712d0 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-02-01 15:58:59 +02:00
Hillel Coren
523b008d01 Added support for right aligning table columns 2016-02-01 15:58:52 +02:00
David Bomba
f90adb27e3 Merge pull request #678 from turbo124/master 
Update account from API
 2016-02-01 14:44:29 +11:00
David Bomba
c0545be0d4 update account from API 2016-02-01 14:42:05 +11:00
David Bomba
eef8ad22d0 Merge pull request #677 from turbo124/master 
Archive Product via API
 2016-02-01 13:33:27 +11:00
David Bomba
31b026d08f Added Archive Product via API 2016-02-01 13:32:12 +11:00
David Bomba
9e1a7eb632 Merge pull request #676 from turbo124/master 
Remove redundant emailInvoice method
 2016-02-01 09:46:07 +11:00
David Bomba
f48ac1b6f0 remove redundant method 2016-02-01 09:45:15 +11:00
Hillel Coren
63c1293e3b Add Header/Footer options to invoice design settings 2016-01-31 23:55:02 +02:00
Hillel Coren
387f89440c Add Header/Footer options to invoice design settings 2016-01-31 23:42:20 +02:00
Hillel Coren
63eda63d9f Fix for #672 2016-01-31 17:39:31 +02:00
Hillel Coren
646c239cd8 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-31 15:10:40 +02:00
Hillel Coren
25f5cdbcdd Added check to ensure expense currency matches client\invoice currency 2016-01-31 15:10:33 +02:00
David Bomba
204748ad33 Working on products api 2016-01-30 22:29:22 +11:00
David Bomba
63894e0f24 Working on products api 2016-01-30 22:27:26 +11:00
David Bomba
b93cd84052 Working on products api 2016-01-30 22:20:09 +11:00
David Bomba
32ed23cde7 Working on products api 2016-01-30 22:18:30 +11:00
David Bomba
43c6024f0f Working on products api 2016-01-30 22:17:10 +11:00
David Bomba
1f36e175dd Working on products api 2016-01-30 22:16:25 +11:00
David Bomba
1e8a4c2b70 Working on products api 2016-01-30 21:51:52 +11:00
David Bomba
1da8f6bc26 bug fixes 2016-01-30 20:57:47 +11:00
David Bomba
cc40f51f84 working on product API 2016-01-30 20:56:27 +11:00
David Bomba
020e428677 testing email functionality: 2016-01-29 12:47:35 +11:00
Hillel Coren
e245b6f639 Updated texts file 2016-01-28 16:34:22 +02:00
Hillel Coren
89622f86e2 Fix for #661 2016-01-28 16:07:03 +02:00
Hillel Coren
9d3d58def1 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-28 14:05:01 +02:00
Hillel Coren
1ac12e1506 Added basic stats for resellers 2016-01-28 14:04:55 +02:00
David Bomba
cae3b48cd4 Restore Invoice from API 2016-01-28 13:31:19 +11:00
David Bomba
165a382637 Restore an invoice from the API 2016-01-28 12:55:15 +11:00
Hillel Coren
bdeb062657 Refining how expenses convert to products 2016-01-27 22:38:21 +02:00
Hillel Coren
a7f2d3354c Resolved issue with expenses and multi-tenancy 2016-01-27 20:31:08 +02:00
David Bomba
84895907d1 Merge pull request #662 from turbo124/master 
update invoice status via API
 2016-01-27 21:01:24 +11:00
David Bomba
fa2187ce20 update invoice status via API 2016-01-27 21:00:00 +11:00
David Bomba
6455e25c3a Merge pull request #660 from turbo124/master 
Include archived clients
 2016-01-27 14:32:09 +11:00
David Bomba
76f4530ffd include archived clients 2016-01-27 14:31:38 +11:00
David Bomba
910e9db7a0 Merge pull request #659 from turbo124/master 
Added ability to convert a quote to an invoice through the API
 2016-01-27 12:57:28 +11:00
David Bomba
4799b2e86c Added ability to convert a quote to an invoice through the API 2016-01-27 12:56:24 +11:00
David Bomba
2db27caf90 Merge pull request #658 from turbo124/master 
Bug fixes
 2016-01-27 11:40:41 +11:00
David Bomba
71b2970279 Bug fixes 2016-01-27 11:36:21 +11:00
David Bomba
4f5dd12ea0 Merge pull request #657 from turbo124/master 
Bug Fixes
 2016-01-27 07:53:22 +11:00
David Bomba
c2bb8711a0 Bug Fixed 2016-01-27 07:52:30 +11:00
Hillel Coren
9c96f09fc0 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-26 22:22:40 +02:00
Hillel Coren
efc9ab4f9e Working on OFX support 2016-01-26 22:22:33 +02:00
David Bomba
e57f8f3c2e Swagger Typo fix 2016-01-26 22:37:16 +11:00
David Bomba
a4df265d09 Update client via API 2016-01-26 22:36:00 +11:00
Hillel Coren
e4a6effc60 Merge pull request #642 from sakalauskas/dev-api 
Fixed ping route & added a way to find client by email address or if …
 2016-01-24 19:54:01 +02:00
Laurynas Sakalauskas
2478ec59a4 Revert store() method 2016-01-24 17:06:34 +00:00
Laurynas Sakalauskas
68665d2972 Added filtering by email 2016-01-24 16:59:01 +00:00
Hillel Coren
74a3dcf9d2 Working on expenses 2016-01-23 23:36:31 +02:00
Laurynas Sakalauskas
0d2025c834 Fixed ping route & added a way to find client by email address or if not exist - create a new 2016-01-22 10:33:38 +00:00
Hillel Coren
360b59baa0 Working on expenses 2016-01-22 00:29:10 +02:00
Hillel Coren
7a26dd610c Working on expenses 2016-01-21 22:36:49 +02:00
Hillel Coren
b24a6109ba Working on expenses 2016-01-21 21:15:30 +02:00
Hillel Coren
dff7ad91c8 Merge: Bugfixed version of Vendor / Expense module (#635) 2016-01-21 00:09:10 +02:00
Hillel Coren
9287118cd0 Merging: Bugfixed version of Vendor / Expense module #635 2016-01-20 16:06:17 +02:00
Hillel Coren
6166464003 Merge: Make automatic conversion of quote to invoice optional (#636) 2016-01-20 10:41:57 +02:00
Hillel Coren
bf778aa616 Initial work on OFX support 2016-01-20 01:07:31 +02:00
steenrabol
2525f68a39 Expense / Vendor module bug fix 2016-01-19 20:35:15 +01:00
steenrabol
e7a658aaf6 Expenses bug fix 2016-01-19 14:01:19 +01:00
Hillel Coren
89ff1be14f Manually merging PR #630 2016-01-18 11:13:39 +02:00
Hillel Coren
cbe2b2905e Added autolink to emails and fixed checkout.com integration 2016-01-18 10:30:42 +02:00
David Bomba
eeb977bab3 Added delete invoice functionality 2016-01-16 17:07:29 +11:00
David Bomba
12d3444808 By default include trashed invoices 2016-01-16 09:22:22 +11:00
steenrabol
f550e3734f bug fix to expense module - was not able to add a contact to a new vendor 2016-01-15 11:31:12 +01:00
David Bomba
ca591f4451 return archived invoice as success 2016-01-15 14:05:16 +11:00
Hillel Coren
175c685032 Enabled creating recurring invoices through the API 2016-01-13 16:58:39 +02:00
Hillel Coren
b5cf87bc0d Bug fixes 2016-01-12 11:18:35 +02:00
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
Hillel Coren
e46d804cd7 Working on importing data from more providers 2015-12-07 23:41:48 +02:00
Hillel Coren
1a474f362f Added support for country specific Euro formatting 2015-12-07 15:34:55 +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
165ecd0bf0 Added support for Stripe.js 2015-11-29 22:13:50 +02:00
Hillel Coren
44336fd7c4 Bug fixes 2015-11-29 12:58:40 +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
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
61ed298699 Minor improvements 2015-11-21 23:10:26 +02:00
Hillel Coren
01946f7bc8 Added static data to the API 2015-11-19 13:37:30 +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
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
3767a8a6a7 Bug fixes 2015-11-16 21:29:22 +02:00
Hillel Coren
ce4524ba1a Bug fixes 2015-11-16 21:07:23 +02:00
Hillel Coren
1b099d09cc Check for large logo image files 2015-11-16 20:02:04 +02:00
Hillel Coren
e93a7aa915 Bug fixes 2015-11-16 14:30:44 +02:00
Hillel Coren
9a0058deb1 Bug fixes 2015-11-15 19:23:45 +02:00
Hillel Coren
c7a92e4862 Bug fixes 2015-11-15 11:50:21 +02:00
Hillel Coren
96a58ecf16 Bug fixes 2015-11-15 08:39:25 +02:00
Hillel Coren
6da8194332 Working on Mollie Pay 2015-11-13 15:40:42 +02:00
Hillel Coren
f574a79fe6 Improved data export 2015-11-12 22:36:28 +02:00
Hillel Coren
7b6699c2bc Enabled grouping report by payments 2015-11-11 00:07:05 +02:00
David Bomba
36ccb4e331 shift SITE_URL into user_accounts key path 2015-11-10 20:32:45 +11:00
Hillel Coren
e26bf521e4 Working on the API 2015-11-10 09:13:40 +02:00
Hillel Coren
b55a3226b7 Starting on stripejs 2015-11-09 21:24:22 +02:00
Hillel Coren
be6b7fed7a Working on the API 2015-11-09 04:10:01 +02:00
Hillel Coren
0524f53850 Working on Swagger 2015-11-08 23:57:28 +02:00
Hillel Coren
5d3a24800e Working on Swagger 2015-11-08 23:53:13 +02:00
Hillel Coren
2f9dd707f7 Working on the API 2015-11-08 23:12:50 +02:00
Hillel Coren
57245211d8 Added Swagger 2015-11-08 22:34:26 +02:00
Hillel Coren
ba90eb45ad Working on the API 2015-11-08 11:43:32 +02:00
Hillel Coren
156ca3cb86 Commenting out API command 2015-11-07 19:59:14 +02:00
Hillel Coren
c79ee49c1d Merge pull request #507 from adamgoose/patch-1 
Allow zero-costs
 2015-11-06 08:52:07 +02:00
Hillel Coren
002c994c0b Refactoring datatable code 2015-11-06 01:14:00 +02:00
Hillel Coren
436b8be8d9 Refactoring datatable code 2015-11-06 00:37:04 +02:00
Adam Engebretson
303de7a0b6 Allow zero-costs 
Currently, the `parepareItem` method checks to see if the cost and notes evaluate to false. If so, it checks from the product list.

However, we need the ability to set cost to zero explicitly through the API. This allows a user to pass null, which will use the default. Otherwise, passing 0 will persist.
 2015-11-05 12:39:33 -06:00
Hillel Coren
cb243fec0a Working on the API 2015-11-05 10:44:48 +02:00
Hillel Coren
ffab252436 Working on the API 2015-11-04 17:23:22 +02:00
Eduardo Cruz
1042c54077 Update on AccountController.php - fix CSV Client import 
Fix CSV Client import
 2015-11-04 11:35:42 -03:00
Hillel Coren
65e959e84d Added system settings page 2015-11-04 15:57:59 +02:00
Hillel Coren
72c7cbb237 Added 'apply credit' action 2015-11-04 09:48:47 +02:00
Hillel Coren
029e740a6c Working on the API 2015-11-03 21:03:24 +02:00
Hillel Coren
26ec972819 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-11-03 13:20:55 +02:00
Hillel Coren
521fc107f1 Bug fixes 2015-11-03 13:20:49 +02:00
David Bomba
6f320aa624 merge 2015-11-03 19:09:52 +11:00
David Bomba
9b54113b9b Merge remote-tracking branch 'upstream/master' 2015-11-03 19:09:40 +11:00
David Bomba
38c3f14081 working on api 2015-11-03 13:02:15 +11:00
David Bomba
c3066c824f working on api 2015-11-03 10:55:31 +11:00
Hillel Coren
c3d43ab480 Bug fixes 2015-11-03 00:05:28 +02:00
David Bomba
d577a34675 fix conflicts 2015-11-03 08:47:32 +11:00
Rafael Almeida
c8375ad983 Distinct text message when quote is converted or approved 2015-11-02 15:14:00 -05:00
Hillel Coren
6130626422 Working on the API 2015-11-02 20:43:22 +02:00
Hillel Coren
c130e67e54 Fixed problem with PayFast integration 2015-11-02 11:47:47 +02:00
David Bomba
09ccb88784 separate API logic 2015-11-02 15:29:38 +11:00
Hillel Coren
3b6a4a6100 Added Fractal 2015-11-02 00:10:20 +02:00
Hillel Coren
9b840a24dd Enabled social login 2015-11-01 20:21:11 +02:00
Hillel Coren
0b2705b943 Enabled restoring deleted invoices and payments 2015-10-30 14:56:25 +02:00
Hillel Coren
b040aad021 Separated recurring invoices from invoices list 2015-10-29 19:21:00 +02:00
Hillel Coren
aa0a35f9d8 Added default quote terms 2015-10-29 16:42:05 +02:00
Hillel Coren
404435a145 Refactored to events 2015-10-28 21:22:07 +02:00
Hillel Coren
4a3beeeae7 Bug fixes 2015-10-25 13:08:11 +02:00
Hillel Coren
3d55dbc05b Bug fixes 2015-10-25 09:13:06 +02:00
Hillel Coren
17f853f907 Working on custom invoice numbers 2015-10-23 14:55:18 +03:00
Hillel Coren
a0ec032f69 Working on custom invoice numbers 2015-10-23 11:06:46 +03:00
Hillel Coren
7ca98c9080 Custom invoice/quote numbers 2015-10-22 21:48:12 +03:00
Hillel Coren
47f38ad54e Added support for default taxes 2015-10-21 14:11:08 +03:00
Hillel Coren
7150a148af Added PayPal buttonsource 2015-10-21 07:30:23 +03:00
Hillel Coren
392c1facc0 Fixed issue with TwoCheckout integration 2015-10-20 22:04:49 +03:00
Hillel Coren
2c5667aacb Added new acceptance tests 2015-10-20 20:12:34 +03:00
Hillel Coren
88c215d1df Bug fixes 2015-10-20 11:23:38 +03:00
Hillel Coren
420de05ebc Bug fixes 2015-10-18 13:37:04 +03:00
Hillel Coren
9283362d28 Bug fixes 2015-10-18 10:30:28 +03:00
Hillel Coren
c24b2f352d Updated version 2015-10-16 08:32:02 +03:00
Hillel Coren
1ab154aba9 Bug fixes 2015-10-15 22:37:01 +03:00
Hillel Coren
a4960245c2 Bug fixes 2015-10-15 09:19:41 +03:00
Hillel Coren
8da5517206 Bug fixes 2015-10-14 23:56:17 +03:00
Hillel Coren
831c81a4b9 Improved settings navigation 2015-10-14 17:15:39 +03:00
Hillel Coren
d3550903f4 Bug fix 2015-10-14 08:18:14 +03:00
Hillel Coren
aef0fe8430 Added client dashboard 2015-10-13 18:44:01 +03:00
Hillel Coren
2dfc053cbc Bug fixes 2015-10-13 10:11:44 +03:00
Hillel Coren
1d04bc2a05 Added custom invoice text fields 2015-10-11 17:41:09 +03:00
Hillel Coren
a1cef22a48 Add quotes to the dashboard and a map to the client page 2015-10-06 20:55:55 +03:00
Hillel Coren
254a819e92 Fix for #445 2015-10-05 20:48:16 +03:00
Hillel Coren
6d7f0d6611 Zapier fixes 2015-10-02 11:32:13 +03:00
Hillel Coren
cb16e7f950 Added support for basic markdown 2015-10-01 23:02:22 +03:00
Hillel Coren
06be7afedf Bug fixes 2015-09-29 21:19:18 +03:00
Hillel Coren
c38577e0a8 Bug fixes 2015-09-29 17:16:19 +03:00
Hillel Coren
bf85aa7ddd Bug fixes 2015-09-29 13:21:57 +03:00
Hillel Coren
f8b449a471 Added warning when form token is about to expire 2015-09-28 23:37:32 +03:00
Hillel Coren
8337bc9669 Working on session warning 2015-09-27 00:08:59 +03:00
Hillel Coren
4268c18f8a Fixed money format in PDF for EU 2015-09-25 12:57:40 +03:00
Hillel Coren
6b063abe9a Bug fixes 2015-09-21 00:05:02 +03:00
Hillel Coren
98cabd4138 Added auto-reminder emails 2015-09-17 22:01:06 +03:00
Hillel Coren
4741fad4be Added auto-billing and per-client language support 2015-09-10 20:50:09 +03:00
Hillel Coren
3fdad48179 API improvements 2015-09-07 12:07:55 +03:00
Hillel Coren
79aa5bad92 Minor fixes 2015-09-04 10:20:30 +03:00
Hillel Coren
9d96a9daed Bug fixes 2015-09-03 10:32:39 +03:00
Hillel Coren
5bf287f51a Fixed task bug 2015-09-02 23:33:47 +03:00
Hillel Coren
4d71b193d6 Bug fixes 2015-09-02 13:59:03 +03:00
Hillel Coren
e4672b1213 Merge pull request #405 from trendler/master 
Fixed timezone DST issues in timelog
 2015-09-01 23:29:09 +03:00
Hillel Coren
0183c02ef6 Added online payment acceptance test 2015-09-01 21:40:30 +03:00
Hillel Coren
ba50e701c8 Integration tests 2015-08-30 15:08:15 +03:00
Hillel Coren
95fd9a4c1c Initial acceptance tests 2015-08-20 18:09:04 +03:00
Hillel Coren
407af306a5 Bug fixes 2015-08-20 11:02:03 +03:00
Hillel Coren
9e6b25bcc4 Bug fixes 2015-08-14 15:04:33 +03:00
Tobias Rendler
663070e36b Fixed timezone DST issues in timelog 
- Added moment-timezone-with-data.js
- Added new datetime format and variants
 2015-08-13 12:54:03 +02:00
Hillel Coren
dc8bd36e76 Moved line item tax amounts to invoice subtotals section 2015-08-12 22:16:02 +03:00
Hillel Coren
0e15c12298 Bug fixes 2015-08-11 17:38:36 +03:00
Hillel Coren
78bf49cd19 Recurring invoices no longer prevent invoice numbers from being sequential 2015-08-10 18:48:41 +03:00
Hillel Coren
2cfcdd1e77 Minor improvements 2015-08-04 17:33:30 +03:00
Hillel Coren
8f80ccf4d7 Minor fixes 2015-08-04 14:38:48 +03:00
Hillel Coren
4b7d143630 Minor fixes 2015-08-03 22:08:07 +03:00
Hillel Coren
5aa64523dc Disabled datepicker localization 2015-08-03 11:52:47 +03:00
Hillel Coren
559a7d8a46 Moved unlink to separate page 2015-08-03 10:15:58 +03:00
Hillel Coren
33364d3d9c Bug fixes 2015-07-30 20:48:59 +03:00
Hillel Coren
4fa4f65005 Support updating invoices through the API 2015-07-30 17:44:47 +03:00
Hillel Coren
914334511e Enhancements to the dashboard 2015-07-29 22:55:12 +03:00
Hillel Coren
da6e59a925 Merge pull request #355 from Lykegenes/master 
Charts & reports SQLite compatibility
 2015-07-28 10:00:32 +03:00
Hillel Coren
ba8419356d Moved invoice design files 2015-07-28 10:00:00 +03:00
Hillel Coren
76a53ed5dc Working on invoice customizer 2015-07-26 23:05:38 +03:00
Hillel Coren
912fe5b7a3 Working on invoice customizations 2015-07-24 17:13:17 +03:00
Hillel Coren
35d794b36f Enabled customizing invoice designs 2015-07-21 21:51:56 +03:00
Hillel Coren
25496061ee Ensured JS client dates use timezone setting 2015-07-15 17:45:02 +03:00
Hillel Coren
b9c00a0531 Re-worked editing task details 2015-07-12 22:43:45 +03:00
Hillel Coren
9477c7467d Prevent seeder from being run twice 2015-07-09 17:12:43 +03:00
Hillel Coren
c42dfb8b96 Improvments to multi-account switching 2015-07-07 23:08:16 +03:00
Hillel Coren
39ba8d1287 Added support for creating payments through the API 2015-07-05 11:01:16 +03:00
Hillel Coren
b387661271 Improvments to the API 2015-07-02 23:21:29 +03:00
Hillel Coren
e678d2be62 Fix for when user cancels Dwolla payment 2015-07-01 22:01:12 +03:00
Florian Levis
0781757a82 API - Client : allow edition of client data 2015-06-30 19:08:40 +02:00
Hillel Coren
4a170ffb3e Improving initial setup 2015-06-20 20:40:50 +03:00
Patrick Samson
23d9a2728b Fix Charts & Reports queries using SQLite 2015-06-18 19:28:43 -04:00
Hillel Coren
67dff394b4 Added multi-company support 2015-06-16 22:35:35 +03:00
Hillel Coren
7b4c377100 Fixed problem using token 2015-06-15 16:12:31 +03:00
Hillel Coren
a301e58609 Enabled sending payment confirmation email for manual payment entries 2015-06-14 20:30:01 +03:00
Hillel Coren
9c577371bb Added resume option to tasks 2015-06-14 17:49:13 +03:00
Hillel Coren
97adc27ba1 Added resume option to tasks 2015-06-14 17:03:37 +03:00
Hillel Coren
84a117c84b Added resume option to tasks 2015-06-14 15:21:29 +03:00
Hillel Coren
d34ed74863 Bug fixes 2015-06-12 11:39:53 +03:00
Hillel Coren
fcaacdf48b Bug fixes 2015-06-10 23:55:23 +03:00
Hillel Coren
1c1bef3abb Bug fixes 2015-06-10 11:34:20 +03:00
Hillel Coren
77c90ad21f Bug fixes 2015-06-07 11:05:30 +03:00
Hillel Coren
b80842759e Bug fixes 2015-06-04 23:53:58 +03:00
Hillel Coren
060a14736b Added support for Dwolla 2015-06-03 20:55:48 +03:00
Alex Sears
59f5d60207 New account gateways not saving 
Noticed a bug when setting up things locally.  This prevented new account gateways from being saved in the DB.
 2015-06-01 16:07:37 -04:00
Hillel Coren
c902552d5f Bug fixes 2015-06-01 17:34:00 +03:00
Hillel Coren
74787804e7 Minor tweaks 2015-06-01 16:06:18 +03:00
Hillel Coren
eb572d9021 Fixed problem with invoice design page 2015-05-31 21:45:39 +03:00
Hillel Coren
1a8245dcff Adding support for Dwolla 2015-05-31 15:37:29 +03:00
Hillel Coren
976773ce7b Enabled setting custom invoice item labels 2015-05-27 23:20:35 +03:00
Hillel Coren
57b5db4ed8 Merge pull request #329 from Lykegenes/Lykegenes-sqlite-patch-1 
SQLite compatibility
 2015-05-27 21:47:42 +03:00
Patrick Samson
2717298e56 fixed ambiguous column name in SQLite 2015-05-27 13:29:52 -04:00
Patrick Samson
d4df8747f7 fixed ambiguous column name in SQLite 2015-05-27 13:27:29 -04:00
Hillel Coren
3b90030059 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 2015-05-27 19:52:14 +03:00
Hillel Coren
3da1e738d8 Working on tasks 2015-05-27 19:52:10 +03:00
Hillel Coren
e4a45c6cf9 Merge pull request #326 from bcole808/whitelabel-fix 
Public payment page white label issue
 2015-05-27 09:20:34 +03:00
Ben Cole
e054c4d9e4 Hide logo on public payment page if white label 2015-05-26 21:40:53 -07:00
Hillel Coren
33d139adf5 Working on pdfmake 2015-05-22 10:22:24 +03:00
Hillel Coren
edec5028c6 Bug fixes 2015-05-19 22:14:00 +03:00
Hillel Coren
935780f7bc Bug fixes 2015-05-15 11:51:22 +03:00
Hillel Coren
140943f166 Fixed problem when adding user 2015-05-12 12:36:32 +03:00
Hillel Coren
0fa30fb55f Bug fixes 2015-05-11 14:16:36 +03:00
Hillel Coren
fcbec2617b Bug fixes 2015-05-10 22:02:35 +03:00
Hillel Coren
c4a94834a1 API improvements 2015-05-10 11:45:03 +03:00
Hillel Coren
f41e0d999b Bug fixes 2015-05-09 21:25:16 +03:00
Hillel Coren
ef6e930f1b Minor dashboard improvements 2015-05-08 11:21:29 +03:00
Hillel Coren
b368e5589c Bug fixes 2015-05-05 12:48:23 +03:00
Hillel Coren
5a28ff2612 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 2015-04-30 20:54:41 +03:00
Hillel Coren
1d6013178f Working on basic reports 2015-04-30 20:54:19 +03:00
Jeramy Simpson
9cb51f449b Fix PHP 5.4 Compatibility for pdfupload 2015-04-29 11:49:28 +10:00
Hillel Coren
bc10719fbe Added support for custom subdomains 2015-04-28 23:13:52 +03:00
Hillel Coren
723aa285f5 Bug fixes 2015-04-27 15:28:40 +03:00
Hillel Coren
b2678220c3 Working on PDF attachments 2015-04-23 00:40:21 +03:00
Hillel Coren
dc6ed9fca1 Updating design 2015-04-22 22:21:04 +03:00
Hillel Coren
c0571b0b2e Bug fixes 2015-04-21 23:09:45 +03:00
Hillel Coren
8018bcad6c Working on pdfmake 2015-04-21 14:42:31 +03:00
Hillel Coren
dea421259c Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 2015-04-17 14:57:34 +03:00
Hillel Coren
168bb7cfb0 Added support for partial payments 2015-04-17 14:57:17 +03:00
sigitas
9be2538213 Merge remote-tracking branch 'remotes/ninja/master' 2015-04-17 00:34:57 +03:00
Hillel Coren
96a71864ed Added support for partial payments 2015-04-16 22:57:12 +03:00
Hillel Coren
caae008403 Added support for partial payments 2015-04-16 20:12:56 +03:00
Hillel Coren
be327fbcbf Added support for Bitcoin 2015-04-15 19:35:41 +03:00
Hillel Coren
868744c696 Working on L5 2015-04-14 21:58:07 +03:00
Hillel Coren
635c1b9df1 Working on L5 2015-04-13 18:05:34 +03:00
Hillel Coren
3641019d04 Enabled re-sending confirmation email 2015-04-13 15:49:40 +03:00
Hillel Coren
5a6197fbb4 Added notification email when quote is approved 2015-04-13 15:00:31 +03:00
sigitas
5f1495073f use custom fonts 2015-04-13 12:23:43 +03:00
Hillel Coren
564d006428 Working on L5 2015-04-13 10:54:51 +03:00
Hillel Coren
9dcc4e0e52 Working on L5 2015-04-12 17:18:05 +03:00
Hillel Coren
c19d09fa0c Added back gruntfile 2015-04-12 12:58:28 +03:00
Hillel Coren
0e2eba4521 Bug fixes 2015-04-12 12:43:51 +03:00
Hillel Coren
717d214157 Working on L5 2015-04-08 21:19:58 +03:00
Hillel Coren
4750bacd71 Reworked query caching for L5 2015-04-08 16:19:17 +03:00
Hillel Coren
424eb15870 Working on L5 2015-04-06 14:46:02 +03:00
Jeramy Simpson
a1eb78faac PDF Setting Fixed 2015-04-06 16:24:35 +10:00
Jeramy Simpson
b8c1d49e30 Remove last mentions of PHP-Payments 
Closes #257
 2015-04-06 15:55:17 +10:00
Jeramy Simpson
698809fa01 L5 Updates 2015-04-06 15:45:27 +10:00
Hillel Coren
b8f2f59b5b Working on L5 2015-04-05 22:15:37 +03:00
Hillel Coren
d47d715181 Working on L5 2015-04-02 16:12:12 +03:00
Hillel Coren
83a48df567 Working on L5 2015-04-02 16:06:16 +03:00
Jeramy Simpson
37ca4c9481 Working on L5 
Also includes very minor meta tag changes to bring to industry standard.
 2015-04-02 14:09:32 +10:00