Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-23 01:41:34 +02:00
Code Issues Releases Activity
3,878 Commits 7 Branches 902 Tags 2 GiB
e68f70c0ce
Commit Graph

958 Commits

Author SHA1 Message Date
Joshua Dwire
5152500277 Fix invoice links on dashboard 2016-03-19 21:57:20 -04:00
Hillel Coren
09414ca3f5 Fix for #776 Deleting expense vendor results in error 2016-03-19 23:30:23 +02:00
Hillel Coren
c41b7de514 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-03-18 14:34:53 +02:00
Hillel Coren
c3c7f25b32 Clarified partial labels 2016-03-18 14:34:46 +02:00
Hillel Coren
f445c912f7 Merge pull request #773 from joshuadwire/user-permissions 
User Permissions Bug Fixes
 2016-03-17 22:57:24 +02:00
Joshua Dwire
ec1bc6f2cf Bug fixes 2016-03-17 10:11:14 -04: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
Hillel Coren
8cd56fa969 Minor fixes 2016-03-17 09:54:32 +02:00
Joshua Dwire
6ea4f168a2 Remove link to settings page for non-admins 2016-03-15 22:43:30 -04:00
Joshua Dwire
9ef448c2b8 Only show invoice button for expenses and tasks if an invoice can be created 2016-03-15 22:38:35 -04:00
Joshua Dwire
36284431c9 Remove testing code 2016-03-15 22:29:39 -04:00
Joshua Dwire
9337d4b9a4 Only show relevant data on Dashboard 2016-03-15 22:29:30 -04: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
4e9cc45a55 Hide custom invoice line item fields if not pro 2016-03-15 22:08:12 +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
a31d8b8176 Capitalize payment gateway fields 2016-03-15 13:57:50 +02:00
Hillel Coren
25b0957a7f Fix navigation when not signed up and browser is narrower 2016-03-14 23:37:13 +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
9c0eaac6b8 Enable entering search text before results are loaded 2016-03-14 10:25:08 +02:00
Hillel Coren
ed7cbf1d2b Support searching by custom client fields 2016-03-14 10:09:18 +02:00
Hillel Coren
20c06df586 Don't show sent status for recurring invoices 2016-03-13 19:55:19 +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
Hillel Coren
6bf948c8ed Fix for checkouit.com integration 2016-03-09 20:31:54 +02:00
Akira Matsuda
6c0c68eead Added some jp texts. 2016-03-10 00:54:21 +09:00
Hillel Coren
4a85715ee7 Fix for checkouit.com integration 2016-03-09 17:07:01 +02:00
Hillel Coren
ed48fb1a3f Fix for checkouit.com integration 2016-03-09 16:58:21 +02:00
Akira Matsuda
e2db55924a add Japanese language. 50% translated. 2016-03-09 21:30:16 +09:00
Hillel Coren
3c1084ffe0 Minor fixes 2016-03-08 20:38:28 +02:00
Hillel Coren
a2cbc1b225 Corrected setting password checkboxes 2016-03-08 19:42:22 +02:00
Hillel Coren
86a851a05a Merge pull request #757 from joshuadwire/client-portal-password 
Client portal password support
 2016-03-08 19:32:04 +02:00
