Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-11 21:52:35 +01:00
Code Issues Releases Activity
3,695 Commits 7 Branches 919 Tags 2 GiB
030a4ec356
Commit Graph

2270 Commits

Author SHA1 Message Date
Hillel Coren
6a6c932bf6 Merge fix #787 for spaces in .env file 2016-03-31 17:14:34 +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
3e9802502c Show all invoiced documents in the client portal 2016-03-29 17:30:06 +03:00
Hillel Coren
8bb0d3154f Hide deleted records from the charts 2016-03-29 17:29:16 +03:00
Hillel Coren
8cabcb2640 Merge branches 'develop' and 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-03-27 21:10:10 +03:00
Hillel Coren
13cec052b9 Merge pull request #788 from joshuadwire/attached-documents 
Fix invoicing of expenses
 2016-03-27 21:09:56 +03:00
Joshua Dwire
abe38ddba9 Fix invoicing of expenses 2016-03-27 13:09:59 -04: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
Hillel Coren
c076f2887c Merge pull request #785 from joshuadwire/attached-documents 
Add support for attached documents
 2016-03-27 18:04:09 +03:00
Hillel Coren
7a929a51bb Added back .env variables #787 2016-03-27 17:39:26 +03:00
Hillel Coren
9d3f7575d6 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-03-27 17:36:18 +03:00
vincentdh
690ebf853f Update AppController.php 
Modify the doSetup() to use a similar way to create the .env file and add quotes when needed.
 2016-03-26 12:52:21 -04:00
vincentdh
965ef011e5 Update AppController.php 2016-03-26 12:49:22 -04:00
vincentdh
2c6e9aced3 Update AppController.php 
Add quotes to MAIL_FROM_NAME when needed
 2016-03-26 12:34:39 -04:00
Joshua Dwire
b5a948583e Remove debug code and fix minor bugs 2016-03-24 19:55:56 -04:00
Joshua Dwire
24d186da16 Set document mime type when storing 2016-03-24 19:00:08 -04:00
Joshua Dwire
b7f0d2a33f More intuitive document permissions 2016-03-24 18:33:28 -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
1ddd2769ac Add command to remove orphaned documents 2016-03-24 13:02:45 -04:00
Joshua Dwire
d328db2f54 Document support for quotes, recurring invoices, and cloning 2016-03-24 12:54:38 -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
Hillel Coren
90baeb5018 Fixed invitation iframe URL 2016-03-24 09:15:02 +02:00
Hillel Coren
e3c59101ba Fixed invitation iframe URL 2016-03-24 09:14:27 +02: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
10fa256809 Use stream when downloading documents 2016-03-23 20:46:09 -04:00
Joshua Dwire
ae6fa5ab9b Improve document upload efficiency 2016-03-23 19:52:51 -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
Hillel Coren
39f426e352 Prevent duplicate deletions 2016-03-23 15:02:53 +02:00
Hillel Coren
aae4f57c09 Prevent duplicate deletions 2016-03-23 15:02:05 +02: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
7576fb94b3 Bumped version number to 2.5.1.1 2016-03-22 19:52:50 +02:00
Hillel Coren
abf2fcc09c Bumped version number to 2.5.1 2016-03-22 19:38:51 +02:00
Hillel Coren
b0a4a9b31c Cleaning up log files 2016-03-22 17:14:40 +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
David Bomba
493c31b430 Merge pull request #778 from turbo124/develop 
Dashboard API implementation
 2016-03-22 21:23:18 +11:00
David Bomba
8e5d15dfbe Dashboard API 2016-03-22 21:21:05 +11:00
David Bomba
d83a02f80f Dashboard API 2016-03-22 21:17:52 +11:00
David Bomba
0ec1fcbd23 Dashboard API 2016-03-22 21:13:24 +11:00
David Bomba
6e7c19b38e Dashboard API 2016-03-22 21:08:58 +11:00
David Bomba
85633d3464 Dashboard API 2016-03-22 21:06:57 +11:00
David Bomba
b8560187f5 Dashboard API 2016-03-22 21:04:23 +11:00
David Bomba
431c9a899f Dashboard API 2016-03-22 20:54:36 +11:00
David Bomba
7bc703e5dd Dashboard API 2016-03-22 20:50:11 +11:00
David Bomba
06d796a318 Dashboard API 2016-03-22 20:43:08 +11:00
David Bomba
56b863a89a Working on Dashboard API 2016-03-22 19:50:09 +11:00
Hillel Coren
c9e0119bc2 Added permissions settings help 2016-03-21 22:00:59 +02:00
Hillel Coren
56ad438dd3 Add payment details to invoice report 2016-03-21 16:06:50 +02:00
David Bomba
e4a723b6ea Merge remote-tracking branch 'upstream/develop' into develop 2016-03-20 09:38:19 +11:00
David Bomba
c25cd7f232 working on dashboard for API 2016-03-20 09:38:05 +11: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
Joshua Dwire
4d4f4140b6 Set sorting columns 2016-03-17 18:04:03 -04: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
Joshua Dwire
2cd7228074 Restrict access to tax rates and products 2016-03-15 22:45:11 -04:00
Joshua Dwire
67cc5599cc Remove unneeded check 2016-03-15 22:38:42 -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
4e9cc45a55 Hide custom invoice line item fields if not pro 2016-03-15 22:08:12 +02:00
Hillel Coren
c49f5fb52c Ensure archived invoices are viewable 2016-03-14 20:49:38 +02:00
Hillel Coren
5a6445f808 Added silent flag to test invoices 2016-03-14 20:23:20 +02:00
Hillel Coren
528ab00901 Fix for Zapier triggers 2016-03-14 17:32:29 +02:00
Hillel Coren
d6697171f6 Show ‘Expired’ for overdue quotes in list view 2016-03-14 10:40:14 +02:00
Hillel Coren
ed7cbf1d2b Support searching by custom client fields 2016-03-14 10:09:18 +02:00
Hillel Coren
e7df1f5e7c Bug fix to show/track errors on install/update 2016-03-14 09:25:58 +02:00
Hillel Coren
497a581bcd Support for negative expenses 2016-03-13 21:04:47 +02:00
Hillel Coren
d47251a475 Fix for adding new user 2016-03-13 20:33:11 +02:00
Hillel Coren
39fc63886b Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-03-13 17:39:03 +02:00
David Bomba
4679beb246 Merge pull request #767 from turbo124/develop 
Form Request validation re-implemented
 2016-03-13 23:54:30 +11:00
