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
4,419 Commits 9 Branches 923 Tags 2 GiB
3a65c8905c
Commit Graph

541 Commits

Author SHA1 Message Date
Hillel Coren
df3a103825 Added missing report field 2016-05-13 15:26:22 +03: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
Hillel Coren
7ad81bdf5e Merge pull request #856 from bSzala/translation 
Working on polish translations
 2016-05-11 23:18:29 +03:00
Bartlomiej Szala
ae6d85bb49 Working on texts translations 2016-05-11 20:59:40 +02:00
Joshua Dwire
fc029a62e1 Merge remote-tracking branch 'upstream/develop' into payments-changes 2016-05-10 22:32:28 -04:00
Joshua Dwire
88ec714cd5 Store Stripe card summary locally 2016-05-10 18:46:32 -04:00
Hillel Coren
a503697152 Updated lang files 2016-05-10 21:25:57 +03:00
Hillel Coren
ee579f91f3 Added plan help text 2016-05-10 21:17:46 +03:00
Joshua Dwire
41f4c98e08 Merge remote-tracking branch 'upstream/develop' into payments-changes 2016-05-10 10:25:42 -04:00
Hillel Coren
d34441b039 Merge translation fix #796 2016-05-10 12:26:30 +03:00
Hillel Coren
e7e7476505 Merge translation fix #825 2016-05-10 12:24:21 +03:00
Hillel Coren
d56a75ca5e Merge translation fix #832 2016-05-10 12:22:50 +03: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
Hillel Coren
f2e651d53f Added message if adding users insn't supported 2016-05-08 12:59: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
Joshua Dwire
70b9c9bba7 Require authorization for ACH 2016-05-06 11:21:06 -04:00
Joshua Dwire
77bd6f7bc5 Restyle add bank account page 2016-05-06 10:50:50 -04:00
Hillel Coren
47cd8a0a33 Added preview for email templates 2016-05-05 19:43:44 +03:00
Hillel Coren
c79d9fe24c Added preview for email templates 2016-05-05 17:46:22 +03:00
Hillel Coren
7744c6c41c White label changes 2016-05-05 09:58:14 +03:00
Hillel Coren
ef2bc3d811 White label changes 2016-05-05 09:52:59 +03:00
Hillel Coren
8972ceab62 Merge pull request #840 from bSzala/polishtranslations 
Add polish translations
 2016-05-03 19:45:20 +03:00
emiliolodigiani
5295bf30fc Revert typo fix 2016-05-03 15:11:34 +02:00
emiliolodigiani
fb473eeb3b Update italian translation 2016-05-03 15:09:13 +02:00
Bartlomiej Szala
39141d469f Add polish translations 2016-05-03 12:47:26 +00:00
Joshua Dwire
d78b874838 Add Plaid support 2016-04-30 22:45:51 -04: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
Christian González
ac57dcdcc3 Changed "Klient" to "Kunde" to be consistent. 2016-04-29 21:57:18 +02:00
Christian González
c9ac804e5f Some more German translations 
I left out some strings when I was not completely sure about.
 2016-04-29 21:54:38 +02:00
