Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-11 05:32:39 +01:00
Code Issues Releases Activity
4,623 Commits 7 Branches 918 Tags 2 GiB
54c224f646
Commit Graph

2734 Commits

Author SHA1 Message Date
Hillel Coren
2cd574d349 Fix for PayFast 2016-11-16 12:41:47 +02:00
Hillel Coren
e1a84a29e1 Tweaks to BlueVine 2016-11-16 12:41:32 +02:00
Hillel Coren
3680985a20 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-11-15 21:28:34 +02:00
Hillel Coren
7e80f4de2e Fix subscription JSON response 2016-11-15 10:39:35 +02:00
Joshua Dwire
c04a92b836 Exclude deleted payments from 12-month revenue 2016-11-14 13:42:27 -05:00
Joshua Dwire
3d84e408bb Only do annual income calculations if we're going to show the BlueVinePromo. 2016-11-14 13:42:09 -05:00
Joshua Dwire
179713711f Merge remote-tracking branch 'upstream/develop' into 2016-11-bluevine-integration 2016-11-14 13:34:27 -05: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
Hillel Coren
a9a94df973 Fix for expense documents 2016-11-13 09:14:40 +02:00
Hillel Coren
d53d7739b4 Fix for expense documents 2016-11-13 09:14:25 +02:00
Hillel Coren
79d745a26b Simplify logo URL code 2016-11-11 12:57:28 +02:00
Hillel Coren
8c2e5ebdbf Simplify logo URL code 2016-11-11 12:57:12 +02:00
Joshua Dwire
82167de1d2 Merge remote-tracking branch 'upstream/develop' into 2016-11-bluevine-integration 2016-11-10 18:29:13 -05:00
Joshua Dwire
5bee41789f Show BlueVine quote and redirect to BlueVine 2016-11-10 18:24:54 -05:00
Hillel Coren
61a898a71d Update checkdata script 2016-11-09 16:09:19 +02:00
Hillel Coren
bc8c24a67c Update checkdata script 2016-11-09 16:08:22 +02:00
Hillel Coren
660727d23b Remove duplicate line of code 2016-11-06 19:42:43 +02:00
Hillel Coren
b620356db1 Merge branch 'release-2.8.0' 2016-11-06 19:29:19 +02:00
Hillel Coren
7155524575 Update version 2016-11-06 15:58:00 +02:00
Hillel Coren
905593b525 Prevent emailing recurring invoice through API 2016-11-06 15:57:33 +02:00
Hillel Coren
a76e9ae437 Log email error for self host installs 2016-11-06 15:21:09 +02:00
Hillel Coren
26f4a84897 Track campaign fields with company 2016-11-06 14:16:18 +02:00
Hillel Coren
31d5e28b69 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-11-06 13:45:09 +02:00
Hillel Coren
ef44a95902 Working on signature feature 2016-11-06 13:44:58 +02:00
David Bomba
c905e781c0 revert error reporting (#1142) 2016-11-05 12:32:06 +11:00
David Bomba
0a4d55e0aa Generic message 
Change error text to generic Entity not found.
 2016-11-05 06:36:49 +11:00
David Bomba
f5e18f3355 API Error handling improvements (#1141) 
* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* Client not found error handling via API

* Client not found error handling via API
 2016-11-05 06:20:33 +11:00
Hillel Coren
3ccb33ec21 Support signing for invoice 2016-11-04 15:34:15 +02:00
Hillel Coren
fbf618a226 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-11-04 11:48:37 +02:00
Hillel Coren
5c9b435b97 Fix for contact sorting when saving 2016-11-04 11:48:27 +02:00
Joshua Dwire
5713561261 Add UI for BlueVine signup 2016-11-03 16:54:33 -04:00
David Bomba
9d4a121662 Merge pull request #1139 from turbo124/develop 
Dashboard bug fix
 2016-11-03 22:41:48 +11:00
David Bomba
d466a1bf5a bug fixes 2016-11-03 22:39:29 +11:00
David Bomba
88f9cea3bb Add show() resource route for ClientApiController (#1138) 
* 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

* add show() Client
 2016-11-03 21:39:33 +11:00
David Bomba
06150ce30a add show() Client 2016-11-03 21:36:05 +11:00
Hillel Coren
9769f206f2 Fix for outstanding amount on dashboard 2016-11-02 09:43:57 +02:00
Hillel Coren
e677569351 Support importing VAT number with client CSV 2016-11-01 13:19:35 +02:00
Hillel Coren
6353ad05ff Remove 'unamed client' label 2016-10-31 16:08:00 +02:00
Hillel Coren
bf6fd23aea Show 'Pro' label when on trial 2016-10-31 12:59:48 +02:00
Hillel Coren
eca4d7ce6a Add financial year start setting for dashboard 2016-10-31 11:11:30 +02:00
Hillel Coren
b39f2f4ba5 Ensure invoice always has an invitation 2016-10-31 09:06:55 +02:00
Hillel Coren
16940fd690 Fix translations in client portal 2016-10-30 20:12:02 +02:00
Hillel Coren
752e674a34 Remove branding if white labeled 2016-10-30 18:09:22 +02:00
Hillel Coren
02c300e9f9 Prevent session history from showing as blank 2016-10-30 11:23:36 +02:00
Hillel Coren
2a97fc5456 Prevent deleted invoice from being paid 2016-10-30 11:04:08 +02:00
Hillel Coren
7b5cd9e4c1 Eager load contact with activities 2016-10-30 08:50:58 +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
346dde8e97 Fix for parseCSV constructor error 2016-10-28 14:35:32 +03:00
Hillel Coren
bd624710a8 Minor fixes 2016-10-28 12:01:35 +03:00
David Bomba
8f1a9a2e5d Expense Categories route (#1125) 
* Expense categories

* add dependencies

* expense categories

* expense categories

* expense categories

* Change expense categories into a resource route
 2016-10-28 19:37:28 +11:00
Hillel Coren
bb0ce2da38 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-10-28 09:43:07 +03:00
Hillel Coren
522cabe0a1 Fix for permissions change 2016-10-28 09:42:49 +03:00
David Bomba
dedb85c8d6 Add / Update expense categories from API (#1124) 
* Expense categories

* add dependencies

* expense categories

* expense categories

* expense categories
 2016-10-28 12:59:57 +11:00
Hillel Coren
7465eb1631 Include taxes in expense amount 2016-10-27 17:26:42 +03:00
Hillel Coren
c3c0ece14a Round qty in product report 2016-10-27 16:45:06 +03:00
Hillel Coren
a4b919f188 Fix for tests 2016-10-27 12:56:21 +03:00
Hillel Coren
238c2068ec Fix for logos in production 2016-10-27 12:05:07 +03:00
Hillel Coren
185958ba2c Fix for logos in production 2016-10-27 12:03:25 +03:00
Hillel Coren
5b80e32fa7 Add ability to enable\disable modules 2016-10-27 11:57:51 +03:00
Hillel Coren
00d7df8850 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-10-26 10:32:44 +03:00
Hillel Coren
83c229028b Merge pull request #1113 from gpasztor87/develop 
Update User model
 2016-10-26 10:32:33 +03:00
Hillel Coren
b7c783aa15 Support sending API secret as header 2016-10-26 10:24:16 +03:00
David Bomba
0bef2a0d1a Changed object back to 2016-10-26 12:01:36 +11:00
Hillel Coren
3023eeb058 Fix for uploading multiple documents 2016-10-25 20:16:29 +03:00
Hillel Coren
7fcc634a74 Redirect to dashboard when switching accounts if viewing an entity 2016-10-25 17:29:37 +03:00
Hillel Coren
c0a3971ca5 Store sidebar state in localstorage 2016-10-25 17:07:56 +03:00
Hillel Coren
8e6113dad0 Merge invoice document/api fix to master 2016-10-25 13:30:28 +03:00
Hillel Coren
12d9bac3fd Added fields for future features 2016-10-23 14:41:26 +03:00
Hillel Coren
6a55cf5b43 Add API support for expenses 2016-10-23 11:01:21 +03:00
Pásztor Gábor
3296fb344e Update User model 2016-10-22 20:13:37 +02:00
Hillel Coren
4320a72692 Add company plan to user account API response 2016-10-21 14:29:01 +03:00
Hillel Coren
fc683784fc Remove duplicate activity records for expenses and tasks 2016-10-21 09:54:28 +03:00
Hillel Coren
83b66c880b Track changes to expenses in activities 2016-10-20 23:17:37 +03:00
Hillel Coren
040fb76a48 UI to apply white label license 2016-10-20 21:35:59 +03:00
Hillel Coren
d92f7fadc0 Fix for currency symbol 2016-10-20 18:14:54 +03:00
Hillel Coren
4c5b4d5164 Filter buy now clients and invoices 2016-10-20 17:50:59 +03:00
Hillel Coren
5560d65c4a Fix for currency symbol 2016-10-20 17:49:26 +03:00
Hillel Coren
5084e4c5b9 Fix for default currency symbol 2016-10-20 17:44:31 +03:00
Hillel Coren
a0f8475a35 Enable selecting currency symbol or code 2016-10-20 17:17:47 +03:00
Hillel Coren
4ed8246681 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-10-19 10:17:32 +03:00
Hillel Coren
b448f459f8 Fix task timer #1109 2016-10-19 10:17:23 +03:00
David Bomba
9c21cc0e5c Merge pull request #1110 from turbo124/develop 
Added missing fields in Expense Transformer
 2016-10-19 13:00:25 +11:00
David Bomba
c50f1a8f37 Added missing fields 2016-10-19 12:59:01 +11:00
Hillel Coren
89088e5517 Fix product list filter 2016-10-18 21:15:08 +03:00
Hillel Coren
733890ec3f Show archived/deleted in breadcrumbs 2016-10-18 17:55:07 +03:00
Hillel Coren
9fe183f125 Fix for deleting vendor contacts 2016-10-18 14:22:04 +03:00
Hillel Coren
bf19a77053 Allow all users to see tax rates 2016-10-18 14:11:01 +03:00
Hillel Coren
6c02ee2c60 Allow all users to see tax rates 2016-10-18 14:10:46 +03:00
David Bomba
b8d0498560 Merge pull request #1107 from turbo124/develop 
Fix bug when deleting Vendor
 2016-10-18 20:58:00 +11:00
David Bomba
a8cf11604e fixed delete request type 2016-10-18 20:54:19 +11:00
David Bomba
3fcb560232 fixed delete request type 2016-10-18 20:53:17 +11:00
David Bomba
f30a25b0eb fixed bug when saving vendorcontact 2016-10-18 20:51:34 +11:00
David Bomba
ce0662f7b3 Merge pull request #1106 from turbo124/develop 
Vendor API POST and PUT methods
 2016-10-18 20:36:40 +11:00
David Bomba
ab2a636c23 fixed bug when saving vendorcontact 2016-10-18 20:32:58 +11:00
David Bomba
21f825defe fixed bug when saving vendorcontact 2016-10-18 20:28:27 +11:00
David Bomba
151f9a0f7f fixed bug when saving vendorcontact 2016-10-18 20:26:30 +11:00
David Bomba
b013d118ab Add Delete/Update methods into VendorAPIController 2016-10-18 19:31:21 +11:00
Hillel Coren
7c0eea08cd Added new upgrade modal 2016-10-16 09:38:04 -04:00
Hillel Coren
9edd65e7e2 Bug fix for reports 2016-10-13 12:46:46 +03:00
Hillel Coren
b36ea06303 Bug fix for reports 2016-10-13 12:46:29 +03:00
Hillel Coren
cf53151400 Git update 2016-10-11 13:07:06 +03:00
Hillel Coren
147df1ef91 Standardize archive/deleted behaviors 2016-10-10 11:40:04 +03:00
Hillel Coren
48f2f58d3f Only show 'Refund Payment' for selected gateways 2016-10-09 20:01:44 +03:00
Hillel Coren
d8835a09c0 Fix for sorting payment list by source 2016-10-07 10:13:19 +03:00
Hillel Coren
6fad8c6bbb Fix for sorting payment list by source 2016-10-07 10:13:08 +03:00
Hillel Coren
8545e9cff4 Bug fix for Braintree client link 2016-10-07 08:22:35 +03:00
Hillel Coren
b024f99fbd Bug fix for Braintree client link 2016-10-07 08:22:19 +03:00
Hillel Coren
d046679dab Support OAuth login on iPhone 2016-10-06 15:46:27 +03:00
Hillel Coren
8fd45b4985 Exclude invalid activities 2016-10-06 11:20:25 +03:00
Hillel Coren
26b8c3637b Exclude invalid activities 2016-10-06 11:20:09 +03:00
Hillel Coren
43eca6eee0 Fix for payment refund 2016-10-06 08:44:46 +03:00
Hillel Coren
32f341f448 Fix for payment refund 2016-10-06 08:44:19 +03:00
Hillel Coren
92698f5c26 Improve expense import 2016-10-05 23:56:48 +03:00
Hillel Coren
48d0b1b9cf Improve expense import 2016-10-05 23:46:15 +03:00
Hillel Coren
d0b06b94da Update invoice to use invoice terms when converted from a quote 2016-10-05 22:11:22 +03:00
Hillel Coren
a1fcc3519a Support validating OAuth token 2016-10-05 21:51:08 +03:00
Hillel Coren
08a07f09ed Add link to Transifex 2016-10-05 21:20:00 +03:00
Hillel Coren
acc48081e5 Improve add gateway process 2016-10-05 17:02:36 +03:00
Hillel Coren
403239483c Fix for tests 2016-10-02 11:47:54 +03:00
Hillel Coren
de7ecbd3cb Fix for tests 2016-10-02 11:47:24 +03:00
Hillel Coren
d6afc03c3b Merge fixes 2016-10-02 10:59:15 +03:00
Hillel Coren
7bd4026e4c Working on importing expenses 2016-10-02 10:10:28 +03:00
Hillel Coren
47137e60df Check if Stripe card is set 2016-09-28 21:07:43 +03:00
Hillel Coren
2bf3e524db Fix for documents when approving a quote 2016-09-28 10:44:07 +03:00
Hillel Coren
11472e488f Fix for documents when approving a quote 2016-09-28 10:43:48 +03:00
Hillel Coren
f7b7796f25 Fix for setting num users 2016-09-27 21:03:46 +03:00
Hillel Coren
2b2cfbc2e5 Fix for #1084 2016-09-27 20:34:43 +03:00
Hillel Coren
ed1edc64bc Fix for API payment validation 2016-09-27 17:13:42 +03:00
Hillel Coren
c5d0786ed6 Prevent partial from being negative 2016-09-27 10:37:37 +03:00
Hillel Coren
6088a36175 Support for custom gateway 2016-09-26 12:33:30 +03:00
Hillel Coren
078527443f Enable recurring for a cloned invoice 2016-09-26 09:54:59 +03:00
Hillel Coren
4b3507211a Show 'Pay with credit card' with PayPal 2016-09-26 09:20:06 +03:00
Hillel Coren
0d3be448df Bug fixes for import page 2016-09-25 21:13:14 +03:00
Hillel Coren
b624bb13c3 Fix problem clearing duplicate invoice number error 2016-09-25 20:36:15 +03:00
Hillel Coren
ae2c9d6252 Enable resubmitting form if invoice fails to save 2016-09-25 13:42:15 +03:00
Hillel Coren
f3a9f88107 Enable resubmitting form if invoice fails to save 2016-09-25 13:41:38 +03:00
Hillel Coren
f529b2ed06 Enabled adding blank row in invoice fields 2016-09-25 11:07:15 +03:00
Hillel Coren
249c89dbfd Added products to main navigation 2016-09-23 17:00:47 +03:00
Hillel Coren
7de1ffc13f Added phone to optional invoice fields 2016-09-23 12:11:46 +03:00
Hillel Coren
5d04bdab21 Add credits to the client portal 2016-09-23 12:02:48 +03:00
Hillel Coren
a8cd70fa16 Working on client portal header 2016-09-22 23:38:07 +03:00
Hillel Coren
02cfdf90eb Improve expense display name 2016-09-22 10:24:55 +03:00
Hillel Coren
0748d52144 Fix for tests 2016-09-21 21:26:25 +03:00
Hillel Coren
bcb5b7ca76 Prevent using update for ninja instance 2016-09-21 21:22:30 +03:00
Hillel Coren
9892c10be4 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-09-21 20:56:37 +03:00
Hillel Coren
0b54c8408a Merge pull request #1081 from codedge/Self-updater-integration 
Integrate updater in sidebar
 2016-09-21 20:54:55 +03:00
Holger Lösken
752c1684df Integrate updater in sidebar 
- Show little badge, when update available
- Remove download only link
- Change self update texts
- Update to latest version of laravel-selfupdater package
 2016-09-21 15:25:56 +00:00