David Bomba
d9346bfadf re-working validation 2016-03-13 23:52:02 +11:00
David Bomba
8d7a9a2d29 re-working validation 2016-03-13 23:50:40 +11:00
David Bomba
22f683152d re-working validation 2016-03-13 23:49:51 +11:00
David Bomba
ba3ca0dffc re-working validation 2016-03-13 23:46:51 +11:00
David Bomba
2b77af5abe re-working validation 2016-03-13 23:43:39 +11:00
David Bomba
66204e91f4 re-working validation 2016-03-13 23:41:33 +11:00
David Bomba
499a1561b1 re-working validation 2016-03-13 23:38:25 +11:00
David Bomba
a2ce87490b re-working validation 2016-03-13 23:37:37 +11:00
David Bomba
3279b26bef re-working validation 2016-03-13 23:34:42 +11:00
David Bomba
13b425853e re-working validation 2016-03-13 23:32:38 +11:00
David Bomba
3d104400aa re-working validation 2016-03-13 23:31:15 +11:00
David Bomba
584133734e re-working validation 2016-03-13 23:29:38 +11:00
David Bomba
b83ba5c7dc re-working validation 2016-03-13 23:28:33 +11:00
David Bomba
c79509d04f re-working validation 2016-03-13 23:27:20 +11:00
David Bomba
d7b6426aee re-working validation 2016-03-13 23:20:56 +11:00
David Bomba
15838765ff re-working validation 2016-03-13 23:14:08 +11:00
David Bomba
f9853af70a re-working validation 2016-03-13 23:12:04 +11:00
David Bomba
b843bf008d re-working validation 2016-03-13 23:10:15 +11:00
David Bomba
e36298cd35 re-working validation 2016-03-13 23:09:11 +11:00
David Bomba
00aa0624b8 re-working validation 2016-03-13 23:08:31 +11:00
David Bomba
392024a0b9 re-working validation 2016-03-13 23:06:26 +11:00
David Bomba
3d2daf9758 re-working validation 2016-03-13 23:04:27 +11:00
David Bomba
4bc07aacbf re-working validation 2016-03-13 23:02:07 +11:00
David Bomba
7c054c5e9b re-working validation 2016-03-13 22:59:01 +11:00
David Bomba
b244f8034b re-working validation 2016-03-13 22:58:05 +11:00
Hillel Coren
243b1c1d37 Fix for JSON account export 2016-03-13 13:56:56 +02:00
David Bomba
fd173889eb re-working validation 2016-03-13 22:56:44 +11:00
Hillel Coren
44344e7676 Added Japaense as a 'large font' 2016-03-13 13:47:46 +02:00
David Bomba
c8a46f6bd9 re-working validation 2016-03-13 22:46:59 +11:00
David Bomba
35dfe66de2 re-working validation 2016-03-13 22:41:08 +11:00
David Bomba
94a73f92ad re-working validation 2016-03-13 22:39:20 +11: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
fe27ded103 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-03-13 13:32:53 +02:00
David Bomba
7d2cf9770b fixing validation 2016-03-13 21:54:31 +11:00
David Bomba
f6b2595936 changing the way validation works 2016-03-13 20:28:14 +11:00
David Bomba
83de2a279e changing the way validation works 2016-03-13 20:27:00 +11:00
David Bomba
3a657e511a changing the way validation works 2016-03-13 20:18:19 +11:00
David Bomba
aa8b160661 changing the way validation works 2016-03-13 20:11:45 +11:00
David Bomba
5462e4276a changing the way validation works 2016-03-13 20:10:25 +11:00
David Bomba
c7275cee5f merge fixes 2016-03-13 19:39:19 +11:00
David Bomba
b169864510 merge fixes 2016-03-13 19:36:09 +11:00
David Bomba
ddf5fa8938 merge 2016-03-13 19:34:54 +11:00
Hillel Coren
b29c795d93 Updated OFX library APPID and APPVER to QWIN 2500 2016-03-11 11:52:57 +02:00
Hillel Coren
7825378125 Fix for approving quotes 2016-03-11 00:29:07 +02:00
David Bomba
280a485a84 Merge remote-tracking branch 'upstream/develop' into develop 2016-03-10 20:14:54 +11:00
Hillel Coren
b13e79ad85 Fix for Zapier notifications 2016-03-09 20:42:02 +02:00
Hillel Coren
ed48fb1a3f Fix for checkouit.com integration 2016-03-09 16:58:21 +02:00
Hillel Coren
4912c40650 Fix to show all clients when cloning 2016-03-09 13:35:46 +02:00
David Bomba
795753e965 Merge remote-tracking branch 'upstream/develop' into develop 2016-03-09 20:16:06 +11:00
Hillel Coren
b5784f2137 Update ContactMailer.php #760 2016-03-09 11:15:53 +02:00
Hillel Coren
7ee4219480 Enabled registering through the API 2016-03-08 23:34:59 +02:00
Hillel Coren
b9bbec8d9d Enabled registering through the API 2016-03-08 23:24:06 +02:00
Hillel Coren
6aafb9154d Enabled registering through the API 2016-03-08 23:22:59 +02:00
Hillel Coren
3c1084ffe0 Minor fixes 2016-03-08 20:38:28 +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
David Bomba
e91ec8d8f2 merge fixes 2016-03-08 20:19:50 +11:00
Joshua Dwire
879e88dcc3 Restrict admin viewing of invoices to invoices in the same account 2016-03-07 20:25:43 -05:00
Joshua Dwire
82fadab632 Finalize support for emailing passwords 2016-03-07 20:25:26 -05:00
Hillel Coren
5bedad47e4 Bumped version to 2.5.0.4 2016-03-07 17:34:59 +02:00
Hillel Coren
409973758c Bumped version to 2.5.0.4 2016-03-07 17:34:28 +02:00
Hillel Coren
a36626843d Added warning if cache isn't set 2016-03-07 17:26:57 +02:00
Hillel Coren
52d25192af Added warning if cache isn't set 2016-03-07 17:22:20 +02:00
Hillel Coren
93d9d38286 Git update 2016-03-06 08:13:52 +02:00
Hillel Coren
825a998b39 Git update 2016-03-06 08:13:01 +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
ee677554c9 Datatable fixes for L5.2 2016-03-04 15:55:15 +02:00
Hillel Coren
1d880f45a0 Fix for invoice XLS export 2016-03-04 15:46:28 +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
747f199ce8 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-03-03 21:39:27 +02:00
Hillel Coren
eb6cd45913 Minor fixes 2016-03-03 21:39:15 +02:00
David Bomba
fd4ec8cb6d bug fixes 2016-03-03 20:52:47 +11:00
David Bomba
5950d0e0be Bug Fixes 2016-03-03 19:48:33 +11:00
David Bomba
9744ad69b7 Localization API & PUSH 2016-03-03 13:28:16 +11:00
David Bomba
28cd3e01a7 Bug fixes push notifications 2016-03-03 11:24:13 +11:00
Hillel Coren
8572e9252c Working on Laravel 5.2 2016-03-02 16:36:46 +02:00
Hillel Coren
88696c4eec Added auth check in subscription listeners 2016-03-02 16:29:26 +02:00
Hillel Coren
9efaada9f5 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-03-02 15:36:48 +02:00
Hillel Coren
aef4c6be98 Upgrade to Laravel 5.2 2016-03-02 15:36:42 +02:00
Akira Matsuda
0b9b3cb7bc fix garbled characters when cjk lang is selected. 2016-03-02 20:38:51 +09:00
David Bomba
6ff569a5a3 Bug Fixes 2016-03-02 22:16:06 +11:00
David Bomba
1d0c35ec76 Bug Fixes 2016-03-02 22:14:42 +11:00
David Bomba
8a33f6fec6 Bug Fixes 2016-03-02 22:00:08 +11:00
David Bomba
50c5d52e08 Bug Fixes 2016-03-02 21:52:59 +11:00
David Bomba
b14f8e2dfe Bug fixes 2016-03-02 21:08:12 +11:00
David Bomba
3c813138fa Merge branch 'develop' of https://github.com/turbo124/invoiceninja into develop 2016-03-02 12:15:54 +11:00
David Bomba
c1b9d6febc Bug Fix 2016-03-02 12:13:57 +11:00
David Bomba
1e39a85066 merge 2016-03-02 06:46:47 +11:00
David Bomba
aa4aae4797 Working on API 2016-03-01 21:31:23 +11:00
Hillel Coren
10dc9a3da1 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 
Conflicts:
	composer.lock
 2016-03-01 10:52:14 +02:00
