1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 07:02:34 +01:00
Commit Graph

305 Commits

Author SHA1 Message Date
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
Hillel Coren
bcad8af535 Working on import 2015-11-18 19:16:23 +02:00
Hillel Coren
636a2beada Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-11-18 16:41:01 +02:00
Hillel Coren
5c6b2fe906 Working on import 2015-11-18 16:40:50 +02:00
rafael.sisweb
3a82463f03 Sync new texts to pt-BR whith some fixes 2015-11-17 11:10:16 -05:00
rafael.sisweb
a8bc3f0663 Merge remote-tracking branch 'upstream/master' 2015-11-17 10:54:44 -05:00
Hillel Coren
24bcb0e2e5 Merging import changes 2015-11-17 15:53:14 +02:00
Hillel Coren
cd3aecdf5b Clarifying email errors 2015-11-16 21:51:34 +02:00
Hillel Coren
ce4524ba1a Bug fixes 2015-11-16 21:07:23 +02:00
Hillel Coren
1b099d09cc Check for large logo image files 2015-11-16 20:02:04 +02:00
rafael.sisweb
eb0ab85300 Merge remote-tracking branch 'upstream/master' 2015-11-16 10:27:01 -05:00
Simon
61d6fb3961 French 95% translated 2015-11-16 14:18:33 +01:00
rafael.sisweb
d2290203cc Sync with main repo 2015-11-16 06:26:47 -05:00
Simon
320ee4cc96 More french translation 2015-11-16 09:51:58 +01:00
Hillel Coren
c17c4d5e40 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-11-15 08:39:44 +02:00
Hillel Coren
96a58ecf16 Bug fixes 2015-11-15 08:39:25 +02:00
Linus Metzler
7ddf523609 German translation for activities updated
"Klient", while correct, is

1. rather old German
1. nowhere else used in the app

so I changed it to "Kunde" (which is both modern and used everywhere else).

---

Also translated a few other strings.
2015-11-14 16:24:17 +01:00
rafael.sisweb
eedf030694 Merge remote-tracking branch 'upstream/master' 2015-11-13 06:17:11 -05:00
rafael.sisweb
36eaf846d6 Revert wrong edited lang file 2015-11-13 06:16:55 -05:00
Simon
59e75c45a7 More french translation 2015-11-12 22:31:07 +01:00
Hillel Coren
f574a79fe6 Improved data export 2015-11-12 22:36:28 +02:00
rafael.sisweb
317812e598 Some fix to pt_br translate 2015-11-12 08:32:14 -05:00
Hillel Coren
7273e39f1e Bug fixes 2015-11-11 14:17:58 +02:00
Hillel Coren
0d9cd45346 Merge pull request #519 from vegardwikeby/patch-5
100% translated to Norwegian
2015-11-11 09:35:08 +02:00
Vegard Wikeby
d30562d173 100% translated to Norwegian
Giving back for great software.
2015-11-10 23:09:56 -06:00
Vegard Wikeby
3fd7f615cd 100% complete translation to Norwegian
It took me a day almost, so hope you appreciate it.
2015-11-10 23:06:34 -06:00
rafael.sisweb
1cfd782caa Fix 'Disabled' translate. 2015-11-10 08:01:27 -05:00
rafael.sisweb
00bd5925e3 PT_br to new strings. Adjust on System Settings view. 2015-11-10 07:59:02 -05:00
Hillel Coren
343d76744f Improved white label modal 2015-11-09 21:59:31 +02:00
Hillel Coren
7542cb479f Updated version 2015-11-09 14:13:17 +02:00
Juan Luis Baptiste
b5b3ce404c Updated spanish translation for version 2.4.5. 2015-11-06 22:20:35 -05:00
Hillel Coren
15b17dfeed Added view presenters 2015-11-06 12:59:53 +02:00
Hillel Coren
002c994c0b Refactoring datatable code 2015-11-06 01:14:00 +02:00
Hillel Coren
436b8be8d9 Refactoring datatable code 2015-11-06 00:37:04 +02:00
Hillel Coren
65e959e84d Added system settings page 2015-11-04 15:57:59 +02:00
Hillel Coren
72c7cbb237 Added 'apply credit' action 2015-11-04 09:48:47 +02:00
Rafael Almeida
c8375ad983 Distinct text message when quote is converted or approved 2015-11-02 15:14:00 -05:00