Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-11 21:52:35 +01:00
Code Issues Releases Activity
3,120 Commits 7 Branches 919 Tags 2 GiB
bc0cd4ee52
Commit Graph

3120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hillel Coren
f77657f1c1 Update log filenames in travis file 2016-04-27 17:10:27 +03:00
Hillel Coren
6f5a68e1f5 Fixed bug in vendor controller 2016-04-27 16:36:44 +03:00
Hillel Coren
6ba27c2475 Fixed problem sorting data tables by client 2016-04-27 11:49:54 +03:00
Hillel Coren
bc2880f05e Merge pull request #828 from joshuadwire/laravel-acl 
Don't require new ucwords signature for ACL
 2016-04-27 08:51:39 +03:00
David Bomba
38a1757b10 Merge remote-tracking branch 'upstream/develop' into develop 2016-04-27 13:27:05 +10:00
Joshua Dwire
91efade7f7 Don't require new ucwords signature 2016-04-26 20:06:19 -04:00
Joshua Dwire
1a12cd30d3 Hide autobill when both Stripe and Braintree are not configured 2016-04-26 20:02:52 -04:00
Joshua Dwire
fe2a1fe66a Add Braintree support 2016-04-26 19:59:52 -04:00
Hillel Coren
782cda4004 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-04-26 23:31:31 +03:00
Hillel Coren
2712f92422 Merge pull request #826 from joshuadwire/laravel-acl 
Laravel ACL
 2016-04-26 23:29:53 +03:00
Hillel Coren
996b6d4ce6 Fixed typo in text files 2016-04-26 21:11:41 +03:00
Hillel Coren
f28e0cd76b Fix for JS rounding problem 2016-04-26 12:41:34 +03:00
David Bomba
960802827a Document Transformer 2016-04-26 15:16:25 +10:00
Joshua Dwire
fc0d4d3edd Finish migrating to Laravel ACL 2016-04-25 21:53:39 -04:00
David Bomba
6a7cfdeb64 Merge remote-tracking branch 'upstream/develop' into develop 2016-04-26 11:52:43 +10:00
Joshua Dwire
af415afd2f Show payments without card details 2016-04-25 11:06:52 -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
cfb4dc4351 Hide zapier button for resellers 2016-04-24 20:41:30 +03:00
Hillel Coren
71b1a9c209 Improved filtering the payment list 2016-04-24 16:34:48 +03:00
Hillel Coren
604c132a3a Temporary workaround to support not setting the CVC/CVV 2016-04-24 16:14:35 +03:00
Joshua Dwire
6e3b53f3cb Make expiration table wrap with expiration date 2016-04-23 22:31:39 -04:00
Joshua Dwire
42c1f537bc Store/display credit card type, expiration and last 4 digits 2016-04-23 22:10:51 -04:00
Hillel Coren
07f50d188f Fix for partial invoice label on PDF 2016-04-24 00:08:16 +03:00
Joshua Dwire
b8170f0324 Support refunds from the admin UI 2016-04-23 16:40:19 -04:00
Joshua Dwire
fdf1b25b16 Begin adding authorization policies 2016-04-23 11:52:36 -04:00
Hillel Coren
ad68d64dca Changes for white label license 2016-04-21 22:01:17 +03:00
Hillel Coren
f9c36fd761 Fix for saving invoice client with id/public_id 2016-04-21 13:02:19 +03:00
Hillel Coren
b27505f63c Fix for saving invoice client with id/public_id 2016-04-21 13:01:36 +03:00
Hillel Coren
cf75a2c2d2 Merge pull request #823 from joshuadwire/enterprise-plan 
Fix refunds; support using stored card; change proPlanModel link
 2016-04-21 10:39:34 +03:00
David Bomba
b6c862aa46 Merge branch 'develop' of https://github.com/turbo124/invoiceninja into develop 
iiiiiespecially if it merges an updated upstream into a topic branch.
 2016-04-21 12:32:06 +10:00
Joshua Dwire
9d27b68fb6 Fix refunds; support using stored card; change proPlanModel link 2016-04-20 16:53:56 -04:00
Hillel Coren
9dd1a106a9 Merge pull request #821 from DraperStudio/develop 
Use object_get to retrieve a config field
 2016-04-20 19:50:23 +03:00
Hillel Coren
6711678fbe Merge pull request #822 from joshuadwire/enterprise-plan 
Improve enterprise plan migration
 2016-04-20 19:42:46 +03:00
Joshua Dwire
71b6b6eb87 More robust migration; avoids timeout failures 2016-04-20 11:47:38 -04:00
Joshua Dwire
b5b3fa56ac Don't try to migrate nonexistent accounts 2016-04-20 09:50:13 -04:00
DraperStudio
d87552c90e Use object_get to retrieve a config field 2016-04-20 13:37:57 +02:00
Hillel Coren
9281cd5ba2 Fix for default quote terms 2016-04-20 11:04:54 +03:00
Hillel Coren
eaa4ffab0e Merge pull request #818 from DraperStudio/develop 
Use initialize method to set configuration
 2016-04-20 10:14:21 +03:00
Hillel Coren
5c4b75cf76 Fix for tests 2016-04-20 00:02:02 +03:00
Hillel Coren
c9ef281206 Merge pull request #819 from joshuadwire/enterprise-plan 
Fix typos in enterprise plan changes
 2016-04-19 23:44:14 +03:00
Joshua Dwire
eb91a3cd42 Fix typos 2016-04-19 16:31:50 -04:00
Hillel Coren
d37794d402 Fix for tests 2016-04-19 23:28:25 +03:00
DraperStudio
c67564823b Use initialize method to set configuration 2016-04-19 22:02:46 +02:00
Hillel Coren
d6608f863c Syntax fix 2016-04-19 23:01:44 +03:00
Hillel Coren
0dcee794b5 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 
Conflicts:
	resources/lang/en/texts.php
	resources/views/accounts/invoice_design.blade.php
	resources/views/invoices/edit.blade.php
 2016-04-19 22:48:03 +03:00
Hillel Coren
d07fec5d62 Fix for #816 preg_match() error on settings update 2016-04-19 21:46:18 +03:00
Hillel Coren
fb975db1f2 Merge pull request #815 from joshuadwire/enterprise-plan 
Enterprise plan bug fixes
 2016-04-19 17:40:17 +03:00
Joshua Dwire
b8ad27963e Fix table name in migration 2016-04-19 10:30:25 -04:00
Joshua Dwire
0fd39e5be0 Only allow pro trials 2016-04-19 10:28:27 -04:00
Joshua Dwire
639a3c321a Restrict documents to non-trial; allow resellers to override features 2016-04-19 10:26:29 -04:00