Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 15:13:29 +01:00
Code Issues Releases Activity
3,482 Commits 9 Branches 923 Tags 2 GiB
ad65b61a80
Commit Graph

253 Commits

Author SHA1 Message Date
Joshua Dwire
41f4c98e08 Merge remote-tracking branch 'upstream/develop' into payments-changes 2016-05-10 10:25:42 -04:00
Joshua Dwire
20f6f32a06 Update UI for configuring auto bill 2016-05-09 16:29:02 -04:00
Hillel Coren
eb814eec71 Added Czech #844 2016-05-08 18:57:32 +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
9a64db3234 Allow client to choose auto bill settings 2016-05-06 13:26:37 -04:00
Hillel Coren
5249ae0291 Added Pakistani Rupee 2016-05-05 22:49:09 +03:00
Hillel Coren
296d75bb1b Limit random test fonts 2016-05-05 22:32:26 +03:00
Hillel Coren
c12514b07f Added random font to test account 2016-05-05 22:27:02 +03:00
Hillel Coren
ecbe6104f8 Fix for travis 2016-05-05 22:12:33 +03:00
Hillel Coren
54be2f0b84 Improvements to the user table seeder 2016-05-05 20:18:02 +03:00
Hillel Coren
501958cc1e Added language seeder 2016-05-05 11:55:09 +03:00
Hillel Coren
9ebb539cce API optimizations 2016-05-04 14:53:27 +03:00
Joshua Dwire
ed1f2b6044 Handle failed payments 2016-04-30 17:54:56 -04:00
Joshua Dwire
1cb2b9dc25 Use existing PaymentType instead of CardType 2016-04-27 22:13:51 -04:00
Joshua Dwire
fe2a1fe66a Add Braintree support 2016-04-26 19:59:52 -04: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
ad68d64dca Changes for white label license 2016-04-21 22:01:17 +03:00
Hillel Coren
b27505f63c Fix for saving invoice client with id/public_id 2016-04-21 13:01:36 +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
Hillel Coren
5c4b75cf76 Fix for tests 2016-04-20 00:02:02 +03:00
Hillel Coren
d37794d402 Fix for tests 2016-04-19 23:28:25 +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
Joshua Dwire
b8ad27963e Fix table name in migration 2016-04-19 10:30:25 -04: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
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
9b1bfef698 Add support for multiple plans/terms 2016-04-16 18:34:39 -04:00
Hillel Coren
b285b58767 Created update seeder 2016-04-14 11:12:37 +03:00
Hillel Coren
ba3aaf47fd Added flag to disable client portal dashboard 2016-03-31 12:32:31 +03:00
Hillel Coren
be9e7beaed Support for multiple tax rates 2016-03-31 12:29:01 +03:00
Hillel Coren
d2d22fbb50 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 
Conflicts:
	resources/views/invoices/knockout.blade.php
 2016-03-27 18:20:48 +03:00
Hillel Coren
d70bc4e922 Support multiple tax rates 2016-03-27 18:06:02 +03:00
Joshua Dwire
e6056104bd Display documents and zip download on client invoice page 2016-03-23 22:41:19 -04:00
Joshua Dwire
f7d8f819b6 Add option to attach documents to invoice email 2016-03-23 19:20:08 -04:00
Joshua Dwire
942f543bbb Display documents in invoice PDF 2016-03-23 18:40:42 -04:00
Joshua Dwire
d810ba7f6b Improved document support 2016-03-23 15:41:05 -04:00
Joshua Dwire
88808d44bf Add support for invoice attachments 2016-03-22 22:23:45 -04:00
Joshua Dwire
5640c74f35 Migrate logos to use Laravel Filesystem 2016-03-22 16:19:55 -04:00
Hillel Coren
9a29efbc6f Merge pull request #771 from joshuadwire/user-permissions 
User permissions
 2016-03-17 09:54:36 +02:00
Hillel Coren
8cd56fa969 Minor fixes 2016-03-17 09:54:32 +02:00
Joshua Dwire
0148d06205 Add user permission support 2016-03-15 19:08:00 -04:00
vincentdh
a74ede6cf7 Create 2016_03_14_214710_add_support_three_decimal_taxes.php 
Changes made to the DB to support 3 decimals tax rates.
 2016-03-14 21:49:52 -04:00
Hillel Coren
bddc4dd915 Merge branch 'lang_ja' of git://github.com/mzdakr/invoiceninja into mzdakr-lang_ja 
Conflicts:
	app/Providers/AppServiceProvider.php
	database/seeds/CurrenciesSeeder.php
 2016-03-13 13:35:32 +02:00