Joshua Dwire
e5fb354643 Support configuring Stripe for ACH and Plaid 2016-04-28 16:38:01 -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
Hillel Coren
996b6d4ce6 Fixed typo in text files 2016-04-26 21:11:41 +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
Joshua Dwire
b8170f0324 Support refunds from the admin UI 2016-04-23 16:40:19 -04: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
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
rafael.sisweb
93ab0e4308 Improve pt_BR translate new texts 2016-04-17 21:36:22 -04:00
Joshua Dwire
63b2c2c6b1 More intuitive account management page 2016-04-16 22:28:11 -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
Raymond
20b982216f Updated many dutch lang records 2016-04-14 12:33:03 +02:00
Hillel Coren
9b8b150766 Implemented enable_client_portal_dashboard 2016-04-13 22:08:41 +03:00
emiliolodigiani
c49de3cfd5 Update italian texts 2016-04-12 17:16:13 +02:00
Hillel Coren
f91f32323f Reworking taxes 2016-03-29 17:30:28 +03:00
Joshua Dwire
bb6e0b5186 Make dropzone translatable 2016-03-24 18:45:00 -04:00
Joshua Dwire
5e62d7d296 Allow documents to be attached to expenses 2016-03-24 18:15:52 -04:00
Joshua Dwire
cd8290946e Add client portal documents tab 2016-03-24 11:58:30 -04:00
Joshua Dwire
1c5c45a1e1 Improved handling of various document types; better documents zip 2016-03-24 11:33:28 -04:00
Joshua Dwire
e6056104bd Display documents and zip download on client invoice page 2016-03-23 22:41:19 -04:00
Joshua Dwire
2a7e8cb4b7 Add documents placeholder for emails 2016-03-23 21:25:33 -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
88808d44bf Add support for invoice attachments 2016-03-22 22:23:45 -04:00
Hillel Coren
9336605788 Updated language files 2016-03-22 19:50:55 +02:00
Hillel Coren
5c1e9900d3 Fix for #779 2016-03-22 16:37:14 +02:00
Hillel Coren
ddbc254d4b Add link to payments from invoice page 2016-03-22 15:17:46 +02:00
Hillel Coren
c9e0119bc2 Added permissions settings help 2016-03-21 22:00:59 +02:00
Hillel Coren
09414ca3f5 Fix for #776 Deleting expense vendor results in error 2016-03-19 23:30:23 +02:00
Hillel Coren
c3c7f25b32 Clarified partial labels 2016-03-18 14:34:46 +02:00
Hillel Coren
9b9e99ee78 Added SagePay referral 2016-03-17 15:28:28 +02:00
Hillel Coren
9a29efbc6f Merge pull request #771 from joshuadwire/user-permissions 
User permissions
 2016-03-17 09:54:36 +02:00
Joshua Dwire
90e1f6695c Improve user permission support 
* Hide links based on permissions
* Restrict editing/creating within other UI
 2016-03-15 22:07:11 -04:00
Joshua Dwire
0148d06205 Add user permission support 2016-03-15 19:08:00 -04:00
Hillel Coren
e0499ccf67 Show 'Create first invoice' for sample message 2016-03-15 22:24:09 +02:00
Hillel Coren
4e27b52618 Update import error message 2016-03-15 17:35:36 +02:00
Hillel Coren
f32a497d0d Fix for tax rates test 2016-03-15 16:55:23 +02:00
Hillel Coren
ad12557c78 Fix for tax rates test 2016-03-15 15:25:00 +02:00
Hillel Coren
0621817660 Added client side card check with StripeJS 2016-03-14 12:12:09 +02:00
Hillel Coren
d6697171f6 Show ‘Expired’ for overdue quotes in list view 2016-03-14 10:40:14 +02: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
Hillel Coren
43cd7910f8 Merge #763 2016-03-09 20:34:45 +02:00
Akira Matsuda
6c0c68eead Added some jp texts. 2016-03-10 00:54:21 +09:00
Akira Matsuda
e2db55924a add Japanese language. 50% translated. 2016-03-09 21:30:16 +09: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
3b5311e960 Added setting to show/hide client portal dashboard 2016-03-01 09:36:37 +02:00
Joshua Dwire
6376302ed9 Add option for client portal password 2016-02-29 16:46:27 -05:00
Hillel Coren
553c548f31 Enabled setting recurring invoice number prefix 2016-02-28 20:36:11 +02:00
Hillel Coren
2153a8e227 Added custom invoice item fields 2016-02-28 13:59:52 +02:00
Hillel Coren
4a749d5868 Improvements to custom designer 2016-02-25 20:34:23 +02:00
Hillel Coren
01f9634237 Improvements to data export 2016-02-25 11:25:07 +02:00
Hillel Coren
88fcc05902 Implemented basic expense report 2016-02-24 23:54:43 +02:00
Hillel Coren
a1d13cc84c Improvements to the tax report 2016-02-24 22:58:42 +02:00
Hillel Coren
1c864f4304 Added tax report 2016-02-23 23:32:39 +02:00
Hillel Coren
3ca89b2792 Added navigation to search 2016-02-22 23:23:28 +02:00
Hillel Coren
bb817f8afe Working on Travis 2016-02-18 19:14:51 +02:00
Hillel Coren
5b024b23a7 Changed dataviz to red/green 2016-02-18 09:50:11 +02:00
Hillel Coren
eac4c823d3 Made expense currency conversion hidden by default 2016-02-17 13:06:03 +02:00
Hillel Coren
ae6a81ea48 Added improved fr_CA translation 2016-02-15 20:22:02 +02:00
Christian González
e400b07d0d some more German translations 
I added a few inline comments where I was not sure how to translate.
 2016-02-12 22:20:06 +01:00
