1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 00:41:34 +02:00
Commit Graph

1912 Commits

Author SHA1 Message Date
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