Joshua Dwire
82fadab632 Finalize support for emailing passwords 2016-03-07 20:25:26 -05:00
Hillel Coren
3e26f97e8b Fix for PDF on iOS Safari 2016-03-06 23:25:00 +02:00
Joshua Dwire
0166576987 Fix password placeholder in email template 2016-03-05 18:16:23 -05:00
Joshua Dwire
d0d30e1e26 Add support for including password in email; include portal customizations 2016-03-05 18:09:50 -05:00
Joshua Dwire
793ba76415 Finalize basic client portal password support 2016-03-04 22:22:54 -05:00
Hillel Coren
e1f9ec1571 Small style fix 2016-03-04 16:03:55 +02:00
Joshua Dwire
903904d423 Merge Laravel 5.2 upgrade 2016-03-03 21:57:15 -05:00
Hillel Coren
b719f243c2 Fix for #751 2016-03-03 22:24:27 +02:00
Hillel Coren
eb6cd45913 Minor fixes 2016-03-03 21:39:15 +02:00
Hillel Coren
9c5944e2c4 Fix for #747 2016-03-03 11:44:03 +02:00
Hillel Coren
aef4c6be98 Upgrade to Laravel 5.2 2016-03-02 15:36:42 +02: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
c8aad4d039 Fix for tests 2016-02-29 12:54:43 +02:00
Hillel Coren
eef80d94d2 Use typeahead for product key on invoice page 2016-02-29 11:40:52 +02:00
Hillel Coren
6a9b2130c5 Added fuzzy search using fuse.js 2016-02-28 22:43:43 +02:00
Hillel Coren
553c548f31 Enabled setting recurring invoice number prefix 2016-02-28 20:36:11 +02:00
Hillel Coren
faa3a5e620 Updated PHP version check to 5.5.9 2016-02-28 14:09:42 +02:00
Hillel Coren
2153a8e227 Added custom invoice item fields 2016-02-28 13:59:52 +02:00
Hillel Coren
f2d7a01f94 Fix for report defaults 2016-02-27 23:00:27 +02:00
Hillel Coren
e3519c9c39 Made dataviz bars wider 2016-02-27 22:53:02 +02:00
Hillel Coren
41ed55c9b5 Made dataviz bars wider 2016-02-27 22:51:22 +02:00
Hillel Coren
96e7fab55c Matched vendor when importing expenses 2016-02-27 22:41:23 +02:00
Hillel Coren
df203c2e5e Check nothing is focused for search hotkey 2016-02-26 00:07:48 +02:00
Hillel Coren
308e5a1656 Improvements to search 2016-02-25 23:33:48 +02:00
Hillel Coren
4a749d5868 Improvements to custom designer 2016-02-25 20:34:23 +02:00
Hillel Coren
689efc3e3e Lazy load images 2016-02-25 12:16:27 +02:00
Hillel Coren
0e3b78097c Improvements to data export 2016-02-25 11:25:19 +02:00
Hillel Coren
01f9634237 Improvements to data export 2016-02-25 11:25:07 +02:00
Hillel Coren
fb959c1487 Refinements to reports 2016-02-25 10:32:31 +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
9f2e82323d Fixed invalid payment if auto-billing with invalid token 2016-02-22 12:26:26 +02:00
Hillel Coren
dd9805e5b4 Refined search hot key 2016-02-19 11:41:03 +02:00
Hillel Coren
6b64910c9d Prevent reloading page when showing/hiding archived 2016-02-18 20:14:48 +02:00
Hillel Coren
bb817f8afe Working on Travis 2016-02-18 19:14:51 +02:00
Hillel Coren
869febc1d3 Fix for Date in Expenses #731 2016-02-18 12:02:30 +02:00
Hillel Coren
5b024b23a7 Changed dataviz to red/green 2016-02-18 09:50:11 +02:00
Hillel Coren
4800c18eb1 Changed dataviz to red/green 2016-02-17 22:46:02 +02:00
Hillel Coren
47b7a00f50 Working on TravisCI 2016-02-17 22:42:31 +02:00
Hillel Coren
c69b9d3be0 Working on TravisCI 2016-02-17 22:32:26 +02:00
Hillel Coren
a489c2cab8 Made expense currency conversion hidden by default 2016-02-17 15:52:16 +02:00
Hillel Coren
eac4c823d3 Made expense currency conversion hidden by default 2016-02-17 13:06:03 +02:00
Hillel Coren
ee516cb327 Combined search and history in navbar 2016-02-17 12:12:39 +02:00
Hillel Coren
0e2bf3bb88 Focus the search input if the user clicks forward slash 2016-02-17 11:49:20 +02:00
Hillel Coren
aad648b901 Fix for 'model not defined' error 2016-02-16 23:56:59 +02:00
Hillel Coren
049c20f062 Zapier improvements 2016-02-16 17:30:09 +02:00
Hillel Coren
ae6a81ea48 Added improved fr_CA translation 2016-02-15 20:22:02 +02:00
Hillel Coren
0ea8461706 Fixed problem with search when using foreign language 2016-02-15 20:15:45 +02:00
Hillel Coren
668eab0279 Hide ‘Client Portal’ settings for hosted users 2016-02-15 20:05:41 +02:00
Hillel Coren
7c3406d9e5 Fix for #703 2016-02-15 19:58:18 +02:00
Hillel Coren
6b8b59a407 Hide subdomain/iframe setting for self hosts 2016-02-14 21:13:11 +02:00
Hillel Coren
40f372023d Update email image to use new logo 2016-02-14 20:49:12 +02:00
Hillel Coren
fae5f35de3 Comment out call to load vendor activity 2016-02-14 20:35:13 +02:00
Hillel Coren
205c67a968 Temporariy change to work around Chrome 48 bug 2016-02-14 20:14:24 +02:00
Hillel Coren
b28c712a8e Disbled datepicker language until fully supported 2016-02-14 16:42:39 +02:00
Hillel Coren
b9deb8a3a1 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-02-13 20:31:05 +02:00
Hillel Coren
9aa29fe373 Removing log messages 2016-02-13 20:30:58 +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
a30153cabe Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-02-11 17:12:34 +02:00
Hillel Coren
1794811f9b Added two week trial for hosted pro plan 2016-02-11 17:12:27 +02:00
ridgarou
9ab8069de1 Update master.blade.php 2016-02-09 10:57:25 +01: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
60a3f3ca28 Removed duplicate recurring invoice status 2016-02-04 21:01:17 +02:00
Hillel Coren
db4ec4fb62 Added statust to client view page 2016-02-04 20:36:39 +02: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
0ce9e426d9 Hid 'test email' button until issue updating connection info is resolved 2016-02-03 22:45:39 +02:00
Hillel Coren
1f105b456f Fixed dashboard fomatting when using multiple currencies 2016-02-03 22:33:29 +02: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
c14133d66e Added new logo 2016-02-03 10:08:28 +02:00
Hillel Coren
8bdf973f6e Enabled setting expense currency 2016-02-02 00:12:42 +02:00
Hillel Coren
1284c29534 Enabled setting expense currency 2016-02-02 00:07:09 +02:00
Hillel Coren
523b008d01 Added support for right aligning table columns 2016-02-01 15:58:52 +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
Hillel Coren
13310a63d9 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-31 22:36:13 +02:00
Hillel Coren
dafc5b9378 Added url type to invoice link website field 2016-01-31 22:36:06 +02:00
Christian González
5cc63e1e9d German term correction 2016-01-31 20:40:36 +01:00
Hillel Coren
02f137f95f Implemented StackTraceJS 2016-01-31 21:36:50 +02:00
Hillel Coren
7b28a8f9ad Updating the expense invoice amount now updates the expense amount 2016-01-31 17:34:11 +02:00
Hillel Coren
85c99c76bd Validate invoice form when submitted by clicking enter 2016-01-31 17:19:47 +02:00
Hillel Coren
e3a2605d3e Added check to ensure expense currency matches client\invoice currency 2016-01-31 15:21:12 +02: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
89622f86e2 Fix for #661 2016-01-28 16:07:03 +02:00
Hillel Coren
680b8edefd Update text files formatting 2016-01-28 14:12:14 +02:00
Hillel Coren
1ac12e1506 Added basic stats for resellers 2016-01-28 14:04:55 +02:00
Hillel Coren
bdeb062657 Refining how expenses convert to products 2016-01-27 22:38:21 +02:00
Hillel Coren
a7f2d3354c Resolved issue with expenses and multi-tenancy 2016-01-27 20:31:08 +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
c55d23a071 Merge pull request #641 from ridgarou/patch-2 
Update knockout.blade.php
 2016-01-23 21:42:00 +02:00