Hillel Coren
f2829b9c7c Updated language files 2016-02-11 21:42:36 +02:00
Hillel Coren
b5f817cf14 Changed future white-label licenses to one year 2016-02-11 21:27:58 +02:00
Hillel Coren
d1dd02644b Added 'overdue' status to invoice list 2016-02-11 21:12:50 +02:00
Hillel Coren
1794811f9b Added two week trial for hosted pro plan 2016-02-11 17:12:27 +02:00
Hillel Coren
1b740d77fc Made word shorter 2016-02-07 21:16:47 +02:00
ridgarou
502135a977 Fix es_ES traslations 2016-02-07 03:51:40 +01:00
Hillel Coren
8a9eb97134 Working on enabling showing currency code 2016-02-04 16:19:49 +02:00
Hillel Coren
8d69d4334b Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-02-04 16:12:29 +02:00
Hillel Coren
2b3e35687a Bug fixes 2016-02-04 16:12:22 +02:00
ridgarou
e5138120d9 Update new texts translations 2016-02-04 10:39:00 +01:00
Hillel Coren
25b8c54355 Bug: fix 'Invoice issued to' in business design for quote 2016-02-03 22:19:15 +02:00
Hillel Coren
cc49415a78 Added invoiceDate as email template variable 2016-02-03 22:10:09 +02:00
Hillel Coren
a584973eea Adding https suggestion 2016-02-03 20:59:07 +02:00
Hillel Coren
1284c29534 Enabled setting expense currency 2016-02-02 00:07:09 +02:00
Hillel Coren
63c1293e3b Add Header/Footer options to invoice design settings 2016-01-31 23:55:02 +02:00
Hillel Coren
387f89440c Add Header/Footer options to invoice design settings 2016-01-31 23:42:20 +02:00
Christian González
5cc63e1e9d German term correction 2016-01-31 20:40:36 +01:00
Hillel Coren
646c239cd8 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-31 15:10:40 +02:00
Hillel Coren
25f5cdbcdd Added check to ensure expense currency matches client\invoice currency 2016-01-31 15:10:33 +02:00
ridgarou
143c4a4bbc Refine some traslations on es_ES 2016-01-28 19:43:20 +01:00
Hillel Coren
e245b6f639 Updated texts file 2016-01-28 16:34:22 +02:00
ridgarou
c62e6c2413 Update 'es_ES' traslation 
I complete the most traslations for 'es_ES' languaje

in the future, try to refine this translation  :)

Regards
 2016-01-28 15:29:58 +01:00
Hillel Coren
680b8edefd Update text files formatting 2016-01-28 14:12:14 +02:00
Hillel Coren
bdeb062657 Refining how expenses convert to products 2016-01-27 22:38:21 +02:00
Hillel Coren
efc9ab4f9e Working on OFX support 2016-01-26 22:22:33 +02:00
Hillel Coren
74a3dcf9d2 Working on expenses 2016-01-23 23:36:31 +02:00
Hillel Coren
91187eb06d Bug fixes 2016-01-23 20:36:11 +02:00
ridgarou
61188623d4 Update texts.php 
Se cambia "'tax' => 'IVA'," por "'tax' => 'Impuesto'," ya que este literal se usa para mas impuestos aparte del IVA
 2016-01-22 00:56:48 +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