Hillel Coren
3b5311e960 Added setting to show/hide client portal dashboard 2016-03-01 09:36:37 +02:00
David Bomba
0155f08d0d Merge pull request #743 from turbo124/push_notifications 
Push notifications
 2016-03-01 15:27:03 +11:00
David Bomba
6e3b1ecb4b Push Notifications 2016-03-01 15:06:54 +11:00
David Bomba
1aef96f027 Push Notifications 2016-03-01 14:44:14 +11:00
David Bomba
2438195c08 Push Notifications 2016-03-01 14:00:11 +11:00
David Bomba
f1bc597034 Push Notifications 2016-03-01 13:57:59 +11:00
David Bomba
57a4a24294 Push Notifications 2016-03-01 11:31:16 +11:00
Joshua Dwire
6376302ed9 Add option for client portal password 2016-02-29 16:46:27 -05:00
Hillel Coren
dade97fbfa Merged minor fixes 2016-02-29 13:25:32 +02:00
David Bomba
f6be1041b7 iOS Push Notifications 2016-02-29 22:21:15 +11:00
Hillel Coren
1602832fb6 Corrected invoice renewel date 2016-02-29 13:19:16 +02:00
David Bomba
2cd3571f25 iOS Push Notifications 2016-02-29 21:35:14 +11:00
David Bomba
50ddbcf609 iOS Push Notifications 2016-02-29 21:31:58 +11:00
Hillel Coren
f4fd45118c Added support for currency_code in API 2016-02-29 12:01:43 +02:00
Hillel Coren
6a9b2130c5 Added fuzzy search using fuse.js 2016-02-28 22:43:43 +02:00
Hillel Coren
d465c0d019 Handle token mismatch in get_started route 2016-02-28 20:54:31 +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
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
62b8067299 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-02-27 22:12:50 +02:00
Hillel Coren
92e5bf60d8 Broke up seeders 2016-02-27 22:12:22 +02:00
David Bomba
f323c8e06e user transformer fields 2016-02-26 18:48:06 +11: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
edda64bd0e Enabled all tests 2016-02-25 12:29:26 +02:00
Hillel Coren
689efc3e3e Lazy load images 2016-02-25 12:16:27 +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
6cdbc15961 Implemented basic expense report 2016-02-24 23:54:56 +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
c9f38699d2 Updated Travis config 2016-02-22 21:58:16 +02:00
Hillel Coren
e6141abde4 Enable auto renewing and updated Travis config 2016-02-22 21:34:21 +02:00
Hillel Coren
826d1b868b Enable auto renewing and updated Travis config 2016-02-22 21:23:15 +02:00
Hillel Coren
105321bdbb Upgraded to Laravel 5.1 2016-02-22 19:47:19 +02:00
Hillel Coren
d79ff8e984 Bumped version number to 2.5.0.3 2016-02-22 15:18:04 +02:00
Hillel Coren
9f2e82323d Fixed invalid payment if auto-billing with invalid token 2016-02-22 12:26:26 +02:00
Hillel Coren
881dd10e2c Added file 2016-02-22 10:30:14 +02:00
Hillel Coren
7da1a37771 Added Romanina New Leu 2016-02-21 15:26:27 +02:00
Hillel Coren
1529b59235 Prevent product without product key 2016-02-19 11:15:35 +02:00
Hillel Coren
b4c03e5cf8 Prevent product without product key 2016-02-19 10:56:48 +02:00
Hillel Coren
1caf32a00c Enabled remaining tests 2016-02-18 23:27:44 +02:00
Hillel Coren
fed9078c42 Travis... 2016-02-18 23:05:30 +02:00
Hillel Coren
6b64910c9d Prevent reloading page when showing/hiding archived 2016-02-18 20:14:48 +02:00
Hillel Coren
7e6d137504 Fixing test payment in Travis 2016-02-18 19:00:21 +02:00
Hillel Coren
5b743355fe Fixing test payment in Travis 2016-02-18 17:35:21 +02:00
Hillel Coren
f797497a8a Fix for invitations in the API 2016-02-18 15:46:44 +02:00
Hillel Coren
869febc1d3 Fix for Date in Expenses #731 2016-02-18 12:02:30 +02:00
Hillel Coren
b63f26f10b Working on TravisCI 2016-02-17 22:49:34 +02:00
Hillel Coren
7b735b9798 Hide action for main user in datatable 2016-02-17 21:33:15 +02:00
Hillel Coren
ed941fef89 Enabled downloading PDF through route 2016-02-17 21:13:55 +02:00
Hillel Coren
331b117189 Fix for #713 2016-02-17 20:59:24 +02:00
Hillel Coren
96479871bc Working on TravisCI 2016-02-17 19:14:06 +02:00
Hillel Coren
25d2af4891 Working on download PDF route 2016-02-17 17:50:01 +02:00
Hillel Coren
fdab849705 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-02-17 15:55:47 +02:00
Hillel Coren
611d908112 Fixed sorting expenses by status 2016-02-17 15:55:31 +02:00
Hillel Coren
eac4c823d3 Made expense currency conversion hidden by default 2016-02-17 13:06:03 +02:00
David Bomba
992802c164 Working on API functionality 2016-02-17 21:50:52 +11:00
David Bomba
6d09bda646 Working on API functionality 2016-02-17 21:16:13 +11:00
David Bomba
aef4658873 Api work/Bug fixes 2016-02-17 19:10:33 +11:00
David Bomba
a6e9c5198d Bug fixes 2016-02-17 14:46:28 +11:00
David Bomba
9428557e70 Bug Fixes 2016-02-17 14:43:25 +11:00
David Bomba
f959164f2a Expense and Vendor Transformers for API 2016-02-17 14:32:20 +11:00
David Bomba
e3ee79f369 Improving error reporting API 2016-02-17 10:44:01 +11:00
David Bomba
7da522599c Improving error reporting API 2016-02-17 10:36:45 +11:00
David Bomba
7cd3bac29c Improving error reporting API 2016-02-17 10:35:54 +11:00
David Bomba
1a953c5bcb Improving error reporting API 2016-02-17 10:34:23 +11:00
David Bomba
3e4df4ff4f Improving error reporting API 2016-02-17 10:29:18 +11:00
David Bomba
09650123d7 Improving error reporting API 2016-02-17 10:05:08 +11:00
David Bomba
a1be1f3529 Improving error reporting API 2016-02-17 09:45:28 +11:00
David Bomba
1fde9261e6 Improving error reporting API 2016-02-17 09:38:23 +11:00
David Bomba
170ee5a40b Improving error reporting API 2016-02-17 09:28:00 +11:00
David Bomba
31720b59fd Improving error reporting API 2016-02-17 09:12:34 +11:00
David Bomba
746b6ef362 Improving error reporting API 2016-02-17 09:09:32 +11:00
Hillel Coren
2295102b98 Adding back change from conflict 2016-02-17 00:07:05 +02:00
Hillel Coren
8735409753 Merge branch 'release-2.5.0.2' 
Conflicts:
	app/Http/Controllers/ClientApiController.php
 2016-02-17 00:03:23 +02:00
