Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-09 12:42:36 +01:00
Code Issues Releases Activity
9,512 Commits 7 Branches 916 Tags 2 GiB
master
Commit Graph

366 Commits

Author SHA1 Message Date
Hillel Coren
6caf1ff30d Minor fixes 2016-05-19 09:47:57 +03:00
Hillel Coren
ef65bb7d84 Merge pull request #879 from joshuadwire/wepay-integration 
Wepay integration - Part 3
 2016-05-18 19:22:44 +03:00
Joshua Dwire
f0d276be4c Listen for WePay IPNs 2016-05-18 09:51:20 -04:00
Hillel Coren
2e1d340d27 Merge pull request #875 from joshuadwire/wepay-integration 
Wepay integration - Part 2
 2016-05-17 22:25:59 +03:00
Joshua Dwire
4f3bb7eeb4 Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-05-17 15:07:53 -04:00
Joshua Dwire
43fade2339 Support app fees and Canadian users 2016-05-17 11:32:17 -04:00
Hillel Coren
3ed5fdf09f Disabled iOS push notifications by default 2016-05-17 14:36:12 +03:00
Hillel Coren
38866ff6f0 Disabled iOS push notifications by default 2016-05-17 14:35:16 +03:00
Hillel Coren
a82437b2bc Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 
Conflicts:
	app/Http/routes.php
	resources/lang/en/texts.php
 2016-05-16 11:34:00 +03:00
Joshua Dwire
a482c63ee3 Payments bug fixes 2016-05-15 16:27:56 -04:00
Hillel Coren
6b203fcd5e Fix for creating vendors when importing OFX transactions 2016-05-15 14:07:04 +03:00
Hillel Coren
46cf89361f Support manually importing OFX files 2016-05-15 14:06:25 +03:00
Hillel Coren
b067697b1c Support manually importing OFX files 2016-05-15 13:58:11 +03:00
Joshua Dwire
919aec2192 Better refund handling 2016-05-14 23:03:39 -04:00
Joshua Dwire
65feee34e3 Fox expiration off-by-one error 2016-05-14 22:43:55 -04:00
Joshua Dwire
8bc8b384c5 Fix auto bill error when the user hasn't entered payment information 2016-05-14 22:38:09 -04:00
Joshua Dwire
1524447cd4 WePay fixes; support account updater 2016-05-14 22:22:06 -04:00
Joshua Dwire
947cb4a6f7 Better WePay configuration support 2016-05-14 17:23:20 -04:00
Joshua Dwire
ce04c994dd Support payments and storing cards via WePay. 2016-05-13 09:30:22 -04:00
Joshua Dwire
88c9fc1ac1 Add WePay configuration UI 2016-05-11 22:55:37 -04:00
Joshua Dwire
573c17431f More bug fixes 2016-05-11 14:12:52 -04:00
Joshua Dwire
0d41d8aeb6 Payments bug fixes - Part 2 2016-05-11 12:53:43 -04:00
Joshua Dwire
581ae1baa6 Handle currency not set 2016-05-11 11:30:45 -04:00
Joshua Dwire
981045b28b Better Stripe support 2016-05-11 09:57:44 -04:00
Joshua Dwire
258401715c Update billing address when adding payment method 2016-05-10 22:15:32 -04:00
Joshua Dwire
cc5cb091d7 Store Braintree card summary locally 2016-05-10 19:16:53 -04:00
Joshua Dwire
88ec714cd5 Store Stripe card summary locally 2016-05-10 18:46:32 -04:00
Joshua Dwire
41f4c98e08 Merge remote-tracking branch 'upstream/develop' into payments-changes 2016-05-10 10:25:42 -04:00
Hillel Coren
9b0f086cbd Only show user’s own tokens 2016-05-08 21:50:35 +03:00
Hillel Coren
cf9dbae1d1 Remove duplicate Auth include 2016-05-08 09:33:19 +03:00
Hillel Coren
bacf5bf856 Merge branch 'laravel-acl' of git://github.com/joshuadwire/invoiceninja into joshuadwire-laravel-acl 
Conflicts:
	app/Providers/AuthServiceProvider.php
 2016-05-08 09:27:18 +03:00
Joshua Dwire
0fc44962d4 Add Braintree/PayPal support 2016-05-06 22:33:03 -04:00
Joshua Dwire
cf98c37f40 Better Braintree support 2016-05-06 17:05:42 -04:00
Joshua Dwire
815ab471a1 Fix auth bug 2016-05-06 14:55:26 -04:00
Joshua Dwire
475f5430f3 Update BaseService.php 2016-05-06 14:54:58 -04:00
Joshua Dwire
7469ea998c Use new ACL for refunds 2016-05-06 14:19:58 -04:00
Joshua Dwire
9ed44bdfe4 Merge pull request #4 from joshuadwire/laravel-acl 
Laravel acl
 2016-05-06 14:17:16 -04:00
