Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity
5,538 Commits 7 Branches 917 Tags 2 GiB
0194a10315
Commit Graph

378 Commits

Author SHA1 Message Date
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
Hillel Coren
ecaf31ec95 Added early_access field 2016-01-07 13:09:21 +02:00
steenrabol
a52364a039 expense 2016-01-07 12:04:01 +01: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
dba3a39559 Vendor management 2016-01-06 15:23:58 +01:00
steenrabol
d3ee8ed813 Expense module 2016-01-05 12:47:03 +01:00
Hillel Coren
56330c1281 Merge pull request #588 from joshuadwire/custom-css 
Add custom CSS support
 2016-01-03 14:45:16 +02:00
Hillel Coren
af7225c05b Added XCD currency 2016-01-02 22:53:04 +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
Hillel Coren
6d6f8f5cab Fix for dev channel Chrome crash 2015-12-29 12:23:50 +02: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
c5c5ff3458 Working on data import 2015-12-14 22:07:48 +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
1a474f362f Added support for country specific Euro formatting 2015-12-07 15:34:55 +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
Hillel Coren
5c6b2fe906 Working on import 2015-11-18 16:40:50 +02:00
Hillel Coren
9a0058deb1 Bug fixes 2015-11-15 19:23:45 +02:00
Linus Metzler
d8ed667bba CHF uses a period as a decimal separator 
https://en.wikipedia.org/wiki/Decimal_mark#Countries_using_Arabic_numerals_with_decimal_point
 2015-11-14 16:28:26 +01:00
Juan Luis Baptiste
60ee2d131d Added Colombian currency. 2015-11-09 17:30:57 -05:00
Hillel Coren
15b17dfeed Added view presenters 2015-11-06 12:59:53 +02:00
Hillel Coren
5555000f83 Added additional OmniPay drivers 2015-11-04 20:13:15 +02:00
Hillel Coren
029e740a6c Working on the API 2015-11-03 21:03:24 +02:00
Hillel Coren
9b840a24dd Enabled social login 2015-11-01 20:21:11 +02:00
Hillel Coren
aa0a35f9d8 Added default quote terms 2015-10-29 16:42:05 +02:00
Hillel Coren
404435a145 Refactored to events 2015-10-28 21:22:07 +02:00
Hillel Coren
eca14583fd Custom invoice/quote numbers 2015-10-22 21:57:47 +03:00
Hillel Coren
7ca98c9080 Custom invoice/quote numbers 2015-10-22 21:48:12 +03:00
Hillel Coren
47f38ad54e Added support for default taxes 2015-10-21 14:11:08 +03:00
Eduardo Reveles
8c57a270e3 Add Mexican Peso currency 2015-10-19 22:23:21 -05:00
Hillel Coren
9283362d28 Bug fixes 2015-10-18 10:30:28 +03:00
Hillel Coren
5af18742ae Added Indonesian rupiah 2015-10-12 11:35:50 +03:00
Hillel Coren
1d04bc2a05 Added custom invoice text fields 2015-10-11 17:41:09 +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
6d7f0d6611 Zapier fixes 2015-10-02 11:32:13 +03:00
Hillel Coren
cb16e7f950 Added support for basic markdown 2015-10-01 23:02:22 +03:00
Hillel Coren
902f8948b0 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 2015-09-25 12:58:04 +03:00
Hillel Coren
4268c18f8a Fixed money format in PDF for EU 2015-09-25 12:57:40 +03:00
Maxim
382a2e6ba4 Small code style fixes 2015-09-24 11:16:29 +07:00
Hillel Coren
6b063abe9a Bug fixes 2015-09-21 00:05:02 +03:00
Hillel Coren
98cabd4138 Added auto-reminder emails 2015-09-17 22:01:06 +03:00
Hillel Coren
4741fad4be Added auto-billing and per-client language support 2015-09-10 20:50:09 +03:00
Hillel Coren
3fdad48179 API improvements 2015-09-07 12:07:55 +03:00
Hillel Coren
4d71b193d6 Bug fixes 2015-09-02 13:59:03 +03:00
Hillel Coren
e4672b1213 Merge pull request #405 from trendler/master 
Fixed timezone DST issues in timelog
 2015-09-01 23:29:09 +03:00
Hillel Coren
ba50e701c8 Integration tests 2015-08-30 15:08:15 +03:00
Hillel Coren
95fd9a4c1c Initial acceptance tests 2015-08-20 18:09:04 +03:00
Tobias Rendler
663070e36b Fixed timezone DST issues in timelog 
- Added moment-timezone-with-data.js
- Added new datetime format and variants
 2015-08-13 12:54:03 +02:00