Hillel Coren
c9f58ce2d3 Bumped version number to 2.5.0.2 2016-02-16 23:59:24 +02:00
David Bomba
4a033ce925 Improving error reporting API 2016-02-17 08:57:06 +11:00
David Bomba
1ab4bb636f Improving error reporting API 2016-02-17 08:48:10 +11:00
Hillel Coren
81f08cdd17 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-02-16 17:30:30 +02:00
Hillel Coren
049c20f062 Zapier improvements 2016-02-16 17:30:09 +02:00
David Bomba
3c2b0ba45d Error handling 2016-02-16 10:30:28 +11:00
David Bomba
cacc24ede4 Merge pull request #722 from turbo124/api_errors 
Improve error handling in API
 2016-02-16 10:28:31 +11:00
Hillel Coren
0ea8461706 Fixed problem with search when using foreign language 2016-02-15 20:15:45 +02:00
Hillel Coren
7c3406d9e5 Fix for #703 2016-02-15 19:58:18 +02:00
Hillel Coren
3520c0fa79 Added custom invoice text fields to transformer 2016-02-15 19:39:26 +02:00
David Bomba
a295120015 Client API Error handling 2016-02-15 21:57:58 +11:00
David Bomba
f8fee3e8cd Error handling for API 2016-02-15 21:24:06 +11:00
Hillel Coren
907ab8f0e8 Bumped version number to 2.5.0.1 2016-02-14 23:23:01 +02:00
Hillel Coren
cf4eeb8594 Updated version 2016-02-11 21:48:05 +02:00
Hillel Coren
2b5167c266 Fixed issue when updating from previous version 2016-02-11 21:37:39 +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
0a2a97d89a Fixed an API issue when only setting product_key in an invoice 2016-02-11 19:24:41 +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
David Bomba
a8cff1db95 Jump over duplicate checks if request comes from API 2016-02-10 13:05:32 +11:00
David Bomba
498d7cbca9 Revert "Table locking for public_id integrity" 2016-02-10 12:32:12 +11:00
David Bomba
67b74b2a34 Table locking for public_id integrity 2016-02-10 11:26:21 +11:00
David Bomba
04807bccc6 Merge pull request #708 from turbo124/master 
Validation rule realignment
 2016-02-10 08:51:43 +11:00