Hillel Coren
c79d9fe24c Added preview for email templates 2016-05-05 17:46:22 +03:00
Joshua Dwire
913c6eeff0 Fix error; don't let users try to refund failed or already refunded payments 2016-05-02 18:04:57 -04:00
Hillel Coren
e6bcdb36b3 Removed extra entity load in the repos save function 2016-05-02 20:42:13 +03:00
Hillel Coren
2e2470e11c Send contact's email when creating Stripe token 2016-05-01 09:43:41 +03:00
Joshua Dwire
d78b874838 Add Plaid support 2016-04-30 22:45:51 -04:00
Joshua Dwire
ed1f2b6044 Handle failed payments 2016-04-30 17:54:56 -04:00
Joshua Dwire
c536bd8569 Add basic ACH support 2016-04-29 17:50:21 -04:00
Hillel Coren
9979eba5d9 Working on custom route model binding 2016-04-28 15:16:33 +03:00
Joshua Dwire
1cb2b9dc25 Use existing PaymentType instead of CardType 2016-04-27 22:13:51 -04:00
Hillel Coren
ce2392563d Removed checkSubPermissions flag 2016-04-27 23:56:14 +03:00
Hillel Coren
4f926ec8b8 Fix for permissions in base service 2016-04-27 19:13:29 +03:00
Joshua Dwire
fe2a1fe66a Add Braintree support 2016-04-26 19:59:52 -04:00
Hillel Coren
2712f92422 Merge pull request #826 from joshuadwire/laravel-acl 
Laravel ACL
 2016-04-26 23:29:53 +03:00
Joshua Dwire
fc0d4d3edd Finish migrating to Laravel ACL 2016-04-25 21:53:39 -04:00
Joshua Dwire
b57ebbf8aa Fix card expiration formatting; store card details from all payment triggers 2016-04-25 10:06:27 -04:00
Hillel Coren
604c132a3a Temporary workaround to support not setting the CVC/CVV 2016-04-24 16:14:35 +03:00
Joshua Dwire
42c1f537bc Store/display credit card type, expiration and last 4 digits 2016-04-23 22:10:51 -04:00
Joshua Dwire
b8170f0324 Support refunds from the admin UI 2016-04-23 16:40:19 -04:00
Hillel Coren
b27505f63c Fix for saving invoice client with id/public_id 2016-04-21 13:01:36 +03:00
DraperStudio
c67564823b Use initialize method to set configuration 2016-04-19 22:02:46 +02:00
Joshua Dwire
22f65e8108 Finalize multi-plan support 
* Allow admins to change plan
* Check features instead of plans
* Support linking/unlinking accounts
* Support creating/deleting accounts
 2016-04-18 22:35:18 -04:00
Joshua Dwire
030d4ed4da Fix renewals; fix plan edge cases 2016-04-16 22:09:01 -04:00
Joshua Dwire
9b1bfef698 Add support for multiple plans/terms 2016-04-16 18:34:39 -04:00
Hillel Coren
3303c00067 Fix for Cybersource 2016-04-11 22:09:05 +03:00
Joshua Dwire
5e62d7d296 Allow documents to be attached to expenses 2016-03-24 18:15:52 -04:00
Joshua Dwire
ec1bc6f2cf Bug fixes 2016-03-17 10:11:14 -04:00
Joshua Dwire
67cc5599cc Remove unneeded check 2016-03-15 22:38:42 -04:00
Joshua Dwire
90e1f6695c Improve user permission support 
* Hide links based on permissions
* Restrict editing/creating within other UI
 2016-03-15 22:07:11 -04:00