Hillel Coren
91187eb06d Bug fixes 2016-01-23 20:36:11 +02:00
ridgarou
a5e08b3ab4 Update knockout.blade.php 
Contabilizar correctamente Impuestos Negativos en el total de la Factura
 2016-01-22 01:07:24 +01: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
360b59baa0 Working on expenses 2016-01-22 00:29:10 +02: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
3bd636fedc Hiding expense fields for now 2016-01-21 11:04:38 +02:00
Hillel Coren
10aafda4e0 Hiding expense fields for now 2016-01-21 11:04:21 +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
steenrabol
2525f68a39 Expense / Vendor module bug fix 2016-01-19 20:35:15 +01: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
96df91076d Hide invitation link for recurring invoices 2016-01-18 16:15:07 +02:00
Hillel Coren
86f1e13c87 Fix for #632 2016-01-18 16:09:06 +02:00
Hillel Coren
b494633873 Bug fixes 2016-01-18 15:53:20 +02:00
Hillel Coren
79ab9f9c48 Working on acceptance test for tax rates 2016-01-18 15:11:37 +02:00
Hillel Coren
4d5aa1a712 Disabled autocomplete on self host system settings form 2016-01-18 12:53:26 +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
Hillel Coren
cbe2b2905e Added autolink to emails and fixed checkout.com integration 2016-01-18 10:30:42 +02:00
steenrabol
f550e3734f bug fix to expense module - was not able to add a contact to a new vendor 2016-01-15 11:31:12 +01:00
Hillel Coren
8cefa9a707 Fixed problem with PDF preview after upgrading 2016-01-13 08:18:26 +02:00
Hillel Coren
b5cf87bc0d Bug fixes 2016-01-12 11:18:35 +02:00
Hillel Coren
90e7d5dafa Bug fixes 2016-01-12 08:57:19 +02:00
steenrabol
172c1a0548 update 2016-01-11 20:56:12 +01: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
cf24684adb Check user is pro to use custom fonts 2016-01-11 14:50:17 +02: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
d72ff27e62 Improved invoice design form layout 2016-01-10 20:40:04 +02:00
Hillel Coren
9436f5a51e Fixed issue where a tab on the client page can be blank on page load 2016-01-10 20:25:15 +02:00
Hillel Coren
08fd14a4c1 Added a 'Live Preview' option when using a large font 2016-01-10 16:22:40 +02:00
Hillel Coren
c6ff456d4d Fixes #608 2016-01-10 14:37:23 +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
eed8ee55a1 Vendor 2016-01-07 16:21:13 +01:00
steenrabol
a52364a039 expense 2016-01-07 12:04:01 +01:00
Hillel Coren
4549643fdc Bug fix 2016-01-07 09:40:46 +02:00
Hillel Coren
ecad65c088 Corrected custom font field labels 2016-01-07 09:34:26 +02:00
Hillel Coren
77f9e89b40 Added _id to header/body font properties 2016-01-07 09:19:57 +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
f65dbde5bf Updated custom css textarea sizing 2016-01-06 12:26:47 +02: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
373c2e7736 Working on #598 2016-01-05 21:12:50 +02:00
Hillel Coren
c5985ce6c4 Show change password button in self host install 2016-01-05 20:53:23 +02:00
steenrabol
d3ee8ed813 Expense module 2016-01-05 12:47:03 +01: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
21888f6bca Move invoice sent last, send next, due next stats to third column 2016-01-01 17:37:25 -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
db2e37d31b Hide payments file for non-Wave imports 2015-12-31 16:33:29 +02: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
Hillel Coren
7e325662bf Merge pull request #586 from joshuadwire/wave-invoice-import 
Improve Import Support
 2015-12-31 13:39:54 +02:00
