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
3,199 Commits 7 Branches 917 Tags 2 GiB
607fb58c29
Commit Graph

285 Commits

Author SHA1 Message Date
Hillel Coren
cca6dcfc4a Merge pull request #878 from benb969/invoices_types 
add support to multiple invoice types
 2016-05-29 12:21:57 +03:00
ben
dadac05532 add support to multiple invoice types 2016-05-29 12:02:44 +03:00
Hillel Coren
2043621ac9 Fix for deleting documents 2016-05-26 19:02:53 +03:00
Hillel Coren
ea2f154b1f Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-05-24 10:18:21 +03:00
Hillel Coren
7cc29de881 Bumped version 2016-05-24 10:18:10 +03:00
David Bomba
5f928ecf01 Merge remote-tracking branch 'upstream/develop' into develop 2016-05-24 14:26:19 +10:00
Hillel Coren
541b19cd5f Updated vendor expenses to new datatable class 2016-05-23 21:03:01 +03:00
Hillel Coren
260b9212b9 Renamed PublicClientController to ClientPortalController 2016-05-23 11:31:49 +03:00
David Bomba
1e370d2cce Implement DocumentAPIController 2016-05-21 18:44:53 +10:00
Hillel Coren
6caf1ff30d Minor fixes 2016-05-19 09:47:57 +03:00
Hillel Coren
8be1771f47 Bumped version number 2016-05-18 10:12:33 +03: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
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
f6942a199f Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-05-15 21:21:59 -04:00
Hillel Coren
b067697b1c Support manually importing OFX files 2016-05-15 13:58:11 +03:00
Joshua Dwire
d99d81d655 Make autobill setting numbers match token settings 2016-05-14 23:15:22 -04:00
Joshua Dwire
1524447cd4 WePay fixes; support account updater 2016-05-14 22:22:06 -04:00
Joshua Dwire
ce04c994dd Support payments and storing cards via WePay. 2016-05-13 09:30:22 -04:00
Joshua Dwire
ba000546c4 Better WePay switching 2016-05-12 11:09:07 -04:00
Joshua Dwire
88c9fc1ac1 Add WePay configuration UI 2016-05-11 22:55:37 -04:00
David Bomba
e738a58a42 Merge pull request #858 from turbo124/develop 
Permissions fields for Invoice Transformer
 2016-05-12 08:29:55 +10:00
Joshua Dwire
fc029a62e1 Merge remote-tracking branch 'upstream/develop' into payments-changes 2016-05-10 22:32:28 -04:00
Joshua Dwire
dcf231c6a5 Fix gateway ids 2016-05-10 21:30:52 -04:00
Joshua Dwire
88ec714cd5 Store Stripe card summary locally 2016-05-10 18:46:32 -04:00
Hillel Coren
147c51f6f9 Clean up diffs between branches 2016-05-10 22:39:54 +03:00
Hillel Coren
1a4984cb2d Bumped version number to 2.5.2 2016-05-10 21:30:48 +03:00
Hillel Coren
ee7dbc710c Updated version 2016-05-10 21:27:17 +03:00
Joshua Dwire
41f4c98e08 Merge remote-tracking branch 'upstream/develop' into payments-changes 2016-05-10 10:25:42 -04:00
David Bomba
e795ac28cd Merge remote-tracking branch 'upstream/develop' into develop 2016-05-10 09:26:15 +10:00
Joshua Dwire
20f6f32a06 Update UI for configuring auto bill 2016-05-09 16:29:02 -04:00
David Bomba
5197db449e Merge remote-tracking branch 'upstream/develop' into develop 2016-05-09 09:03:39 +10:00
Hillel Coren
9b0f086cbd Only show user’s own tokens 2016-05-08 21:50:35 +03:00
Hillel Coren
06437327fc Fixed change password for non-admins 2016-05-08 21:31:23 +03:00
Hillel Coren
fec948f1e8 Fixed searching for non-admins 2016-05-08 21:29:49 +03:00
Hillel Coren
594b0e1bef Implemented server-side analytics tracking for revenue 2016-05-08 16:54:16 +03:00
Joshua Dwire
0fc44962d4 Add Braintree/PayPal support 2016-05-06 22:33:03 -04:00
David Bomba
1bef3b0791 Merge remote-tracking branch 'upstream/develop' into develop 2016-05-07 08:44:39 +10:00
Joshua Dwire
cf98c37f40 Better Braintree support 2016-05-06 17:05:42 -04:00
Joshua Dwire
9a64db3234 Allow client to choose auto bill settings 2016-05-06 13:26:37 -04:00
Hillel Coren
c79d9fe24c Added preview for email templates 2016-05-05 17:46:22 +03:00
David Bomba
c551077a7b Merge remote-tracking branch 'upstream/develop' into develop 2016-05-03 10:17:45 +10:00
Hillel Coren
65d70c620e Enabled setting per_page for API results 2016-05-02 23:06:36 +03:00
David Bomba
7cac31e7a6 Fix for cloning invoices from API 2016-05-02 19:40:54 +10:00
Hillel Coren
1d6011caad Working on permissions in the API 2016-05-02 11:38:01 +03:00
Hillel Coren
933f2968d6 Working on form requests 2016-05-01 22:30:39 +03: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