David Bomba
3878fe9324 Validation rule realignment 2016-02-10 08:51:08 +11:00
ridgarou
60530d3cbc Update AccountRepository.php 2016-02-09 12:37:23 +01:00
David Bomba
ce58c581ef Delete Client from API 2016-02-08 15:27:42 +11:00
David Bomba
d401a6fb93 Bug in Client API not paginating all results 2016-02-08 10:37:38 +11:00
David Bomba
391d721180 Bug fixes 2016-02-07 22:30:36 +11:00
David Bomba
ccaabe2926 working on payments API 2016-02-07 22:01:39 +11:00
David Bomba
42f3cffca8 Delete a payment from the API 2016-02-07 21:24:21 +11:00
David Bomba
b3346011bc api bug fixes 2016-02-07 20:20:38 +11:00
David Bomba
7d2f635272 testing payment api 2016-02-07 19:39:51 +11:00
David Bomba
0c251392eb testing payment api 2016-02-07 19:32:43 +11:00
David Bomba
95e1baed29 testing payment api 2016-02-07 19:30:47 +11:00
David Bomba
138749ce6f update payment from API 2016-02-06 14:42:21 +11:00
Hillel Coren
e619bacf66 Fix for renewel logic 2016-02-04 22:50:30 +02:00
Hillel Coren
88b9046ac7 Added users to the API 2016-02-04 22:35:28 +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
2b3e35687a Bug fixes 2016-02-04 16:12:22 +02:00
Hillel Coren
5f709f76a8 Bug fix: notification emails have the wrong entity type 2016-02-03 22:53:18 +02: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
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
e9cacf2fdf Added tax rates and localization to the API 2016-02-03 16:03:56 +02:00
Hillel Coren
021f195c45 Implemented UpdateAccountRequest 2016-02-03 14:41:40 +02:00
David Bomba
80d800fd36 Merge pull request #686 from turbo124/master 
Added Payments to API
 2016-02-03 21:08:34 +11:00
David Bomba
2c8d3e2013 Added Payments to API 2016-02-03 21:06:49 +11:00
Hillel Coren
86b6d9dc10 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-02-03 10:08:35 +02:00
Hillel Coren
37ffd01463 Filtered out quotes from reminder emails 2016-02-03 10:08:12 +02:00
Hillel Coren
65d3667600 Increased timeout when installing/updating 2016-02-03 10:07:44 +02:00
David Bomba
ead2b335d5 Added Credit Transformer 2016-02-03 14:21:13 +11:00
Hillel Coren
1284c29534 Enabled setting expense currency 2016-02-02 00:07:09 +02:00
Hillel Coren
1a2c2712d0 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-02-01 15:58:59 +02:00
Hillel Coren
523b008d01 Added support for right aligning table columns 2016-02-01 15:58:52 +02:00
David Bomba
f90adb27e3 Merge pull request #678 from turbo124/master 
Update account from API
 2016-02-01 14:44:29 +11:00
David Bomba
c0545be0d4 update account from API 2016-02-01 14:42:05 +11:00
David Bomba
eef8ad22d0 Merge pull request #677 from turbo124/master 
Archive Product via API
 2016-02-01 13:33:27 +11:00
David Bomba
31b026d08f Added Archive Product via API 2016-02-01 13:32:12 +11:00
David Bomba
9e1a7eb632 Merge pull request #676 from turbo124/master 
Remove redundant emailInvoice method
 2016-02-01 09:46:07 +11:00
David Bomba
f48ac1b6f0 remove redundant method 2016-02-01 09:45:15 +11: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
02f137f95f Implemented StackTraceJS 2016-01-31 21:36:50 +02:00
Hillel Coren
63eda63d9f Fix for #672 2016-01-31 17:39:31 +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
David Bomba
204748ad33 Working on products api 2016-01-30 22:29:22 +11:00
David Bomba
63894e0f24 Working on products api 2016-01-30 22:27:26 +11:00
David Bomba
b93cd84052 Working on products api 2016-01-30 22:20:09 +11:00
David Bomba
32ed23cde7 Working on products api 2016-01-30 22:18:30 +11:00
David Bomba
43c6024f0f Working on products api 2016-01-30 22:17:10 +11:00
David Bomba
1f36e175dd Working on products api 2016-01-30 22:16:25 +11:00
David Bomba
1e8a4c2b70 Working on products api 2016-01-30 21:51:52 +11:00
David Bomba
1da8f6bc26 bug fixes 2016-01-30 20:57:47 +11:00
David Bomba
cc40f51f84 working on product API 2016-01-30 20:56:27 +11:00
David Bomba
020e428677 testing email functionality: 2016-01-29 12:47:35 +11:00
David Bomba
32acb8b86a Add send_invoice boolean in contact transformer 2016-01-29 10:08:11 +11:00
Hillel Coren
e245b6f639 Updated texts file 2016-01-28 16:34:22 +02:00
Hillel Coren
89622f86e2 Fix for #661 2016-01-28 16:07:03 +02:00
Hillel Coren
9d3d58def1 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-28 14:05:01 +02:00
Hillel Coren
1ac12e1506 Added basic stats for resellers 2016-01-28 14:04:55 +02:00
David Bomba
cae3b48cd4 Restore Invoice from API 2016-01-28 13:31:19 +11:00
David Bomba
165a382637 Restore an invoice from the API 2016-01-28 12:55:15 +11:00
David Bomba
8d6b4af8ba Added quote_invoice_id to Invoice transformer 2016-01-28 09:19:54 +11: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
David Bomba
84895907d1 Merge pull request #662 from turbo124/master 
update invoice status via API
 2016-01-27 21:01:24 +11:00
David Bomba
fa2187ce20 update invoice status via API 2016-01-27 21:00:00 +11:00
David Bomba
6455e25c3a Merge pull request #660 from turbo124/master 
Include archived clients
 2016-01-27 14:32:09 +11:00
David Bomba
76f4530ffd include archived clients 2016-01-27 14:31:38 +11:00
David Bomba
910e9db7a0 Merge pull request #659 from turbo124/master 
Added ability to convert a quote to an invoice through the API
 2016-01-27 12:57:28 +11:00
David Bomba
4799b2e86c Added ability to convert a quote to an invoice through the API 2016-01-27 12:56:24 +11:00
David Bomba
2db27caf90 Merge pull request #658 from turbo124/master 
Bug fixes
 2016-01-27 11:40:41 +11:00