Hillel Coren
debc22d7d2 Bug fixes 2015-12-31 13:31:50 +02:00
Hillel Coren
35bb36fd34 Bug fixes 2015-12-31 12:23:39 +02:00
Hillel Coren
565b26ba27 Bug fixes 2015-12-30 20:45:52 +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
dbf2ec5e13 Bug fixes 2015-12-29 23:55:35 +02:00
Hillel Coren
eb450365d6 Bug fixes 2015-12-29 21:05:08 +02:00
Hillel Coren
60daef8d58 Bug fixes 2015-12-29 19:49:40 +02:00
Hillel Coren
6d6f8f5cab Fix for dev channel Chrome crash 2015-12-29 12:23:50 +02:00
Hillel Coren
15ec7ce5b5 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-12-29 09:52:09 +02:00
Hillel Coren
898e31c8b5 Fix for dev channel Chrome crash 2015-12-29 09:52:02 +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
9943c824dd Bug fixes 2015-12-27 14:45:57 +02:00
Hillel Coren
991b19b2a2 Bug fixes 2015-12-24 13:17:11 +02:00
Hillel Coren
c0409b86fd Added custom labels to email variables 2015-12-23 16:21:48 +02:00
Hillel Coren
3f1891fa3b Bug fixes 2015-12-23 13:49:49 +02:00
Hillel Coren
9341ea0c87 Bug fixes 2015-12-22 14:06:53 +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
372ffb0ea9 Bug fixes 2015-12-17 10:19:56 +02:00
Hillel Coren
4dc7a8d5f1 Working on email markup 2015-12-16 13:49:26 +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
e893d74b41 Added company website 2015-12-14 23:05:17 +02:00
Hillel Coren
5547f222e1 Added warning for token mismatch error 2015-12-13 23:22:06 +02:00
Hillel Coren
19d5d49e63 Working on #427 2015-12-13 22:12:54 +02:00
Hillel Coren
4b328acc67 Working on #427 2015-12-10 21:36:34 +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
Hillel Coren
653394e33f Fixed test email 2015-12-10 13:13:52 +02:00
Hillel Coren
76689802d9 Working on data import 2015-12-10 13:03:45 +02:00
Hillel Coren
a6d6c9bcec Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-12-10 12:57:57 +02:00
Hillel Coren
ff139bc09c Working on data import 2015-12-10 12:57:51 +02: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
e46d804cd7 Working on importing data from more providers 2015-12-07 23:41:48 +02:00
Hillel Coren
1a474f362f Added support for country specific Euro formatting 2015-12-07 15:34:55 +02: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
30631b2bc4 Optimized client view page 2015-11-29 18:00:50 +02:00
Hillel Coren
68bb3c8a82 Added .env field for MySQL strict mode 2015-11-29 12:12:59 +02:00
Hillel Coren
da086d3345 Fixes #547 2015-11-28 23:19:09 +02:00
Hillel Coren
e09a059691 Fixes #548 2015-11-28 23:10:06 +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
eaf73077b1 Bug fixes 2015-11-16 21:21:48 +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
rafael.sisweb
bd103ce6be Merge remote-tracking branch 'upstream/master' 2015-11-16 08:21:10 -05:00
Simon
61d6fb3961 French 95% translated 2015-11-16 14:18:33 +01:00
rafael.sisweb
ff7226eb35 Merge remote-tracking branch 'upstream/master' 2015-11-16 07:53:07 -05:00
Hillel Coren
019196c60f Removed deleted records from system export 2015-11-16 14:53:02 +02:00
Hillel Coren
03a904c4f8 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-11-16 14:30:51 +02:00
Hillel Coren
e93a7aa915 Bug fixes 2015-11-16 14:30:44 +02: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
9a0058deb1 Bug fixes 2015-11-15 19:23:45 +02: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
933b94e8b5 Improved history feature 2015-11-11 18:24:48 +02:00
Hillel Coren
6ae83e8469 Bug fixes 2015-11-11 14:20:51 +02: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
Hillel Coren
7b6699c2bc Enabled grouping report by payments 2015-11-11 00:07:05 +02: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
b55a3226b7 Starting on stripejs 2015-11-09 21:24:22 +02:00
Hillel Coren
02aa10e41d Corrected form autocomplete behavior 2015-11-09 16:53:18 +02:00
Hillel Coren
7542cb479f Updated version 2015-11-09 14:13:17 +02:00
Hillel Coren
eed345cff6 Bug fixes 2015-11-09 13:46:53 +02:00
Linus Metzler
6d83c57ea1 "Client" wasn't translated 2015-11-09 10:50:47 +01:00
Hillel Coren
57245211d8 Added Swagger 2015-11-08 22:34:26 +02:00
Hillel Coren
ed021347cf Working on Gmail actions 2015-11-08 17:01:41 +02:00
Hillel Coren
0a5e7c904f Removed Gitter chat 2015-11-08 11:50:18 +02:00
Hillel Coren
bef7454b73 Working on gmail actions 2015-11-08 10:43:49 +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
a30b9039de Bug fixes 2015-11-06 09:54:29 +02:00
Hillel Coren
002c994c0b Refactoring datatable code 2015-11-06 01:14:00 +02:00
Hillel Coren
d147dba542 Refactoring datatable code 2015-11-06 00:46:02 +02:00
Hillel Coren
436b8be8d9 Refactoring datatable code 2015-11-06 00:37:04 +02:00
Hillel Coren
0953fbe7cd Added Quill to email signature 2015-11-05 12:02:14 +02:00
Hillel Coren
cb243fec0a Working on the API 2015-11-05 10:44:48 +02:00
Hillel Coren
d0f8ee7797 Added HTML editor for client emails 2015-11-04 23:52:12 +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
Hillel Coren
029e740a6c Working on the API 2015-11-03 21:03:24 +02:00
Hillel Coren
521fc107f1 Bug fixes 2015-11-03 13:20:49 +02:00
Hillel Coren
c3d43ab480 Bug fixes 2015-11-03 00:05:28 +02:00
Rafael Almeida
c8375ad983 Distinct text message when quote is converted or approved 2015-11-02 15:14:00 -05:00
Rafael Almeida
d35e57a3a1 Adjust some terms on pt_br texts 2015-11-02 14:30:53 -05:00
Rafael Almeida
191d002597 PT_br new text strings 2015-11-02 14:07:55 -05:00
Rafael Almeida
db97fa9c95 solve merge conflits 2015-11-02 11:28:01 -05:00
Rafael Almeida
f3b40484db pt_br fixes 2015-11-02 10:53:12 -05:00
Hillel Coren
9b840a24dd Enabled social login 2015-11-01 20:21:11 +02:00
Hillel Coren
d95ca5da2b Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-10-31 23:57:01 +02:00
Hillel Coren
11d9192a0f Fixes #492 2015-10-31 23:56:49 +02:00
Hillel Coren
abbc9b98e8 Merge pull request #495 from nerdoc/master 
German language updates (activities, default_quote* etc.)
 2015-10-30 16:29:49 +02:00