Hillel Coren
78bf49cd19 Recurring invoices no longer prevent invoice numbers from being sequential 2015-08-10 18:48:41 +03:00
Hillel Coren
33364d3d9c Bug fixes 2015-07-30 20:48:59 +03:00
Hillel Coren
7db4fd8cd0 Fix #379 Error after /setup: business.js missing but required? 2015-07-29 10:01:03 +03:00
Hillel Coren
ba8419356d Moved invoice design files 2015-07-28 10:00:00 +03:00
Hillel Coren
35d794b36f Enabled customizing invoice designs 2015-07-21 21:51:56 +03:00
Hillel Coren
b9c00a0531 Re-worked editing task details 2015-07-12 22:43:45 +03:00
Hillel Coren
c42dfb8b96 Improvments to multi-account switching 2015-07-07 23:08:16 +03:00
Hillel Coren
67dff394b4 Added multi-company support 2015-06-16 22:35:35 +03:00
Hillel Coren
fa27ed9657 Added resume option to tasks 2015-06-14 17:52:35 +03:00
Hillel Coren
97adc27ba1 Added resume option to tasks 2015-06-14 17:03:37 +03:00
Hillel Coren
88865d44fc Added resume option to tasks 2015-06-14 15:29:37 +03:00
Hillel Coren
84a117c84b Added resume option to tasks 2015-06-14 15:21:29 +03:00
Hillel Coren
1c1bef3abb Bug fixes 2015-06-10 11:34:20 +03:00
Hillel Coren
77c90ad21f Bug fixes 2015-06-07 11:05:30 +03:00
Hillel Coren
b80842759e Bug fixes 2015-06-04 23:53:58 +03:00
Hillel Coren
060a14736b Added support for Dwolla 2015-06-03 20:55:48 +03:00
Hillel Coren
1a8245dcff Adding support for Dwolla 2015-05-31 15:37:29 +03:00
Hillel Coren
976773ce7b Enabled setting custom invoice item labels 2015-05-27 23:20:35 +03:00
Hillel Coren
57b5db4ed8 Merge pull request #329 from Lykegenes/Lykegenes-sqlite-patch-1 
SQLite compatibility
 2015-05-27 21:47:42 +03:00
Patrick Samson
c60831f7f4 Fix constraint violations in SQLite 2015-05-27 13:45:50 -04:00
Hillel Coren
3da1e738d8 Working on tasks 2015-05-27 19:52:10 +03:00
Hillel Coren
33d139adf5 Working on pdfmake 2015-05-22 10:22:24 +03:00
Hillel Coren
c4a94834a1 API improvements 2015-05-10 11:45:03 +03:00
Hillel Coren
b368e5589c Bug fixes 2015-05-05 12:48:23 +03:00
Hillel Coren
bc10719fbe Added support for custom subdomains 2015-04-28 23:13:52 +03:00
Hillel Coren
723aa285f5 Bug fixes 2015-04-27 15:28:40 +03:00
Hillel Coren
dc6ed9fca1 Updating design 2015-04-22 22:21:04 +03:00
Hillel Coren
e95b6461bb Working on L5 2015-04-20 17:34:23 +03:00
sigitas
9867488aba renamed migration to be the last at the trunk 2015-04-17 11:29:25 +03:00
sigitas
ead19c72f7 Merge branch 'master' of https://github.com/trigras/invoice-ninja 2015-04-17 00:35:20 +03:00
sigitas
9be2538213 Merge remote-tracking branch 'remotes/ninja/master' 2015-04-17 00:34:57 +03:00
sigitas
e937407534 prepared for all 4 templates 2015-04-17 00:33:22 +03:00
Hillel Coren
caae008403 Added support for partial payments 2015-04-16 20:12:56 +03:00
Hillel Coren
be327fbcbf Added support for Bitcoin 2015-04-15 19:35:41 +03:00
Hillel Coren
868744c696 Working on L5 2015-04-14 21:58:07 +03:00
Hillel Coren
5a6197fbb4 Added notification email when quote is approved 2015-04-13 15:00:31 +03:00
sigitas
5f1495073f use custom fonts 2015-04-13 12:23:43 +03:00
Hillel Coren
0e2eba4521 Bug fixes 2015-04-12 12:43:51 +03:00
Hillel Coren
a73bdab540 Added Swedish languge option 2015-04-12 12:38:53 +03:00
Hillel Coren
424eb15870 Working on L5 2015-04-06 14:46:02 +03:00
Jeramy Simpson
b356c61505 Fix merge from master 
Moving migration file
 2015-04-06 15:59:00 +10:00
Jeramy Simpson
b8c1d49e30 Remove last mentions of PHP-Payments 
Closes #257
 2015-04-06 15:55:17 +10:00
Jeramy Simpson
b51f889219 Merge branch 'master' of github.com:hillelcoren/invoice-ninja into laravel-5 
Fixed Conflicts:
	resources/views/invoices/view.blade.php
 2015-04-06 10:32:23 +10:00
Hillel Coren
b8f2f59b5b Working on L5 2015-04-05 22:15:37 +03:00
Hillel Coren
58746d9eec Working on users in L5 2015-03-30 18:20:53 +03:00
Jeramy Simpson
c6d8b6f8e1 Merge Master Changes 
Had to manually resolve conflict issues
 2015-03-26 10:10:22 +10:00
Hillel Coren
d773c72970 Working on setup page 2015-03-25 21:56:31 +02:00
Jeramy Simpson
7718d8b8cb L5 Namespacing Update 2015-03-24 17:34:27 +10:00
Jeramy Simpson
04c392136e Add Files 2015-03-17 07:45:25 +10:00
root
2c696666df Initial Progress. 
- Moved most files
- fixed composer dependencies
- Started fixing issues.
 2015-03-12 13:39:52 +10:00
root
32e78ef3da Bring in Laravel5 framework. 2015-03-12 10:44:39 +10:00