19a5e85b8a Updated texts file 2016-01-20 11:49:08 +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
Hillel Coren
f1fa973833 Updated text file 2016-01-18 11:41:33 +02:00
Hillel Coren
89ff1be14f Manually merging PR #630 2016-01-18 11:13:39 +02:00
steenrabol
bcffedcbd3 update from master 2016-01-11 20:41:02 +01: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
f90c759078 Expense module 2016-01-11 20:20:42 +01:00
Hillel Coren
904627e5b4 Use buttons by default in styled emails 2016-01-11 14:40:48 +02:00
Hillel Coren
61f3bedc48 Added check for mail config settings 2016-01-11 13:07:41 +02:00
Hillel Coren
08fd14a4c1 Added a 'Live Preview' option when using a large font 2016-01-10 16:22:40 +02: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
steenrabol
d8a501ed95 Posibility to modify payment terms 2016-01-07 20:39:51 +01:00
steenrabol
a52364a039 expense 2016-01-07 12:04:01 +01:00
Hillel Coren
ecad65c088 Corrected custom font field labels 2016-01-07 09:34:26 +02:00
Hillel Coren
14192846e8 Merging: custom font support 2016-01-07 09:08:30 +02:00
steenrabol
48ce3f64e6 expenses 2016-01-06 20:52:09 +01:00
steenrabol
d1bef24ede Expenses 2016-01-06 16:49:06 +01:00
steenrabol
dba3a39559 Vendor management 2016-01-06 15:23:58 +01:00
Hillel Coren
6e98e9b60d Merge pull request #594 from joshuadwire/more-payment-terms 
Add due date settings for recurring invoices
 2016-01-06 12:07:05 +02:00
Hillel Coren
0140da0ae2 Renamed client view to client portal 2016-01-03 21:10:20 +02:00
Hillel Coren
56330c1281 Merge pull request #588 from joshuadwire/custom-css 
Add custom CSS support
 2016-01-03 14:45:16 +02:00
Joshua Dwire
103bce3f48 Make recurring invoice due date settings more translatable 2016-01-01 17:37:47 -05:00
Joshua Dwire
2eecccad77 Move translation texts to end of file 2016-01-01 15:52:36 -05:00
Joshua Dwire
7e336ec118 Add due date settings for recurring invoices 
* Specific due date settings for weekly and monthly/annual cycles
* Display scheduled due dates in editor
* English-only text
 2015-12-31 23:59:02 -05:00
Hillel Coren
e5ca3973d8 Revert "Revert "Re-revert "Improve Import Support"""" 2015-12-31 16:11:44 +02:00
Hillel Coren
f5530a30b2 Revert "Re-revert "Improve Import Support""" 2015-12-31 15:36:53 +02:00
Hillel Coren
e60c52e93c Revert "Revert "Improve Import Support"" 2015-12-31 15:06:30 +02:00
Hillel Coren
fc0313bade Revert "Improve Import Support" 2015-12-31 13:46:56 +02:00
Joshua Dwire
b7687967a6 Add custom CSS support 
* Allow custom CSS for self-hosted white-label users or Pro
invoiceninja.com users
* Restrictive sanitization for CSS on invoiceninja.com
* Add .body class to body element to allow styling the body
* Add client_view_css column to accounts table
* English-only translation text
 2015-12-30 13:11:51 -05:00
Joshua Dwire
5932a837dd Improve Import Support 
* Add support for payment imports
* Add support for Wave Invoice import
* Add ability to merge invoice line items into a single invoice
 2015-12-30 00:14:14 -05:00