David Bomba
71b2970279 Bug fixes 2016-01-27 11:36:21 +11:00
David Bomba
4f5dd12ea0 Merge pull request #657 from turbo124/master 
Bug Fixes
 2016-01-27 07:53:22 +11:00
David Bomba
c2bb8711a0 Bug Fixed 2016-01-27 07:52:30 +11: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
David Bomba
f80e738882 Bug Fix in taxrate transformer 2016-01-26 22:47:19 +11:00
David Bomba
e57f8f3c2e Swagger Typo fix 2016-01-26 22:37:16 +11:00
David Bomba
a4df265d09 Update client via API 2016-01-26 22:36:00 +11:00
Hillel Coren
c0531a8a06 Merge pull request #649 from sakalauskas/dev-api 
Add ability to include invoice invitations via API
 2016-01-25 09:38:13 +02:00
Laurynas Sakalauskas
cfe1836770 Added invitation transformer 2016-01-24 18:55:36 +00:00
Laurynas Sakalauskas
91d44dd301 Add ability to include invoice invitations via API 2016-01-24 18:37:24 +00:00
Hillel Coren
e4a6effc60 Merge pull request #642 from sakalauskas/dev-api 
Fixed ping route & added a way to find client by email address or if …
 2016-01-24 19:54:01 +02:00
Laurynas Sakalauskas
2478ec59a4 Revert store() method 2016-01-24 17:06:34 +00:00
Laurynas Sakalauskas
68665d2972 Added filtering by email 2016-01-24 16:59:01 +00: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
Laurynas Sakalauskas
0d2025c834 Fixed ping route & added a way to find client by email address or if not exist - create a new 2016-01-22 10:33:38 +00: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
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
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
86f1e13c87 Fix for #632 2016-01-18 16:09:06 +02:00
Hillel Coren
e4784035fe Bug fixes 2016-01-18 15:54:15 +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
Hillel Coren
6e5237b7dd Updated version 2016-01-17 16:36:22 +02:00
Hillel Coren
e5c455fd5d Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-17 15:07:44 +02:00
Hillel Coren
32ff390fea Revert change to hide unsent invoices 2016-01-17 15:07:32 +02:00
David Bomba
eeb977bab3 Added delete invoice functionality 2016-01-16 17:07:29 +11:00
David Bomba
12d3444808 By default include trashed invoices 2016-01-16 09:22:22 +11: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
David Bomba
7b61c8a46d Merge pull request #629 from turbo124/master 
return archived invoice as success
 2016-01-15 14:06:33 +11:00
David Bomba
ca591f4451 return archived invoice as success 2016-01-15 14:05:16 +11:00
Hillel Coren
9fdea0fe95 Fixes #627 2016-01-14 23:28:17 +02:00
Hillel Coren
4e77317767 Updated version 2016-01-13 23:46:12 +02:00
Hillel Coren
74c636aef2 Fix for #626 2016-01-13 23:38:15 +02:00
Hillel Coren
feb62b1253 Fix for #625 2016-01-13 20:06:01 +02:00
Hillel Coren
175c685032 Enabled creating recurring invoices through the API 2016-01-13 16:58:39 +02:00
Hillel Coren
8ab28ced1a Update version 2016-01-13 11:09:34 +02:00
Hillel Coren
ac58df4441 Bug fixes 2016-01-13 11:09:00 +02:00
Hillel Coren
8cefa9a707 Fixed problem with PDF preview after upgrading 2016-01-13 08:18:26 +02:00
Hillel Coren
7171e2b5a5 Fixed problem updating cache when upgrading 2016-01-12 19:18:38 +02:00
Hillel Coren
9bd6d1afe6 Fixed problem updating cache when upgrading 2016-01-12 15:54:19 +02:00
Hillel Coren
bc0ab97279 Enable setting the recurring due date through the API 2016-01-12 14:24:25 +02:00
David Bomba
6c4fe3f613 Revert "Working on API" 2016-01-12 21:17:08 +11:00
David Bomba
dab86580ba Merge pull request #616 from turbo124/master 
Working on API
 2016-01-12 20:30:32 +11:00