Hillel Coren
0e1f892f38 Merge pull request #494 from nerdoc/patch-10 
German: versandt->versendet to be consistent
 2015-10-30 16:29:35 +02:00
Christian González
1203a78b75 German language update 2015-10-30 15:29:16 +01:00
Christian González
17eb28c43c German language updates (activities, default_quote* etc.) 2015-10-30 15:13:04 +01:00
Christian González
5a54ccf9b0 German: versandt->versendet to be consistent 2015-10-30 15:02:37 +01:00
Christian González
6b29254cf9 fixed German "Deppenleerzeichen" 2015-10-30 15:01:17 +01:00
Hillel Coren
0b2705b943 Enabled restoring deleted invoices and payments 2015-10-30 14:56:25 +02:00
Hillel Coren
fa105210bb Added gitter chat 2015-10-29 23:56:45 +02:00
Hillel Coren
b040aad021 Separated recurring invoices from invoices list 2015-10-29 19:21:00 +02:00
Hillel Coren
ad9d8253eb Added default quote terms 2015-10-29 16:51:57 +02:00
Hillel Coren
2e88cf0141 Added default quote terms 2015-10-29 16:49:37 +02:00
Hillel Coren
aa0a35f9d8 Added default quote terms 2015-10-29 16:42:05 +02:00
Rafael Almeida
da246f83ed Fix pt_br texts 2015-10-29 08:13:25 -04:00
Hillel Coren
404435a145 Refactored to events 2015-10-28 21:22:07 +02:00
rafael.sisweb
c14292be9a PT_BR review 2015-10-28 09:18:50 -04:00
rafael.sisweb
39967f8e34 Adjust of spelling errors 2015-10-27 08:54:09 -04:00
rafael.sisweb
11ba73a2db Adjust of spelling errors 2015-10-27 08:48:50 -04:00
rafael.sisweb
ea3da1030c Reviewing PT_BR translates. 2015-10-26 13:36:34 -04:00
Patrick Samson
1b46bab0cc Fixed bad translation 2015-10-25 19:15:56 -04:00
Hillel Coren
4a3beeeae7 Bug fixes 2015-10-25 13:08:11 +02:00
Hillel Coren
6a2fc89962 Bug fixes 2015-10-25 09:49:10 +02:00
Hillel Coren
3d55dbc05b Bug fixes 2015-10-25 09:13:06 +02:00
Hillel Coren
971e538d0e Working on custom invoice numbers 2015-10-23 15:54:07 +03:00
Hillel Coren
17f853f907 Working on custom invoice numbers 2015-10-23 14:55:18 +03:00
Hillel Coren
a0ec032f69 Working on custom invoice numbers 2015-10-23 11:06:46 +03:00
Hillel Coren
24a0842e48 Custom invoice/quote numbers 2015-10-22 21:49:20 +03:00
Hillel Coren
7ca98c9080 Custom invoice/quote numbers 2015-10-22 21:48:12 +03:00
Matthias Niess
4a4441bbc3 Update German translation and add missing strings 2015-10-22 20:05:13 +02:00
Matthias Niess
2e6fa6a47b Update English and German lang files for PSR-2 compliance 2015-10-22 20:05:06 +02:00
Hillel Coren
47f38ad54e Added support for default taxes 2015-10-21 14:11:08 +03:00
Hillel Coren
392c1facc0 Fixed issue with TwoCheckout integration 2015-10-20 22:04:49 +03:00
Hillel Coren
2c5667aacb Added new acceptance tests 2015-10-20 20:12:34 +03:00
Hillel Coren
88c215d1df Bug fixes 2015-10-20 11:23:38 +03:00
Simon
65104364b7 Update texts.php 2015-10-20 09:37:15 +02:00
rafael.sisweb
93575a3898 Improving pt br translate 2015-10-19 13:00:10 -04:00
Hillel Coren
420de05ebc Bug fixes 2015-10-18 13:37:04 +03:00
Hillel Coren
9283362d28 Bug fixes 2015-10-18 10:30:28 +03:00
Hillel Coren
c24b2f352d Updated version 2015-10-16 08:32:02 +03:00
Hillel Coren
1ab154aba9 Bug fixes 2015-10-15 22:37:01 +03:00
Hillel Coren
4b07504835 Reworked recurrenc code using Recurr 2015-10-15 17:14:13 +03:00
Hillel Coren
a4960245c2 Bug fixes 2015-10-15 09:19:41 +03:00
Hillel Coren
8da5517206 Bug fixes 2015-10-14 23:56:17 +03:00
Hillel Coren
d34fbcf726 Styling forms 2015-10-14 20:18:19 +03:00
Hillel Coren
831c81a4b9 Improved settings navigation 2015-10-14 17:15:39 +03:00
Hillel Coren
d3550903f4 Bug fix 2015-10-14 08:18:14 +03:00
Hillel Coren
f1bf91b0fb Require re-confirming email address when it's changed 2015-10-13 20:21:32 +03:00
Hillel Coren
aef0fe8430 Added client dashboard 2015-10-13 18:44:01 +03:00
Hillel Coren
2dfc053cbc Bug fixes 2015-10-13 10:11:44 +03:00
Hillel Coren
1d04bc2a05 Added custom invoice text fields 2015-10-11 17:41:09 +03:00
Simon
8c3402c975 Update texts.php 2015-10-11 00:41:31 +02:00
Hillel Coren
16f7cc8330 Bug fixes 2015-10-09 08:57:37 +03:00
Hillel Coren
a1cef22a48 Add quotes to the dashboard and a map to the client page 2015-10-06 20:55:55 +03:00
Hillel Coren
079bba078b Merge pull request #468 from nerdoc/patch-10 
German language update & corrections
 2015-10-05 22:10:24 +03:00
Hillel Coren
5ed9f8afe4 Merge pull request #467 from nerdoc/master 
German/Spanish translation update for size_id
 2015-10-05 22:00:10 +03:00
Hillel Coren
254a819e92 Fix for #445 2015-10-05 20:48:16 +03:00
Christian González
60c301f954 German language update & corrections 2015-10-05 15:05:37 +02:00
Christian González
c14527e3f5 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 
n, warum dieser
 2015-10-05 14:50:30 +02:00