Akira Matsuda
c736694860 Added seed data for Japanese 2016-03-10 00:37:28 +09:00
Akira Matsuda
83e60c7188 Add Japanese fonts. 2016-03-10 00:18:14 +09:00
Hillel Coren
1fb74a0355 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-03-08 19:32:36 +02:00
Hillel Coren
83dd90b385 Fix for Unknown or bad timezone (Greenland) 2016-03-07 20:16:33 +02:00
Joshua Dwire
d0d30e1e26 Add support for including password in email; include portal customizations 2016-03-05 18:09:50 -05:00
Joshua Dwire
903904d423 Merge Laravel 5.2 upgrade 2016-03-03 21:57:15 -05:00
Hillel Coren
eb6cd45913 Minor fixes 2016-03-03 21:39:15 +02:00
Hillel Coren
aef4c6be98 Upgrade to Laravel 5.2 2016-03-02 15:36:42 +02:00
Hillel Coren
e5fac72e01 Bug fix for migration down 2016-03-01 11:27:10 +02:00
Hillel Coren
b2d9ac0468 Removed Neteller driver 2016-03-01 10:23:58 +02:00
Joshua Dwire
6376302ed9 Add option for client portal password 2016-02-29 16:46:27 -05:00
Hillel Coren
2153a8e227 Added custom invoice item fields 2016-02-28 13:59:52 +02:00
Hillel Coren
694929c05e Broke up seeders 2016-02-27 22:12:38 +02:00
Hillel Coren
92e5bf60d8 Broke up seeders 2016-02-27 22:12:22 +02:00
Hillel Coren
7da1a37771 Added Romanina New Leu 2016-02-21 15:26:27 +02:00
Hillel Coren
ce1717cf53 Fix for issue updating 2016-02-05 10:48:10 +02:00
Hillel Coren
7b5cd4f31c Fix for fonts seeder 2016-02-04 23:09:03 +02:00
Hillel Coren
024e1eb046 Fix for issues when updating 2016-02-04 22:58:34 +02:00
Hillel Coren
b33c896beb Fix migration down 2016-02-03 14:12:55 +02:00
Hillel Coren
86b6d9dc10 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-02-03 10:08:35 +02:00
Hillel Coren
5657f480bc Corrected date format 2016-02-03 10:07:14 +02:00
David Bomba
6683062d9e fixed bug in migration 2016-02-03 09:10:54 +11:00
Hillel Coren
1284c29534 Enabled setting expense currency 2016-02-02 00:07:09 +02:00
Hillel Coren
387f89440c Add Header/Footer options to invoice design settings 2016-01-31 23:42:20 +02:00
Hillel Coren
40786c3668 Bug fix and new fields 2016-01-27 19:42:40 +02:00
Hillel Coren
9c96f09fc0 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-26 22:22:40 +02:00
Hillel Coren
efc9ab4f9e Working on OFX support 2016-01-26 22:22:33 +02:00
trigras
7278905bb2 date picker format fixed 2016-01-24 23:08:27 +02:00
Hillel Coren
c96c91ec88 Fix for #647 2016-01-24 09:21:20 +02:00
Hanne Nijhuis
ccbdb68bb1 Fixed the vendors migration error dealing with unique values 2016-01-23 22:05:43 +01:00
Hillel Coren
91187eb06d Bug fixes 2016-01-23 20:36:11 +02:00
Hanne Nijhuis
c7b8f39e9f Fixed typo in migration vendors table 2016-01-23 12:20:50 +01:00
Hillel Coren
7a26dd610c Working on expenses 2016-01-21 22:36:49 +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
e7a658aaf6 Expenses bug fix 2016-01-19 14:01:19 +01:00
Hillel Coren
332e4984c4 Show currency code after amount 2016-01-18 16:35:05 +02:00
Hillel Coren
9f85f582e0 Added Aruban Florin currency 2016-01-18 12:41:15 +02:00
Hillel Coren
cbe2b2905e Added autolink to emails and fixed checkout.com integration 2016-01-18 10:30:42 +02:00
steenrabol
6133c6ff07 Merge branch 'master' of https://github.com/invoiceninja/invoiceninja 
# Conflicts:
#	app/Http/Controllers/InvoiceController.php
#	resources/lang/en/texts.php
#	resources/views/invoices/edit.blade.php
 2016-01-11 20:39:18 +01:00
steenrabol
3e9e28f06f Expense module 2016-01-10 11:25:05 +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
Hillel Coren
56d4aaef66 Added support for Chinese 2016-01-08 00:19:44 +02: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
Hillel Coren
acbfa46062 Bug fix 2016-01-07 13:16:12 +02:00
Hillel Coren
2dc3ce9128 Added early_access field 2016-01-07 13:11:09 +02:00