David Bomba
4e6d44fa87 Merge branch 'master' of https://github.com/turbo124/invoice-ninja 2016-01-12 20:28:34 +11:00
David Bomba
2b784ee85d If no invoice_number is set from API, automatically generate invoice_number 2016-01-12 20:28:20 +11:00
Hillel Coren
bdec20487a Updated version 2016-01-12 11:19:09 +02:00
Hillel Coren
b5cf87bc0d Bug fixes 2016-01-12 11:18:35 +02:00
Hillel Coren
5dbdec43f3 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-12 08:57:28 +02:00
Hillel Coren
90e7d5dafa Bug fixes 2016-01-12 08:57:19 +02:00
David Bomba
3e0b6948b5 Send down all quotes and recurring invoices in invoices GET call 2016-01-12 13:02:08 +11: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
5fbe59fa8b Auto-set last used design as account default for non pro 2016-01-10 20:17:55 +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
d8cb1b436d Expense module 2016-01-09 09:08:24 +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
David Bomba
9050c8790e Bug Fixes 2016-01-08 09:56:06 +11: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
steenrabol
4a0a9a3c99 expense 2016-01-07 12:08:20 +01:00
steenrabol
a52364a039 expense 2016-01-07 12:04:01 +01:00
steenrabol
45ba7ffc3b test 2016-01-07 09:11:18 +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
Hillel Coren
7beeb78126 Enabled updating/archiving invoice through the API 2016-01-06 22:46:11 +02:00
steenrabol
48ce3f64e6 expenses 2016-01-06 20:52:09 +01:00
Hillel Coren
9dc890d4f0 Include archived data when loading account data with the API 2016-01-06 19:33:34 +02: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
c91b15590c Fixes #601 2016-01-06 09:55:36 +02:00
Hillel Coren
e3e497bb8c Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-06 09:52:33 +02:00
Hillel Coren
18155a9482 Working on data import tranformers 2016-01-06 09:52:26 +02:00
David Bomba
35027dd139 API Put Stubs 2016-01-06 15:01:52 +11:00
David Bomba
f66539b0da Integrate Payments into API 2016-01-05 23:51:27 +11:00
steenrabol
d3ee8ed813 Expense module 2016-01-05 12:47:03 +01:00
Hillel Coren
cd2599fe58 Fix for #597 2016-01-04 00:02:13 +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
Hillel Coren
598a112101 Fixes #595 2016-01-02 22:37:45 +02:00
Joshua Dwire
103bce3f48 Make recurring invoice due date settings more translatable 2016-01-01 17:37:47 -05:00
hanne@hannenijhuis.nl
e460f154a5 Bug fix typo in TaskController 2016-01-01 15:32:09 +01:00
Hillel Coren
139088086f Fixed problem with empty fields in CSV import 2016-01-01 10:34:32 +02: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
06c1534093 Added getString helper to CSV import 2015-12-31 17:09:45 +02:00
Hillel Coren
2144870b96 Removed getInvoiceId from non-Wave transformers 2015-12-31 16:14:30 +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
c2c51360dd Fixes for #584 2015-12-31 10:04:12 +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
6af5084e0a Finish import changes 2015-12-30 09:42:41 -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
Hillel Coren
d1de95303b Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-12-28 12:16:03 +02:00
Hillel Coren
2ead34fef0 Enabled setting reminder before/after due date or invoice date 2015-12-28 12:15:56 +02:00
David Bomba
4bcf8c1922 date formatting products 2015-12-28 20:14:21 +11:00
Hillel Coren
9943c824dd Bug fixes 2015-12-27 14:45:57 +02:00
Hillel Coren
8d61925e06 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-12-27 13:38:01 +02:00
Hillel Coren
6f2c3c76a3 Bug fixes 2015-12-27 13:37:54 +02:00
David Bomba
5b87821774 Merge remote-tracking branch 'upstream/master' 2015-12-27 22:34:16 +11:00
Hillel Coren
c493f6e49a Working on the API 2015-12-27 13:08:58 +02:00
Hillel Coren
ddd5915ca1 git update 2015-12-27 09:36:22 +02:00
David Bomba
5a03b923db Merge branch 'master' of https://github.com/turbo124/invoice-ninja 2015-12-25 11:16:11 +11: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
David Bomba
d044cffa44 Merge remote-tracking branch 'upstream/master' 2015-12-22 22:19:43 +11:00
David Bomba
087b60a503 additional GET for user_accounts 2015-12-22 22:19:21 +11:00
Hillel Coren
8739a1b46b Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-12-21 21:58:02 +02:00
Hillel Coren
9603c43277 Bug fixes 2015-12-21 21:57:55 +02:00
David Bomba
68ee5d04a4 Tax Rate Transformer added 2015-12-21 18:36:29 +11:00
David Bomba
083e995e2b Working on API Transformers 2015-12-20 08:30:06 +11:00
David Bomba
79bef21e82 Added currency_id to client transformer 2015-12-18 19:33:14 +11:00
Hillel Coren
14152fd3f1 Added HTML formatting to system emails 2015-12-17 20:03:32 +02:00
Hillel Coren
b57866456c Bug fixes 2015-12-17 10:21:31 +02:00
Hillel Coren
c854f6ba16 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-12-17 10:20:02 +02:00
Hillel Coren
372ffb0ea9 Bug fixes 2015-12-17 10:19:56 +02:00
David Bomba
75fa8566c3 custom taxes boolean added to transformer 2015-12-17 13:33:40 +11: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
399ad76fc3 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-12-15 22:25:19 +02:00
Hillel Coren
08a4c4dcb4 Added email settings page 2015-12-15 22:25:12 +02:00
David Bomba
bc41eb0c42 Working on API 2015-12-15 22:03:01 +11:00
Hillel Coren
e893d74b41 Added company website 2015-12-14 23:05:17 +02:00
Hillel Coren
c5c5ff3458 Working on data import 2015-12-14 22:07:48 +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
1783cb5129 Working on data import 2015-12-10 15:35:40 +02:00
Hillel Coren
ff139bc09c Working on data import 2015-12-10 12:57:51 +02:00
Hillel Coren
d98a185c04 Fix for #557 2015-12-09 18:08:24 +02:00
Hillel Coren
3a5f2ebaf7 Fix for #557 2015-12-09 17:54:24 +02:00
Hillel Coren
0aca2e7fb4 Added check for account data 2015-12-09 17:47:14 +02:00
Hillel Coren
6fc8f76ea8 Working on data import 2015-12-08 12:10:20 +02:00
Hillel Coren
e46d804cd7 Working on importing data from more providers 2015-12-07 23:41:48 +02:00
Hillel Coren
f600cbb6dd Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-12-07 15:35:02 +02:00
Hillel Coren
1a474f362f Added support for country specific Euro formatting 2015-12-07 15:34:55 +02:00
David Bomba
def729bfac Added additional fields to invoice transformer 2015-12-04 10:02:31 +11:00
David Bomba
7182078acb Added additional fields to transformer 2015-12-04 10:00:39 +11: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
44336fd7c4 Bug fixes 2015-11-29 12:58:40 +02:00
Hillel Coren
72d906d6d2 Auto increment invoice number counter 2015-11-29 12:41:32 +02:00
Hillel Coren
68bb3c8a82 Added .env field for MySQL strict mode 2015-11-29 12:12:59 +02:00
Hillel Coren
64fec3b502 Updated to phantomjscloud v2 API 2015-11-28 22:00:24 +02:00
Hillel Coren
c6c9a34c04 Set default invoice values 2015-11-28 19:19:37 +02:00
Hillel Coren
cf458c52a2 Working on the API 2015-11-27 14:55:28 +02:00
Hillel Coren
1497b99b36 Update client API controller to use transformations 2015-11-25 13:44:43 +02:00
Hillel Coren
1a37a197a5 Working on CSV import 2015-11-25 11:35:24 +02:00
Hillel Coren
a324434375 Working on invoice CSV import 2015-11-24 23:10:09 +02:00
Hillel Coren
dbe7de2d05 Working on invoice CSV import 2015-11-24 22:54:04 +02:00
Hillel Coren
bc14df4658 Working on invoice CSV import 2015-11-24 22:41:08 +02:00
Hillel Coren
ae57fdf9a3 Updated readme 2015-11-24 21:45:38 +02:00
rafael.sisweb
5888fdf12a Missing action header on datatables 2015-11-24 06:59:30 -05:00
Hillel Coren
681e14c63e Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-11-22 12:00:03 +02:00
Hillel Coren
5d26eadb9c Removed ENV_PRODUCTION 2015-11-22 11:59:56 +02:00
David Bomba
78c74471cd Merge pull request #546 from turbo124/master 
Additional statics included in API
 2015-11-22 08:12:10 +11:00
