Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 07:02:34 +01:00
Code Issues Releases Activity
4,075 Commits 9 Branches 921 Tags 2 GiB
ee385f9ec9
Commit Graph

266 Commits

Author SHA1 Message Date
Hillel Coren
6cfee6ec70 Open document when clicked 2016-05-22 22:14:47 +03:00
Hillel Coren
3b0feef87f Fix for attached PDF being in the wrong language 2016-05-22 20:26:19 +03:00
Hillel Coren
ac09d86f68 Show warning when changing recurring invoice start date 2016-05-22 19:51:09 +03:00
Hillel Coren
142082b447 Remove download PDF from recurring invoices 2016-05-22 18:11:24 +03:00
Hillel Coren
a82437b2bc Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 
Conflicts:
	app/Http/routes.php
	resources/lang/en/texts.php
 2016-05-16 11:34:00 +03:00
Joshua Dwire
f6942a199f Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-05-15 21:21:59 -04:00
Hillel Coren
3df6ad2529 Changes to support transifex.com 2016-05-15 23:16:08 +03:00
Joshua Dwire
d99d81d655 Make autobill setting numbers match token settings 2016-05-14 23:15:22 -04:00
Hillel Coren
f03adc767e Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-05-11 09:28:55 +03:00
Hillel Coren
0f95799f33 Improved 'return to app' button logic 2016-05-11 09:22:43 +03:00
Joshua Dwire
fc029a62e1 Merge remote-tracking branch 'upstream/develop' into payments-changes 2016-05-10 22:32:28 -04: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
2345ff11ed Don't focus client select if client is already selected 2016-05-10 10:44:26 +03:00
Joshua Dwire
20f6f32a06 Update UI for configuring auto bill 2016-05-09 16:29:02 -04:00
Joshua Dwire
0fc44962d4 Add Braintree/PayPal support 2016-05-06 22:33:03 -04:00
Joshua Dwire
9ed44bdfe4 Merge pull request #4 from joshuadwire/laravel-acl 
Laravel acl
 2016-05-06 14:17:16 -04:00
Joshua Dwire
9a64db3234 Allow client to choose auto bill settings 2016-05-06 13:26:37 -04:00
Hillel Coren
5bedba1474 Show if client is deleted on invoice page 2016-05-05 22:59:33 +03:00
Joshua Dwire
c536bd8569 Add basic ACH support 2016-04-29 17:50:21 -04:00
Joshua Dwire
1a12cd30d3 Hide autobill when both Stripe and Braintree are not configured 2016-04-26 20:02:52 -04:00
Hillel Coren
782cda4004 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-04-26 23:31:31 +03:00
Hillel Coren
f28e0cd76b Fix for JS rounding problem 2016-04-26 12:41:34 +03:00
Joshua Dwire
fc0d4d3edd Finish migrating to Laravel ACL 2016-04-25 21:53:39 -04: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
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
f75b67b704 Trim whitespace in JS from emails on invoice page 2016-04-14 10:39:12 +03:00
Hillel Coren
8550543089 Made textareas the same width 2016-04-13 17:35:36 +03:00
Hillel Coren
74b524aada Add scrollbar to product list 2016-04-11 13:30:23 +03:00
Hillel Coren
27f72a4730 Fix for tax rates test 2016-04-11 11:48:46 +03:00
Hillel Coren
d4915074b6 Fix for quotes 2016-04-11 11:44:53 +03:00
Hillel Coren
769465542d Show info icon as orange if invitation opened but not viewed 2016-04-09 23:36:32 +03:00
Hillel Coren
f8256127ec Working on multiple tax rates 2016-03-31 13:28:22 +03:00
Hillel Coren
be9e7beaed Support for multiple tax rates 2016-03-31 12:29:01 +03:00
Hillel Coren
f91f32323f Reworking taxes 2016-03-29 17:30:28 +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
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
bff6782026 Add support for uploading documents on older browsers 2016-03-24 15:13:54 -04:00
Joshua Dwire
d328db2f54 Document support for quotes, recurring invoices, and cloning 2016-03-24 12:54:38 -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
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
c57dfb7f0d Restrict documents to pro users 2016-03-22 22:59:20 -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
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
9a29efbc6f Merge pull request #771 from joshuadwire/user-permissions 
User permissions
 2016-03-17 09:54:36 +02:00
Joshua Dwire
36284431c9 Remove testing code 2016-03-15 22:29:39 -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
Hillel Coren
4e9cc45a55 Hide custom invoice line item fields if not pro 2016-03-15 22:08:12 +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
20c06df586 Don't show sent status for recurring invoices 2016-03-13 19:55:19 +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
Hillel Coren
3e26f97e8b Fix for PDF on iOS Safari 2016-03-06 23:25:00 +02:00
Joshua Dwire
793ba76415 Finalize basic client portal password support 2016-03-04 22:22:54 -05:00
Joshua Dwire
903904d423 Merge Laravel 5.2 upgrade 2016-03-03 21:57:15 -05:00
Hillel Coren
aef4c6be98 Upgrade to Laravel 5.2 2016-03-02 15:36:42 +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
2153a8e227 Added custom invoice item fields 2016-02-28 13:59:52 +02:00
Hillel Coren
689efc3e3e Lazy load images 2016-02-25 12:16:27 +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
205c67a968 Temporariy change to work around Chrome 48 bug 2016-02-14 20:14:24 +02:00
Hillel Coren
9aa29fe373 Removing log messages 2016-02-13 20:30:58 +02:00
Hillel Coren
1794811f9b Added two week trial for hosted pro plan 2016-02-11 17:12:27 +02:00
Hillel Coren
60a3f3ca28 Removed duplicate recurring invoice status 2016-02-04 21:01:17 +02:00
Hillel Coren
02f137f95f Implemented StackTraceJS 2016-01-31 21:36:50 +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
25f5cdbcdd Added check to ensure expense currency matches client\invoice currency 2016-01-31 15:10:33 +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
ridgarou
a5e08b3ab4 Update knockout.blade.php 
Contabilizar correctamente Impuestos Negativos en el total de la Factura
 2016-01-22 01:07:24 +01: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
steenrabol
e7a658aaf6 Expenses bug fix 2016-01-19 14:01:19 +01: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
79ab9f9c48 Working on acceptance test for tax rates 2016-01-18 15:11:37 +02:00
Hillel Coren
cbe2b2905e Added autolink to emails and fixed checkout.com integration 2016-01-18 10:30:42 +02:00
Hillel Coren
8cefa9a707 Fixed problem with PDF preview after upgrading 2016-01-13 08:18:26 +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
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
Hillel Coren
14192846e8 Merging: custom font support 2016-01-07 09:08:30 +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
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
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