Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity
2,828 Commits 7 Branches 917 Tags 2 GiB
c9ef281206
Commit Graph

2828 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Hillel Coren
32d5a25f61 Enabled specifying invoice padding 2016-04-19 14:26:42 +03:00
Hillel Coren
cd52faa3bf Automatically disable live preview when using a large font 2016-04-19 14:12:02 +03:00
Hillel Coren
a805e2b8bb Merge pull request #814 from joshuadwire/enterprise-plan 
Enterprise plan
 2016-04-19 12:01:56 +03:00
Hillel Coren
9f5fe33059 Added page size and live preview settings 2016-04-19 10:51:57 +03: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
Hillel Coren
0c27e22b51 Brought back error page in production 2016-04-18 20:17:02 +03:00
Hillel Coren
4a8c02d5fd Updated Omnipay 2016-04-18 12:58:21 +03:00
Hillel Coren
11019e5dc1 Improved HTML email margins 2016-04-18 10:28:30 +03:00
Hillel Coren
4ff23306b9 Merge pull request #813 from rafaelsisweb/develop 
Update pt_BR translate new texts
 2016-04-18 10:13:23 +03:00
rafael.sisweb
93ab0e4308 Improve pt_BR translate new texts 2016-04-17 21:36:22 -04:00
Joshua Dwire
454e9bc861 Refactor getPlanDetails 2016-04-17 12:55:03 -04:00
Hillel Coren
4248963d92 Check if is_primary is set when sorting contacts 2016-04-17 14:03:37 +03:00
David Bomba
76f5ef92f7 Merge pull request #811 from turbo124/develop 
Sort Contacts
 2016-04-17 20:54:55 +10:00
David Bomba
d19c43edce contacts array sorter 2016-04-17 20:53:53 +10:00
David Bomba
7f6f34b302 contacts array sorter 2016-04-17 20:50:06 +10:00
David Bomba
57c0a91de8 contacts array sorter 2016-04-17 20:45:24 +10:00
David Bomba
edf7b6eb37 contacts array sorter 2016-04-17 20:42:51 +10:00
David Bomba
b022ae0c77 contacts array sorter 2016-04-17 20:42:30 +10:00
David Bomba
b49938e36d contacts array sorter 2016-04-17 20:40:23 +10:00
Hillel Coren
ed8abc5382 Added more data to travis debug 2016-04-17 13:13:37 +03:00
Hillel Coren
af5b5f4458 Improve report name 2016-04-17 13:08:58 +03:00
David Bomba
c84d75e7bf Merge remote-tracking branch 'upstream/develop' into develop 2016-04-17 19:42:14 +10:00
David Bomba
4b42cf700e minor changes 2016-04-17 19:41:46 +10:00
Hillel Coren
f31ab2eef1 Enable setting contact's public_id as id 2016-04-17 12:39:52 +03:00
Hillel Coren
7d08a7cddd Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-04-17 12:22:51 +03:00
Hillel Coren
cae1e2c77a Merge pull request #810 from joshuadwire/attached-documents 
Fix logo filesystem usage
 2016-04-17 12:21:52 +03:00
Joshua Dwire
63b2c2c6b1 More intuitive account management page 2016-04-16 22:28:11 -04:00
Joshua Dwire
030d4ed4da Fix renewals; fix plan edge cases 2016-04-16 22:09:01 -04:00
Joshua Dwire
089349b591 Complete companies migration 2016-04-16 20:15:17 -04:00
Joshua Dwire
b4b8396c0f Fix documents migration 2016-04-16 20:15:02 -04:00
Joshua Dwire
e0568faae1 Merge pull request #3 from joshuadwire/attached-documents 
Fix logo filesystem usage
 2016-04-16 19:17:34 -04:00
Joshua Dwire
33b8566d18 Fix logo filesystem usage 2016-04-16 19:14:43 -04:00
Joshua Dwire
9b1bfef698 Add support for multiple plans/terms 2016-04-16 18:34:39 -04:00
Joshua Dwire
51cd82cba8 Move cancel account to new account management page 2016-04-16 10:58:53 -04:00
Hillel Coren
b2de7c84eb Changed /forgot to /recover_password 2016-04-15 13:25:58 +03:00
Hillel Coren
2772eb82cf Updating PDF.js compatability.js 2016-04-15 13:10:26 +03:00
Hillel Coren
fb9a2de240 Working on TaxRates test 2016-04-15 10:25:26 +03:00
Hillel Coren
2f2081b4b0 Fix for #808 Set date to today when cloning 2016-04-14 16:35:03 +03:00
Hillel Coren
a705c61d47 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-04-14 16:09:25 +03:00
Hillel Coren
82c599683a Hid converted quotes from the dashboard 2016-04-14 16:08:28 +03:00