David Bomba
f3960d799e Additional statics included in API 2015-11-22 08:11:23 +11: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
David Bomba
6461ff3d4f added user_id to invoicetransformer 2015-11-21 20:31:31 +11:00
David Bomba
e8239bbf37 Added InvoiceStatus to static api call 2015-11-20 08:30:30 +11:00
Hillel Coren
d35b0f7f35 Added products to the API 2015-11-19 13:50:35 +02:00
Hillel Coren
01946f7bc8 Added static data to the API 2015-11-19 13:37:30 +02:00
David Bomba
43b6e749c3 transformation of IDs to PUBLIC_IDs 2015-11-19 19:42:53 +11:00
David Bomba
f2fdb7f51c Merge pull request #535 from turbo124/master 
swapped out user_id for public_id
 2015-11-19 14:03:16 +11:00
David Bomba
2866201416 swapped out user_id for public_id 2015-11-19 13:58:40 +11:00
Hillel Coren
dede870fed Bug fixes 2015-11-19 00:02:01 +02:00
Hillel Coren
4a0906a92c Bug fixes 2015-11-18 23:37:11 +02:00
Hillel Coren
947b9690d6 Cleaning up code 2015-11-18 19:42:09 +02:00
Hillel Coren
bcad8af535 Working on import 2015-11-18 19:16:23 +02:00
Hillel Coren
73a0192446 Working on import 2015-11-18 18:08:37 +02:00
Hillel Coren
5c6b2fe906 Working on import 2015-11-18 16:40:50 +02:00
Hillel Coren
24bcb0e2e5 Merging import changes 2015-11-17 15:53:14 +02:00
Hillel Coren
9f4cd62832 Add space 2015-11-17 15:42:54 +02:00
Hillel Coren
1d82881814 Removing payments of archived/deleted invoices from the dashboard 2015-11-17 10:55:33 +02:00
Hillel Coren
b4e5690103 Fixed problem creating client with invoice in the API 2015-11-17 10:46:14 +02:00
Hillel Coren
cd3aecdf5b Clarifying email errors 2015-11-16 21:51:34 +02:00
Hillel Coren
3767a8a6a7 Bug fixes 2015-11-16 21:29:22 +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
Hillel Coren
e93a7aa915 Bug fixes 2015-11-16 14:30:44 +02:00
Hillel Coren
d68b78f926 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-11-15 19:23:56 +02:00
Hillel Coren
9a0058deb1 Bug fixes 2015-11-15 19:23:45 +02:00
David Bomba
325605de8f Merge pull request #527 from turbo124/master 
Flattened API JSON output
 2015-11-15 22:08:13 +11:00
David Bomba
d5cf1279c7 Modifying JSON structure for API 2015-11-15 22:04:06 +11:00
David Bomba
e3c7fa572b Modifying JSON structure for API 2015-11-15 21:43:32 +11:00
Hillel Coren
03035e8bdf Bug fixes 2015-11-15 12:08:32 +02:00
Hillel Coren
c7a92e4862 Bug fixes 2015-11-15 11:50:21 +02:00
Hillel Coren
9135177c1f Git update 2015-11-15 09:06:10 +02:00
Hillel Coren
96a58ecf16 Bug fixes 2015-11-15 08:39:25 +02:00
David Bomba
3ce55d22ef hello 2015-11-14 19:28:17 +11:00
Hillel Coren
6da8194332 Working on Mollie Pay 2015-11-13 15:40:42 +02:00
Hillel Coren
0f060c6ff2 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-11-12 22:36:51 +02:00
Hillel Coren
f574a79fe6 Improved data export 2015-11-12 22:36:28 +02:00
Eduardo Cruz
0feb5cb082 Updating the User Modal fillable attributes. 
Replacing name with first_name and last_name
 2015-11-11 13:34:18 -03:00
Hillel Coren
933b94e8b5 Improved history feature 2015-11-11 18:24:48 +02:00
Hillel Coren
7273e39f1e Bug fixes 2015-11-11 14:17:58 +02:00
Hillel Coren
7b6699c2bc Enabled grouping report by payments 2015-11-11 00:07:05 +02:00
David Bomba
36ccb4e331 shift SITE_URL into user_accounts key path 2015-11-10 20:32:45 +11:00
Hillel Coren
e26bf521e4 Working on the API 2015-11-10 09:13:40 +02:00
Hillel Coren
b55a3226b7 Starting on stripejs 2015-11-09 21:24:22 +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
Hillel Coren
be6b7fed7a Working on the API 2015-11-09 04:10:01 +02:00
Hillel Coren
0524f53850 Working on Swagger 2015-11-08 23:57:28 +02:00
Hillel Coren
5d3a24800e Working on Swagger 2015-11-08 23:53:13 +02:00
Hillel Coren
2f9dd707f7 Working on the API 2015-11-08 23:12:50 +02: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
ba90eb45ad Working on the API 2015-11-08 11:43:32 +02:00
Hillel Coren
bef7454b73 Working on gmail actions 2015-11-08 10:43:49 +02:00
Hillel Coren
df8fb6f459 Merge pull request #510 from turbo124/api-mapping 
Api mapping
 2015-11-07 20:18:09 +02:00
Hillel Coren
156ca3cb86 Commenting out API command 2015-11-07 19:59:14 +02:00
David Bomba
81fc77d142 Mapped transformers 2015-11-07 23:15:37 +11:00
Hillel Coren
15b17dfeed Added view presenters 2015-11-06 12:59:53 +02:00
Hillel Coren
aa69a17232 Check for duplicate invoice number when approving a quote 2015-11-06 10:21:45 +02:00
Hillel Coren
a30b9039de Bug fixes 2015-11-06 09:54:29 +02:00