Hillel Coren
60daef8d58 Bug fixes 2015-12-29 19:49:40 +02:00
Christian González
966ff02ffd removed German "Deppenleerzeichen" 2015-12-28 21:28:15 +01:00
Hillel Coren
2ead34fef0 Enabled setting reminder before/after due date or invoice date 2015-12-28 12:15:56 +02:00
Hillel Coren
3f1891fa3b Bug fixes 2015-12-23 13:49:49 +02:00
Hillel Coren
9603c43277 Bug fixes 2015-12-21 21:57:55 +02:00
Hillel Coren
14152fd3f1 Added HTML formatting to system emails 2015-12-17 20:03:32 +02:00
Hillel Coren
f4863d3ec0 Added email settings page 2015-12-15 23:06:42 +02:00
Hillel Coren
08a4c4dcb4 Added email settings page 2015-12-15 22:25:12 +02:00
Hillel Coren
5547f222e1 Added warning for token mismatch error 2015-12-13 23:22:06 +02:00
Hillel Coren
c9bc85c382 Merge pull request #559 from CyBeRoni/fix-dutch-translations 
Update Dutch translations
 2015-12-10 15:16:32 +02:00
Marco Wessel
893347ab65 Update Dutch translations 
starttijd should be one word

Use consistent language for recurring invoice

Be more consistent about BTW too

notes aren't messages
 2015-12-10 13:44:21 +01:00
Samuel Laulhau
80ddf1f998 typo in french 2015-12-10 11:18:42 +01:00
Hillel Coren
683f66762a Merge pull request #556 from nerdoc/patch-13 
de: gesendet -> versendet,  for consistency
 2015-12-09 16:13:55 +02:00
Christian González
99c7bdd337 de: gesendet -> versendet, for consistency 
part 2
 2015-12-09 13:42:56 +01:00
Christian González
5415d04a3b de: gesendet -> versendet, for consistency 2015-12-09 13:36:28 +01:00
Hillel Coren
254dd4ff53 Updated texts 2015-12-03 20:29:13 +02:00
Hillel Coren
19ce3e3063 Add settings help texts 2015-12-03 17:35:41 +02:00
Hillel Coren
c5a1abf66f Added HTML email designs 2015-12-02 15:26:06 +02:00
rafael.sisweb
c182b67408 Remove action header again 2015-11-30 06:29:43 -05:00
Hillel Coren
b4f05440e5 Updated version and lang files 2015-11-30 09:21:46 +02:00
Hillel Coren
165ecd0bf0 Added support for Stripe.js 2015-11-29 22:13:50 +02:00
Hillel Coren
68bb3c8a82 Added .env field for MySQL strict mode 2015-11-29 12:12:59 +02:00
Hillel Coren
1a37a197a5 Working on CSV import 2015-11-25 11:35:24 +02:00
Hillel Coren
ae57fdf9a3 Updated readme 2015-11-24 21:45:38 +02:00
rafael.sisweb
a86ba6ed36 Merge remote-tracking branch 'upstream/master' 2015-11-23 08:50:49 -05:00
Hillel Coren
9b0426f4ab Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-11-21 23:10:35 +02:00
Hillel Coren
61ed298699 Minor improvements 2015-11-21 23:10:26 +02:00
Joris van de Sande
6e4c544fcc Improved Dutch translations 2015-11-21 16:31:43 +01:00
Christian González
14374b71a8 removed spaces in composita 2015-11-20 14:03:07 +01:00
rafael.sisweb
a151e68111 New string to pt_BR 2015-11-20 06:04:00 -05:00
Linus Metzler
6d0051f8a2 Merge pull request #1 from limenet/patch-3 
More German translations
 2015-11-19 08:41:59 +01:00
Linus Metzler
f1e7a6870b More German translations 2015-11-19 08:41:18 +01:00
Linus Metzler
3009822227 Added German translations 2015-11-19 08:30:18 +01:00
Hillel Coren
4a0906a92c Bug fixes 2015-11-18 23:37:11 +02:00