Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 16:31:33 +02:00
Code Issues Releases Activity
3,085 Commits 7 Branches 902 Tags 2 GiB
f873998e22
Commit Graph

1926 Commits

Author SHA1 Message Date
Hillel Coren
f873998e22 Simplified reseller setup 2016-05-13 12:23:13 +03:00
Hillel Coren
fba37171ae Support query counter in webapp as well as API 2016-05-13 12:08:41 +03:00
Hillel Coren
3202d2480f Fix for saving client portal setting in self host 2016-05-12 20:26:36 +03:00
Hillel Coren
110af6f28b Fix for #859 2016-05-12 12:44:22 +03:00
David Bomba
e738a58a42 Merge pull request #858 from turbo124/develop 
Permissions fields for Invoice Transformer
 2016-05-12 08:29:55 +10:00
David Bomba
7c0e2f4420 added in additional fields for Invoice Transformer 2016-05-12 08:28:49 +10:00
David Bomba
2b23a80fda rewind 2016-05-12 08:27:21 +10: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
fc029a62e1 Merge remote-tracking branch 'upstream/develop' into payments-changes 2016-05-10 22:32:28 -04:00
Joshua Dwire
258401715c Update billing address when adding payment method 2016-05-10 22:15:32 -04:00
Joshua Dwire
dcf231c6a5 Fix gateway ids 2016-05-10 21:30:52 -04:00
Joshua Dwire
6138e1132f Make sure payments reference newly added payment methods 2016-05-10 19:18:12 -04:00
Joshua Dwire
104264607b Pad last 4 card digits to a string of length 4, since we're storing it as an int 2016-05-10 19:17:55 -04:00
Joshua Dwire
b8514436a9 Pad last 4 card digits to a string of length 4, since we're storing it as an int 2016-05-10 19:17:41 -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
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
050b79cc75 user transformer - add fields 2016-05-10 09:26:44 +10: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
Hillel Coren
7317bfc8c9 Fixed issue with invoice history 2016-05-09 20:35:50 +03:00
Hillel Coren
8bd2e84bc8 Track plan start date when manually applying a license 2016-05-09 15:07:01 +03:00
David Bomba
dbdd1ac155 working with permissions 2016-05-09 10:28:47 +10:00
David Bomba
5233047ab1 working with permissions 2016-05-09 10:09:51 +10:00
David Bomba
985c4eda34 working with permissions 2016-05-09 10:02:15 +10:00
David Bomba
f6abdedfac User Transformer permissions 2016-05-09 09:54:40 +10: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
Hillel Coren
7c67e66fb0 Sync ninja client when updating plan 2016-05-08 15:37:32 +03:00
David Bomba
b16ab9058f Merge remote-tracking branch 'upstream/develop' into develop 2016-05-08 18:48:31 +10:00
Hillel Coren
eff9ba5ac0 Merge pull request #846 from Rayvw/feature/improve-dynamic-dates 
Improved dynamic dates of recurring invoices
 2016-05-08 11:20:18 +03:00
Hillel Coren
89b5d73615 Fix for loading tokens 2016-05-08 10:05:16 +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
Raymond
986156117e Copy custom values of invoice items 2016-05-07 15:29:27 +02:00
Raymond
e4ce4e0fc8 Added dynamic dates to custom invoice fields + fixed bug in processing of notes, terms and footer. 2016-05-07 15:06:56 +02:00
Raymond
320e11fedb Fixed bug processing date variables upon saving a recurring invoice 2016-05-07 11:39:34 +02: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
d27822e17b Merge pull request #5 from joshuadwire/laravel-acl 
Laravel acl
 2016-05-06 15:08:48 -04:00