Joshua Dwire
0148d06205 Add user permission support 2016-03-15 19:08:00 -04:00
Hillel Coren
d6697171f6 Show ‘Expired’ for overdue quotes in list view 2016-03-14 10:40:14 +02:00
Hillel Coren
7825378125 Fix for approving quotes 2016-03-11 00:29:07 +02:00
Hillel Coren
ed48fb1a3f Fix for checkouit.com integration 2016-03-09 16:58:21 +02:00
David Bomba
9744ad69b7 Localization API & PUSH 2016-03-03 13:28:16 +11:00
Hillel Coren
9efaada9f5 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-03-02 15:36:48 +02:00
Hillel Coren
aef4c6be98 Upgrade to Laravel 5.2 2016-03-02 15:36:42 +02:00
David Bomba
8a33f6fec6 Bug Fixes 2016-03-02 22:00:08 +11:00
David Bomba
b14f8e2dfe Bug fixes 2016-03-02 21:08:12 +11:00
David Bomba
2438195c08 Push Notifications 2016-03-01 14:00:11 +11:00
David Bomba
f1bc597034 Push Notifications 2016-03-01 13:57:59 +11:00
Hillel Coren
96e7fab55c Matched vendor when importing expenses 2016-02-27 22:41:23 +02:00
Hillel Coren
105321bdbb Upgraded to Laravel 5.1 2016-02-22 19:47:19 +02:00
Hillel Coren
9f2e82323d Fixed invalid payment if auto-billing with invalid token 2016-02-22 12:26:26 +02:00
Hillel Coren
7b735b9798 Hide action for main user in datatable 2016-02-17 21:33:15 +02:00
Hillel Coren
611d908112 Fixed sorting expenses by status 2016-02-17 15:55:31 +02:00
Hillel Coren
d1dd02644b Added 'overdue' status to invoice list 2016-02-11 21:12:50 +02:00
Hillel Coren
1794811f9b Added two week trial for hosted pro plan 2016-02-11 17:12:27 +02:00
Hillel Coren
e619bacf66 Fix for renewel logic 2016-02-04 22:50:30 +02:00
Hillel Coren
1284c29534 Enabled setting expense currency 2016-02-02 00:07:09 +02:00
Hillel Coren
25f5cdbcdd Added check to ensure expense currency matches client\invoice currency 2016-01-31 15:10:33 +02:00
Hillel Coren
89622f86e2 Fix for #661 2016-01-28 16:07:03 +02:00
Hillel Coren
a7f2d3354c Resolved issue with expenses and multi-tenancy 2016-01-27 20:31:08 +02:00
Hillel Coren
efc9ab4f9e Working on OFX support 2016-01-26 22:22:33 +02:00
Hillel Coren
74a3dcf9d2 Working on expenses 2016-01-23 23:36:31 +02:00
Hillel Coren
91187eb06d Bug fixes 2016-01-23 20:36:11 +02:00
Hillel Coren
360b59baa0 Working on expenses 2016-01-22 00:29:10 +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
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
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
steenrabol
48ce3f64e6 expenses 2016-01-06 20:52:09 +01:00
steenrabol
dba3a39559 Vendor management 2016-01-06 15:23:58 +01:00
Hillel Coren
06c1534093 Added getString helper to CSV import 2015-12-31 17:09:45 +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
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
991b19b2a2 Bug fixes 2015-12-24 13:17:11 +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
Hillel Coren
9603c43277 Bug fixes 2015-12-21 21:57:55 +02:00
Hillel Coren
372ffb0ea9 Bug fixes 2015-12-17 10:19:56 +02:00
Hillel Coren
4dc7a8d5f1 Working on email markup 2015-12-16 13:49:26 +02:00
Hillel Coren
08a4c4dcb4 Added email settings page 2015-12-15 22:25:12 +02:00
Hillel Coren
c5c5ff3458 Working on data import 2015-12-14 22:07:48 +02:00
Hillel Coren
19d5d49e63 Working on #427 2015-12-13 22:12:54 +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
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
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
cf458c52a2 Working on the API 2015-11-27 14:55:28 +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
Hillel Coren
61ed298699 Minor improvements 2015-11-21 23:10:26 +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
e93a7aa915 Bug fixes 2015-11-16 14:30:44 +02:00
Hillel Coren
03035e8bdf Bug fixes 2015-11-15 12:08:32 +02:00
Hillel Coren
b55a3226b7 Starting on stripejs 2015-11-09 21:24:22 +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
Hillel Coren
9b840a24dd Enabled social login 2015-11-01 20:21:11 +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
ab3de15381 Bug fixes 2015-10-21 15:40:31 +03:00
Hillel Coren
7150a148af Added PayPal buttonsource 2015-10-21 07:30:23 +03:00
Hillel Coren
88c215d1df Bug fixes 2015-10-20 11:23:38 +03:00
Hillel Coren
d34fbcf726 Styling forms 2015-10-14 20:18:19 +03:00
Hillel Coren
831c81a4b9 Improved settings navigation 2015-10-14 17:15:39 +03:00
Hillel Coren
1d04bc2a05 Added custom invoice text fields 2015-10-11 17:41:09 +03:00
Hillel Coren
cb16e7f950 Added support for basic markdown 2015-10-01 23:02:22 +03:00
Hillel Coren
bf85aa7ddd Bug fixes 2015-09-29 13:21:57 +03:00
Hillel Coren
6b063abe9a Bug fixes 2015-09-21 00:05:02 +03:00
Hillel Coren
4741fad4be Added auto-billing and per-client language support 2015-09-10 20:50:09 +03:00
Hillel Coren
8ed675ebe1 Working on users 2015-03-26 16:35:57 +02:00
root
32e78ef3da Bring in Laravel5 framework. 2015-03-12 10:44:39 +10:00