Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 23:22:52 +01:00
Code Issues Releases Activity
6,472 Commits 7 Branches 924 Tags 2 GiB
640d9323a2
Commit Graph

1612 Commits

Author SHA1 Message Date
Hillel Coren
9fc53c8b13 Support canceling pro trial 2017-01-04 13:20:56 +02:00
Hillel Coren
7a58108cd0 Refactored number genrating code 2017-01-04 10:11:32 +02:00
Hillel Coren
c37f6cd55b Update version 2017-01-04 09:02:55 +02:00
Hillel Coren
69369619af Support automatic client ids 2017-01-03 21:48:40 +02:00
Hillel Coren
a3c5b83d2d Update version 2017-01-03 12:12:07 +02:00
Hillel Coren
4f04e56c7e Fix timezone issue with dates 2017-01-02 22:43:03 +02:00
Hillel Coren
977e96dbc3 Add ‘More Actions’ to payments form 2017-01-02 22:23:29 +02:00
Hillel Coren
9b13321a7f Store that invoice was authorized in the session #1230 2017-01-02 14:47:39 +02:00
Hillel Coren
076a458567 Remove inclusive from account default list 2017-01-02 13:44:33 +02:00
Hillel Coren
c4cdc45a93 Add inclusive tax rates #552 2017-01-02 13:38:58 +02:00
Hillel Coren
4307bb2984 Move bluevine_status to companies table 2017-01-02 13:37:28 +02:00
Hillel Coren
e71d254a09 Show ‘Mark Paid’ in list/more actions for draft invoices 2017-01-01 20:49:37 +02:00
Hillel Coren
cfdc8a3104 Add plan for up to 20 users 2017-01-01 20:43:46 +02:00
Hillel Coren
67140d87ae Only show Bluevine to primary account 2017-01-01 13:09:42 +02:00
Hillel Coren
152b8770f5 Simplify new company process 2016-12-29 22:24:11 +02:00
Hillel Coren
e313a32c6a Show app link when logging in on iOS device 2016-12-29 21:49:55 +02:00
Hillel Coren
75900c296e Improved Swagger annotations 2016-12-29 18:17:17 +02:00
Hillel Coren
03a2a1a9c2 Increase import limit 2016-12-28 20:50:59 +02:00
Hillel Coren
d6b0827eac Support renewing white label license early 2016-12-28 20:40:25 +02:00
Hillel Coren
f0f62790a6 Show dashboard alert when white label license is expired 2016-12-28 16:39:29 +02:00
Hillel Coren
cf0889bc90 Improvements to white label purchase 2016-12-27 23:56:55 +02:00
Hillel Coren
edc3531965 Add require HTTPS self host setting 2016-12-25 22:31:02 +02:00
Hillel Coren
3f8efb986d Enable sending message from within the app 2016-12-25 19:43:42 +02:00
Hillel Coren
c26bebd063 Add plan deadline logging 2016-12-25 11:49:33 +02:00
Hillel Coren
b7465a8f17 Fix data import 2016-12-22 19:12:12 +02:00
Hillel Coren
6e8f87a198 Fix total balance for vendor with multiple expense currencies 2016-12-20 17:48:58 +02:00
Hillel Coren
cd97904b75 Remove mcrypt #1188 2016-12-20 16:28:44 +02:00
Hillel Coren
312e8e8e48 Fixes #1211 2016-12-20 15:09:41 +02:00
Hillel Coren
6c30a603f6 Update version to 2.9.1 2016-12-20 14:44:06 +02:00
Hillel Coren
68d3322032 Fix for #1209 2016-12-20 10:50:23 +02:00
Hillel Coren
db26b169cd Clarify sample values in invoice design page 2016-12-19 20:30:27 +02:00
Hillel Coren
2f8344df66 Added deletedQuote subscription 2016-12-19 20:06:30 +02:00
Hillel Coren
989d55d692 Fix for module column headers 2016-12-19 13:22:03 +02:00
Hillel Coren
f8d95e1a31 Merge pull request #1184 from justkidding96/develop 
Added new event listeners for Zapier
 2016-12-16 15:17:30 +02:00
Hillel Coren
89e38d888e Bumped version number to 2.9.0 2016-12-15 17:21:36 +02:00
Hillel Coren
fc87cbafe6 Support exporting products 2016-12-15 15:28:24 +02:00
Hillel Coren
82857d642f Adjustments to task projects 2016-12-15 15:13:24 +02:00
Hillel Coren
d1f496023b Adjustments to task projects 2016-12-15 14:17:10 +02:00
Hillel Coren
16dba695b1 Support bulk mark paid 2016-12-14 21:47:22 +02:00
Hillel Coren
9201004f33 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-12-14 16:19:30 +02:00
Hillel Coren
cc8959626f Support pro plan discounts 2016-12-14 16:19:16 +02:00
David Bomba
0ceeefb10b Improve error reporting from API (#1194) 
* apply API response across all requests

* apply API response across all requests
 2016-12-13 17:52:09 +11:00
Hillel Coren
2ccb54bf42 Added rbits data 2016-12-12 20:42:51 +02:00
Hillel Coren
d5134daa01 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-12-12 00:38:10 +02:00
Hillel Coren
03e9e978d7 Added social icons to navigation footer 2016-12-12 00:25:22 +02:00
David Bomba
ba9c06cb18 API Error handling (#1189) 
* bug fix

* csrf filters

* request API error handler implementation

* add utils dependency

* add response dependency
 2016-12-11 20:31:29 +11:00
Hillel Coren
338f3f0c7f CRUD 2016-12-09 13:17:04 +02:00
Hillel Coren
954c04c917 CRUD 2016-12-09 12:35:49 +02:00
Hillel Coren
249965df5c CRUD 2016-12-08 22:51:53 +02:00
Hillel Coren
bb55beaa64 Working on CRUD 2016-12-08 17:09:45 +02:00
Hillel Coren
2762debd59 Working on module CRUD 2016-12-08 15:41:35 +02:00
Hillel Coren
e0e88de8b3 Add alias for web to auth routes 2016-12-07 22:49:27 +02:00
Hillel Coren
4821908521 Fix for tests 2016-12-06 20:23:33 +02:00
Hillel Coren
d7ac1cd33b Fix for tests 2016-12-06 20:05:55 +02:00
Hillel Coren
71e2b1f165 Cleaned up routes file 2016-12-06 14:00:27 +02:00
Hillel Coren
f62f18ea78 Enabled specifying email from address 2016-12-06 11:37:04 +02:00
Hillel Coren
25a95e8e25 Don't apply subdomain rules to self host 2016-12-05 21:54:10 +02:00
Hillel Coren
67f44775e3 Fix for tests 2016-12-05 20:56:57 +02:00
Hillel Coren
2d0effda63 Support exporting expenses 2016-12-05 20:35:01 +02:00
Rowdy Klijnsmit
bb2eea035a Added new event listeners for Zapier 
* Add updated quote listener
* Add updated invoice listener
* Add deleted invoice listener
 2016-12-05 15:39:27 +01:00
Hillel Coren
78a2a66729 Hide draft invoices from the client portal 2016-12-05 10:11:33 +02:00
Hillel Coren
8d8156f580 Hide draft invoices from the client portal 2016-12-04 23:26:38 +02:00
Hillel Coren
9398c45b56 Prevent changing credit's client 2016-12-04 12:24:48 +02:00
Hillel Coren
f739976de2 Fix for gateway type in buy now buttons 2016-12-04 11:47:58 +02:00
Hillel Coren
531b707945 Support setting redirect URL for buy now button 2016-12-02 15:37:25 +02:00
Hillel Coren
c8d4941fa6 Support setting redirect URL for buy now button 2016-12-02 14:51:05 +02:00
Hillel Coren
d7f22041ab Added UI setting to enable JS PDF renderer 2016-12-01 21:39:00 +02:00
Hillel Coren
7f72836aad Make larger area clickable in datatable header 2016-11-30 20:33:05 +02:00
Hillel Coren
55340b8d13 Support editing credits 2016-11-30 20:21:50 +02:00
Hillel Coren
556737f929 Update version 2016-11-29 21:07:07 +02:00
Hillel Coren
bbbf1237c5 Added task projects 2016-11-29 19:47:26 +02:00
Hillel Coren
ae28c3c5c3 Working on bulk list changes 2016-11-27 11:46:32 +02:00
Hillel Coren
12fd825de5 Working on datatables on vendor page 2016-11-25 16:02:39 +02:00
Hillel Coren
b83647facc Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-11-25 12:53:44 +02:00
Hillel Coren
1323f21867 Working on datatables on client page 2016-11-25 12:53:35 +02:00
David Bomba
c771b12494 enable stateless social login (#1170) 2016-11-25 20:56:48 +11:00
Hillel Coren
eb710348bf Refactor datatable sort columns 2016-11-24 11:46:57 +02:00
Hillel Coren
5c6c9e399b Working on datatables 2016-11-24 11:41:11 +02:00
Hillel Coren
8bac6b6c27 Working on adding bulk actions to client page 2016-11-24 11:22:37 +02:00
Hillel Coren
ccecb65f58 Working on status selector 2016-11-20 16:08:36 +02:00
Hillel Coren
23c098014a Improved status selection 2016-11-18 15:31:43 +02:00
Hillel Coren
fce46114bc Working on list status select 2016-11-17 16:29:02 +02:00
Hillel Coren
de2825750d Add eager loading to API tasks 2016-11-16 13:12:10 +02:00
Hillel Coren
e1a84a29e1 Tweaks to BlueVine 2016-11-16 12:41:32 +02:00
Hillel Coren
3680985a20 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-11-15 21:28:34 +02:00
Hillel Coren
7e80f4de2e Fix subscription JSON response 2016-11-15 10:39:35 +02:00
Joshua Dwire
3d84e408bb Only do annual income calculations if we're going to show the BlueVinePromo. 2016-11-14 13:42:09 -05:00
Joshua Dwire
179713711f Merge remote-tracking branch 'upstream/develop' into 2016-11-bluevine-integration 2016-11-14 13:34:27 -05:00
David Bomba
fa39434ac9 Tasks via API (#1152) 
* revert error reporting

* Add Task attributes
 2016-11-14 20:43:10 +11:00
Joshua Dwire
82167de1d2 Merge remote-tracking branch 'upstream/develop' into 2016-11-bluevine-integration 2016-11-10 18:29:13 -05:00
Joshua Dwire
5bee41789f Show BlueVine quote and redirect to BlueVine 2016-11-10 18:24:54 -05:00
Hillel Coren
7155524575 Update version 2016-11-06 15:58:00 +02:00
Hillel Coren
905593b525 Prevent emailing recurring invoice through API 2016-11-06 15:57:33 +02:00
Hillel Coren
26f4a84897 Track campaign fields with company 2016-11-06 14:16:18 +02:00
Hillel Coren
31d5e28b69 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-11-06 13:45:09 +02:00
Hillel Coren
ef44a95902 Working on signature feature 2016-11-06 13:44:58 +02:00
David Bomba
c905e781c0 revert error reporting (#1142) 2016-11-05 12:32:06 +11:00
David Bomba
0a4d55e0aa Generic message 
Change error text to generic Entity not found.
 2016-11-05 06:36:49 +11:00
David Bomba
f5e18f3355 API Error handling improvements (#1141) 
* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* generic catch all HTTP error handler for API

* Client not found error handling via API

* Client not found error handling via API
 2016-11-05 06:20:33 +11:00
Hillel Coren
3ccb33ec21 Support signing for invoice 2016-11-04 15:34:15 +02:00
Joshua Dwire
5713561261 Add UI for BlueVine signup 2016-11-03 16:54:33 -04:00
David Bomba
d466a1bf5a bug fixes 2016-11-03 22:39:29 +11:00
David Bomba
06150ce30a add show() Client 2016-11-03 21:36:05 +11:00
Hillel Coren
eca4d7ce6a Add financial year start setting for dashboard 2016-10-31 11:11:30 +02:00
Hillel Coren
16940fd690 Fix translations in client portal 2016-10-30 20:12:02 +02:00
Hillel Coren
02c300e9f9 Prevent session history from showing as blank 2016-10-30 11:23:36 +02:00
Hillel Coren
2a97fc5456 Prevent deleted invoice from being paid 2016-10-30 11:04:08 +02:00
Hillel Coren
bd624710a8 Minor fixes 2016-10-28 12:01:35 +03:00
David Bomba
8f1a9a2e5d Expense Categories route (#1125) 
* Expense categories

* add dependencies

* expense categories

* expense categories

* expense categories

* Change expense categories into a resource route
 2016-10-28 19:37:28 +11:00
Hillel Coren
bb0ce2da38 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-10-28 09:43:07 +03:00
David Bomba
dedb85c8d6 Add / Update expense categories from API (#1124) 
* Expense categories

* add dependencies

* expense categories

* expense categories

* expense categories
 2016-10-28 12:59:57 +11:00
Hillel Coren
7465eb1631 Include taxes in expense amount 2016-10-27 17:26:42 +03:00
Hillel Coren
c3c0ece14a Round qty in product report 2016-10-27 16:45:06 +03:00
Hillel Coren
185958ba2c Fix for logos in production 2016-10-27 12:03:25 +03:00
Hillel Coren
5b80e32fa7 Add ability to enable\disable modules 2016-10-27 11:57:51 +03:00
Hillel Coren
b7c783aa15 Support sending API secret as header 2016-10-26 10:24:16 +03:00
Hillel Coren
3023eeb058 Fix for uploading multiple documents 2016-10-25 20:16:29 +03:00
Hillel Coren
7fcc634a74 Redirect to dashboard when switching accounts if viewing an entity 2016-10-25 17:29:37 +03:00
Hillel Coren
c0a3971ca5 Store sidebar state in localstorage 2016-10-25 17:07:56 +03:00
Hillel Coren
6a55cf5b43 Add API support for expenses 2016-10-23 11:01:21 +03:00
Hillel Coren
fc683784fc Remove duplicate activity records for expenses and tasks 2016-10-21 09:54:28 +03:00
Hillel Coren
83b66c880b Track changes to expenses in activities 2016-10-20 23:17:37 +03:00
Hillel Coren
040fb76a48 UI to apply white label license 2016-10-20 21:35:59 +03:00
Hillel Coren
a0f8475a35 Enable selecting currency symbol or code 2016-10-20 17:17:47 +03:00
Hillel Coren
b448f459f8 Fix task timer #1109 2016-10-19 10:17:23 +03:00
Hillel Coren
89088e5517 Fix product list filter 2016-10-18 21:15:08 +03:00
Hillel Coren
733890ec3f Show archived/deleted in breadcrumbs 2016-10-18 17:55:07 +03:00
David Bomba
b8d0498560 Merge pull request #1107 from turbo124/develop 
Fix bug when deleting Vendor
 2016-10-18 20:58:00 +11:00
David Bomba
a8cf11604e fixed delete request type 2016-10-18 20:54:19 +11:00
David Bomba
3fcb560232 fixed delete request type 2016-10-18 20:53:17 +11:00
David Bomba
f30a25b0eb fixed bug when saving vendorcontact 2016-10-18 20:51:34 +11:00
David Bomba
ce0662f7b3 Merge pull request #1106 from turbo124/develop 
Vendor API POST and PUT methods
 2016-10-18 20:36:40 +11:00
David Bomba
b013d118ab Add Delete/Update methods into VendorAPIController 2016-10-18 19:31:21 +11:00
Hillel Coren
7c0eea08cd Added new upgrade modal 2016-10-16 09:38:04 -04:00
Hillel Coren
b36ea06303 Bug fix for reports 2016-10-13 12:46:29 +03:00
Hillel Coren
cf53151400 Git update 2016-10-11 13:07:06 +03:00
Hillel Coren
147df1ef91 Standardize archive/deleted behaviors 2016-10-10 11:40:04 +03:00
Hillel Coren
d046679dab Support OAuth login on iPhone 2016-10-06 15:46:27 +03:00
Hillel Coren
a1fcc3519a Support validating OAuth token 2016-10-05 21:51:08 +03:00
Hillel Coren
08a07f09ed Add link to Transifex 2016-10-05 21:20:00 +03:00
Hillel Coren
acc48081e5 Improve add gateway process 2016-10-05 17:02:36 +03:00
Hillel Coren
de7ecbd3cb Fix for tests 2016-10-02 11:47:24 +03:00
Hillel Coren
ed1edc64bc Fix for API payment validation 2016-09-27 17:13:42 +03:00
Hillel Coren
6088a36175 Support for custom gateway 2016-09-26 12:33:30 +03:00
Hillel Coren
078527443f Enable recurring for a cloned invoice 2016-09-26 09:54:59 +03:00
Hillel Coren
0d3be448df Bug fixes for import page 2016-09-25 21:13:14 +03:00
Hillel Coren
b624bb13c3 Fix problem clearing duplicate invoice number error 2016-09-25 20:36:15 +03:00
Hillel Coren
ae2c9d6252 Enable resubmitting form if invoice fails to save 2016-09-25 13:42:15 +03:00
Hillel Coren
f3a9f88107 Enable resubmitting form if invoice fails to save 2016-09-25 13:41:38 +03:00
Hillel Coren
249c89dbfd Added products to main navigation 2016-09-23 17:00:47 +03:00
Hillel Coren
5d04bdab21 Add credits to the client portal 2016-09-23 12:02:48 +03:00
Hillel Coren
a8cd70fa16 Working on client portal header 2016-09-22 23:38:07 +03:00
Hillel Coren
bcb5b7ca76 Prevent using update for ninja instance 2016-09-21 21:22:30 +03:00
Hillel Coren
0b54c8408a Merge pull request #1081 from codedge/Self-updater-integration 
Integrate updater in sidebar
 2016-09-21 20:54:55 +03:00
Holger Lösken
752c1684df Integrate updater in sidebar 
- Show little badge, when update available
- Remove download only link
- Change self update texts
- Update to latest version of laravel-selfupdater package
 2016-09-21 15:25:56 +00:00
Hillel Coren
89fe6c1566 Update version 2016-09-20 21:34:17 +03:00
Hillel Coren
092f842592 Clarify API secret error 2016-09-20 09:03:07 +03:00
Hillel Coren
753e482144 Rework redirect after bulk edit logic 2016-09-19 16:30:46 +03:00
Hillel Coren
767d4d148a Fix for null reference 2016-09-19 10:04:30 +03:00
Hillel Coren
c1696ef8d8 Task report 2016-09-18 22:28:37 +03:00
Hillel Coren
ec963e0823 Added basic task report 2016-09-18 20:45:41 +03:00
Hillel Coren
1e48a9c17d Use improve date selector in reports 2016-09-18 17:06:56 +03:00
Hillel Coren
9a04b105f9 Update version 2016-09-18 12:26:57 +03:00
Hillel Coren
8ce558d391 Fix for unique invoice number check with slashes 2016-09-18 12:26:18 +03:00
Hillel Coren
d273cb65c7 Fix for CSRF token 2016-09-18 10:08:56 +03:00
Hillel Coren
e743af4d24 Merged #1062 2016-09-15 13:41:09 +03:00
Hillel Coren
ee55374fc1 Add limit for number of invoice items 2016-09-14 10:39:08 +03:00
Hillel Coren
f5a9a66584 Optimize invoice page 2016-09-14 10:32:22 +03:00
Hillel Coren
6db9126ea6 Made client portal link easier to share 2016-09-13 16:32:03 +03:00
Hillel Coren
0301c3a97c Support default invoice tax with buy now buttons 2016-09-13 11:48:05 +03:00
Hillel Coren
4d1e4f0d43 Bumped version number to 2.7.0 2016-09-12 13:15:04 +03:00
Hillel Coren
74d0973978 Fix for claiming white label license 2016-09-12 09:30:31 +03:00
Hillel Coren
db4dbdc87e Cleaning up errors from the logs 2016-09-12 08:51:41 +03:00
Hillel Coren
ef81549694 Working on the dashboard 2016-09-11 20:05:59 +03:00
Hillel Coren
ce3a510037 Working on the dashboard 2016-09-11 17:30:23 +03:00
Hillel Coren
49095c30a1 Timeout after inactivity 2016-09-06 12:24:25 +03:00
Hillel Coren
4841ec38ce Prevent bots from using buy now buttons 2016-09-06 12:03:42 +03:00
Hillel Coren
aee75551b8 Tweak styling 2016-09-06 10:20:51 +03:00
Hillel Coren
d14cf5f9ed Working on invoice fields 2016-09-05 15:28:59 +03:00
Hillel Coren
03cc5035c5 Updated version 2016-09-05 08:21:44 +03:00
Hillel Coren
08590a4b6f Working on invoice fields 2016-09-05 08:10:39 +03:00
Hillel Coren
188486641a Working on design 2016-09-02 17:53:16 +03:00
Hillel Coren
8696acf4d3 Reduce extra queries 2016-09-01 20:02:37 +03:00
Hillel Coren
e535750127 Working on history sidebar 2016-09-01 18:52:26 +03:00
Hillel Coren
db0c305b4f Working on history sidebar 2016-08-31 22:10:41 +03:00
Hillel Coren
a2f7d32e57 Working on the sidebars 2016-08-31 12:58:31 +03:00
Hillel Coren
12d70f56c7 Added helper dev code 2016-08-29 18:04:01 +03:00
Hillel Coren
fd5fa8f557 Prevent entering payment for recurring invoice through the API 2016-08-28 20:52:25 +03:00
Hillel Coren
4ce11fd9f6 Log error if we fail to parse the invoice history backup 2016-08-28 17:27:45 +03:00
Hillel Coren
56856f1435 Set payment min amount to 0.01 2016-08-28 17:19:33 +03:00
Hillel Coren
d09bb3b851 Remove failed/refunded payments from reports 2016-08-28 13:20:16 +03:00
Hillel Coren
fda1fc439f Added invoice_date to required fields 2016-08-28 13:14:28 +03:00
Hillel Coren
298bde6603 Require date when creating payment 2016-08-25 17:31:36 +03:00
Hillel Coren
d55cdd7619 Working on sidebar 2016-08-23 23:20:03 +03:00
Hillel Coren
26bf6725d7 Fix for expense categories 2016-08-23 13:42:02 +03:00
Hillel Coren
59451112fe Log OFX parsing errors 2016-08-22 13:32:10 +03:00
Hillel Coren
5389a5aa87 Merge branch 'Self-updater' of https://github.com/codedge/invoiceninja into codedge-Self-updater 
Conflicts:
	resources/lang/en/texts.php
 2016-08-21 19:39:31 +03:00
Hillel Coren
de602283c1 Added 'tax' as custom label 2016-08-21 18:39:43 +03:00
Hillel Coren
6c92a6a94a Enabled adding expense to open invoice 2016-08-21 18:25:35 +03:00
Holger Lösken
d2d64d2a63 Use self-updater package, initial commit 2016-08-19 13:13:55 +00:00
Hillel Coren
6485ab44cc Fix for #993 2016-08-19 15:43:25 +03:00
Hillel Coren
8bcae45b00 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-08-19 13:23:05 +03:00
Hillel Coren
3a7d21a0b0 Added basic product report 2016-08-18 12:17:02 +03:00
Hillel Coren
106cefd9c9 Updated hosted pricing 2016-08-18 11:54:56 +03:00
David Bomba
6d227968c0 type 2016-08-18 17:54:47 +10:00
David Bomba
62e1442a30 merge 2016-08-18 17:33:12 +10:00
Hillel Coren
6f6a475633 API changes 2016-08-17 17:29:25 +03:00
David Bomba
9dd170d698 adding new CSRF white list items 2016-08-17 21:29:48 +10:00
Hillel Coren
6675814f8d Added docs to the subdomain exclude list 2016-08-17 13:08:46 +03:00
Hillel Coren
f7e499da4d Disable date validation 2016-08-15 22:57:05 +03:00
Hillel Coren
d94974db59 Added activities to API dashboard data 2016-08-15 16:43:59 +03:00
Hillel Coren
2ebd40f46e Added activities to API dashboard data 2016-08-15 16:43:26 +03:00
Hillel Coren
8262e40942 Working on dashboard API 2016-08-15 06:46:47 +03:00
Hillel Coren
bfae5018e0 Fixes for the bot 2016-08-14 12:30:16 +03:00
Hillel Coren
54a00f7bea Fix for invoice item model 2016-08-14 09:50:41 +03:00
Hillel Coren
e3d9ac9724 Updated version 2016-08-14 09:08:41 +03:00
Hillel Coren
ce2c71843c Working on the bot 2016-08-13 22:19:37 +03:00
Hillel Coren
1f537c77af Change for tests 2016-08-10 21:07:02 +03:00
Hillel Coren
73574fbd14 Workign on the bot 2016-08-10 20:48:24 +03:00
Hillel Coren
e7e3ce6e5c Working on the bot 2016-08-10 17:04:33 +03:00
Hillel Coren
0a7381294e Working on the bot 2016-08-10 17:04:17 +03:00
Hillel Coren
815c3991a6 Working on the bot 2016-08-10 15:57:34 +03:00
Hillel Coren
d374843e50 Working on the bot 2016-08-09 23:06:24 +03:00
Hillel Coren
5a4f705c8b working on the bot 2016-08-09 17:14:26 +03:00
Hillel Coren
e65fdd54b0 Fix for online payments page 2016-08-08 21:21:43 +03:00
Hillel Coren
472ba842eb Working on the bot 2016-08-08 17:45:37 +03:00
Hillel Coren
f8fda5f241 Working on the bot 2016-08-07 22:42:32 +03:00
Hillel Coren
325aaa3272 Added back error method 2016-08-07 22:42:24 +03:00
Hillel Coren
045c25d3a7 Set grandfathered id 2016-08-07 11:10:59 +03:00
Hillel Coren
b8a124dc0f Working on our bot 2016-08-07 09:10:36 +03:00
Hillel Coren
f1a278e4ff Working on our bot 2016-08-06 20:54:56 +03:00
Hillel Coren
0746500c1a Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-08-04 20:02:55 +03:00
Hillel Coren
7f3bd44d9a Working on bots 2016-08-04 20:01:30 +03:00
David Bomba
ef8d2615f4 improve error handling for document downloads 2016-08-03 23:03:14 +10:00
David Bomba
e393b891bd improve error handling for document downloads 2016-08-03 23:02:42 +10:00
Hillel Coren
d64f18ef99 Looking into bots... 2016-08-03 12:40:40 +03:00
Hillel Coren
af78a3dd2d Test Stripe credentials when adding gateway 2016-07-29 14:58:26 +03:00
Hillel Coren
a26cb74170 Don't require expense date 2016-07-28 22:51:32 +03:00
Hillel Coren
718fd928a4 Updated version 2016-07-28 12:20:36 +03:00
Hillel Coren
aa53a96b5d Verify that invoice number is unique using JS 2016-07-27 15:46:05 +03:00
Hillel Coren
f9c8b7eb9b Updated version number 2016-07-27 14:46:11 +03:00
Hillel Coren
05a92fea8d Fix for report checkboxes 2016-07-27 13:40:54 +03:00
Hillel Coren
7c314347db Fix for upgrading Stripe accounts 2016-07-27 12:53:11 +03:00
Hillel Coren
8c15e2a735 Fix for payment gateway failing validation 2016-07-21 20:09:33 +03:00
Hillel Coren
498578cefc Rollback to 2.6.5 2016-07-21 15:35:23 +03:00
Hillel Coren
f4f13d3119 Fix for attaching files 2016-07-20 20:09:03 +03:00
Hillel Coren
7bb8f0ca4a Merge https://github.com/codedge/invoiceninja into codedge-#904-Unify-js-no-public-js 
Conflicts:
	app/Http/Controllers/AccountController.php
	resources/lang/en/texts.php
 2016-07-20 10:49:08 +03:00
Hillel Coren
a3271d6688 Merge pull request #994 from codedge/#705-set-app-language-for-templates 
Make app language available in templates
 2016-07-20 10:40:21 +03:00
Hillel Coren
55fb959d45 Update version 2016-07-20 10:23:12 +03:00
Holger Lösken
68a1a81748 Make app language available in templates 
- Fix #705
- $appLanguage can be fetched inside each template
 2016-07-19 19:04:31 +02:00
Hillel Coren
4348270c96 Bumped version number to 2.6.4 2016-07-19 19:15:30 +03:00
Hillel Coren
bd70b4596c Add batch limits for hosted imports 2016-07-19 18:57:01 +03:00
Hillel Coren
2e0129b279 Fix when adding a new user who is already logged in 2016-07-19 10:59:50 +03:00
Hillel Coren
cb4a2b6a49 Fix for app cipher setting 2016-07-19 10:38:54 +03:00
Hillel Coren
dcfea90781 Merge pull request #989 from codedge/Put-cipher-back-to-env 
Put APP_CIPHER back to .env
 2016-07-19 10:28:05 +03:00
Hillel Coren
7cb797fcc2 Fix for cancel account 2016-07-18 22:07:23 +03:00
Hillel Coren
ce6068f924 Additional online payment checks 2016-07-18 22:03:28 +03:00
Hillel Coren
cef35a98e1 Prevent creating payment for a quote through the API 2016-07-18 21:12:18 +03:00
Hillel Coren
5e5207973f Prevent entering online payment for deleted invoice 2016-07-18 21:05:40 +03:00
Hillel Coren
fb28521160 Increase API page limit 2016-07-18 14:15:52 +03:00
Holger Lösken
3d7e412d24 Put APP_CIPHER back to .env 
- APP_CIPHER included in .env.example
- APP_CIPHER being included into .env when doing a fresh install
 2016-07-18 11:13:35 +02:00
Hillel Coren
59969a4677 Fix for API pagination 2016-07-17 13:31:31 +03:00
Hillel Coren
1e568dc408 Fixes for WePay 2016-07-16 23:51:18 +03:00
Hillel Coren
f8672e3feb Fix for buy now buttons 2016-07-16 23:51:05 +03:00
Hillel Coren
36e50e7bcb Fixes for the API 2016-07-15 16:47:18 +03:00
Hillel Coren
86c08f3af5 Working on new pricing 2016-07-15 11:24:08 +03:00
Hillel Coren
6d7b25bcf5 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-07-14 22:59:53 +03:00
Hillel Coren
431f596d1d Working on new pricing 2016-07-14 22:58:48 +03:00
Sebastian Klaus
235acb05a4 Fixed Request being statically called 
Signed-off-by: Sebastian Klaus <sebastian@klaus.com.au>
 2016-07-14 23:22:11 +08:00
Hillel Coren
8590f9ad17 Working on new pricing 2016-07-14 12:46:00 +03:00
Hillel Coren
fa9b0bf78b Working on buy now buttons 2016-07-13 12:03:39 +03:00
Hillel Coren
401851e212 Working on buy now buttons 2016-07-12 23:46:41 +03:00
Hillel Coren
a32e372d40 Bug fix 2016-07-12 08:05:26 +03:00
Hillel Coren
e68e213237 Bug fixes 2016-07-11 23:38:06 +03:00
Hillel Coren
316284b7e2 Bug fixes 2016-07-11 23:36:51 +03:00
Hillel Coren
b233aa0744 Merge branch 'release-2.6' 
Conflicts:
	.travis.yml
	CONTRIBUTING.md
	README.md
	app/Http/Controllers/AccountController.php
	app/Http/Controllers/AppController.php
	app/Http/Controllers/BaseAPIController.php
	app/Http/Controllers/CreditController.php
	app/Http/Controllers/DashboardController.php
	app/Http/Controllers/DocumentController.php
	app/Http/Controllers/PaymentController.php
	app/Http/Controllers/QuoteApiController.php
	app/Http/Requests/EntityRequest.php
	app/Http/routes.php
	app/Listeners/AnalyticsListener.php
	app/Models/Account.php
	app/Models/Credit.php
	app/Models/Document.php
	app/Models/EntityModel.php
	app/Models/Expense.php
	app/Models/Invoice.php
	app/Models/Task.php
	app/Models/VendorContact.php
	app/Ninja/Notifications/PushFactory.php
	app/Ninja/Repositories/DocumentRepository.php
	app/Ninja/Repositories/ExpenseRepository.php
	app/Ninja/Repositories/InvoiceRepository.php
	app/Services/PushService.php
	composer.json
	composer.lock
	database/migrations/2014_05_17_175626_add_quotes.php
	database/seeds/UserTableSeeder.php
	resources/lang/en/texts.php
	resources/views/accounts/customize_design.blade.php
	resources/views/accounts/invoice_design.blade.php
	resources/views/accounts/management.blade.php
	resources/views/expenses/edit.blade.php
	resources/views/header.blade.php
	resources/views/invoices/edit.blade.php
	resources/views/master.blade.php
	resources/views/payments/payment.blade.php
	resources/views/users/edit.blade.php
 2016-07-11 23:33:58 +03:00
Hillel Coren
abe5a8368d Bumped version number to 2.6 2016-07-11 22:59:16 +03:00
Hillel Coren
986487b4c9 Working on new hosted pricing 2016-07-11 20:08:43 +03:00
Hillel Coren
afb34d1de6 Fix saving task without a client 2016-07-10 13:20:22 +03:00
Hillel Coren
6756fde908 Merge pull request #955 from codedge/#583-Add-Task-creating-editing-to-activity-stream 
#583 add task creating editing to activity stream
 2016-07-10 12:42:29 +03:00
Hillel Coren
fd2155d10a Merge pull request #950 from codedge/#868-Configurable-start-of-week 
Adding configuration for first day of the week
 2016-07-10 12:42:12 +03:00
Hillel Coren
386c606558 Added support for taxes to expenses 2016-07-07 19:54:06 +03:00
Hillel Coren
3498d28d3f Check expense category name is unique 2016-07-07 15:32:31 +03:00
Hillel Coren
5f8ae65310 Working on expense category permissions 2016-07-07 11:44:15 +03:00
Hillel Coren
e6b60c6f1a Working on expense categories 2016-07-07 11:03:43 +03:00
Hillel Coren
cd9aae1e22 Working on expense categories 2016-07-06 21:35:16 +03:00
Hillel Coren
21a91ff0e1 Added expense category 2016-07-05 21:49:47 +03:00
Holger Lösken
d1dc1a7e5b Added tasks to activity on dashboard 
- Fixes #583 and resolves #583
- Creating and updating tasks creates an activity now
- Each has its own event
- The activity is shown on the dashboard
 2016-07-05 16:31:57 +00:00
Hillel Coren
979690d116 Improved options when exporting data 2016-07-05 16:09:52 +03:00
Hillel Coren
3c66c0166b Fixed bug preventing switching back to subdomain from website 2016-07-05 12:49:09 +03:00
Hillel Coren
0dc9b3fceb Made 'viewable' scope default behavior 2016-07-04 19:49:01 +03:00
Holger Lösken
fcc8cac7b5 Adding configuration for first day of the week 
- Fix #868 and resolves #868
- The first day of the week can be configured in localization settings,
which affects the Bootstrap date picker
 2016-07-04 16:20:22 +02:00
Hillel Coren
6217419a2f Fix for upgrading directly after signing up 2016-07-04 13:03:09 +03:00
Hillel Coren
463f1dd444 Fixes for refactor 2016-07-04 10:00:00 +03:00
Hillel Coren
6f1776004a Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-07-04 09:40:06 +03:00
Hillel Coren
5d7f7ec02c Merge pull request #946 from codedge/#942-Refactoring-dead-code-unused-uses 
#942 refactoring dead code unused uses
 2016-07-04 09:38:50 +03:00
Holger Lösken
a114f60127 Adding translation support for languages 
- Languages can now be translated via texts.php
 2016-07-04 01:02:38 +02:00
Holger Lösken
0fbda85a59 Code Refactoring 
- Removed unused uses
- Type hinting for method parameters
- Removed commented code
- Introduced comments for classes and methods
- Short array syntax
 2016-07-03 16:19:22 +00:00
Hillel Coren
710200ef3f Fix for client portal when payments are disabled 2016-07-03 17:09:39 +03:00
Holger Lösken
337ed1c719 - Fix #426, closes #426 
- Moved translations for industries, countries into texts.php
- Removed nested arrays in texts.php
 2016-07-03 09:26:08 +00:00
Holger Lösken
b13b9a2d7d Fix hardcoded translations for industry, country and payment types 
- Fixes #426, resolves #426
 2016-07-03 09:24:55 +00:00
Hillel Coren
f9aee23de8 Merge pull request #923 from vincentdh/develop 
Add Mailgun API in mail drivers
 2016-07-03 11:58:24 +03:00
Hillel Coren
6dfd50bddd Fix for enabling autobilling 2016-06-30 20:53:06 +03:00
Hillel Coren
2438fa4fda Merge pull request #931 from codedge/#203-Use-database-prefix-dashboard 
Fix #203
 2016-06-30 17:44:40 +03:00
Holger Lösken
1717028d36 Fixed wrong translation name, need to include the file "texts." 2016-06-30 15:21:03 +02:00
Holger Lösken
8b486ddfcc Fix #203 2016-06-30 15:14:54 +02:00
Holger Lösken
ae78a177b0 Fix #562 
Make „Manual entry“ translatable
 2016-06-30 14:38:55 +02:00
Hillel Coren
c1713c190c Fix for go pro process 2016-06-28 21:21:54 +03:00
Hillel Coren
af4cb1dac8 Fix for client portal header navigation 2016-06-26 19:48:15 +03:00
Hillel Coren
d71cf4dd49 Payment fixes 2016-06-26 19:38:36 +03:00
Hillel Coren
45fce3bfe9 Payment webhook fixes 2016-06-24 18:15:51 +03:00
Hillel Coren
406249ef95 Payment webhook fixes 2016-06-24 15:40:10 +03:00
Hillel Coren
718aa6a966 Web hook bug fixes 2016-06-23 17:05:50 +03:00
Hillel Coren
6ad49cf281 Fixing payment hooks 2016-06-23 16:15:52 +03:00
Hillel Coren
1fc1c11663 API changes for Zapier 2016-06-23 12:58:28 +03:00
Hillel Coren
4281a1c3b0 API changes for Zapier 2016-06-23 12:57:10 +03:00
Hillel Coren
e36d23fcdc API changes for Zapier 2016-06-23 12:39:07 +03:00
Hillel Coren
725522ea21 API changes for Zapier 2016-06-23 12:38:06 +03:00
Hillel Coren
93c3521952 Improve check for duplicate gateways 2016-06-22 21:42:09 +03:00
Hillel Coren
dcdfb4f21c Check to prevent duplicate gateways 2016-06-22 20:13:45 +03:00
Hillel Coren
e2ddabe95d Minor fixes for payments 2016-06-22 12:22:38 +03:00
Hillel Coren
fc0a7cfbf0 Merge fixes from develop 2016-06-21 21:02:01 +03:00
Hillel Coren
8a6227bf89 Fix for tests 2016-06-21 12:40:10 +03:00
Hillel Coren
12b754dc32 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-20 17:14:57 +03:00
Hillel Coren
5ff69c6f29 Payments refactor 2016-06-20 17:14:43 +03:00
vincentdh
5875b70496 Add Mailgun API as mail driver 
Add Mailgun API as a mail driver.  Can be configured from the System
Settings page.
 2016-06-19 13:51:22 -04:00
David Bomba
fedbd74319 Integrating Expense categories into API 2016-06-13 20:18:30 +10:00
Hillel Coren
e2e629141b Refresh contacts after saving in API 2016-06-09 15:22:57 +03:00
Hillel Coren
bcbb68372e Refresh contacts after saving in API 2016-06-09 15:21:33 +03:00
Hillel Coren
5e374b2859 Refresh contacts after saving in API 2016-06-09 15:20:15 +03:00
Hillel Coren
1a9f7bf098 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-09 10:56:31 +03:00
Hillel Coren
ffa67cef3b Refactoring payments code... 2016-06-09 10:56:22 +03:00
Hillel Coren
31fc4ad59c Merge pull request #911 from haleksandre/invoice-subtotals 
Add custom labelling and style to multiple labels and amount in the subtotals table
 2016-06-09 09:05:57 +03:00
Alexandre Villeneuve
eafdc12fa5 Add style to multiple subtotals labels 2016-06-08 14:00:44 -04:00
Hillel Coren
40241cbf38 Restrict client list 2016-06-08 17:56:48 +03:00
Hillel Coren
f67990d636 Restrict client list 2016-06-08 17:56:13 +03:00
Hillel Coren
3c9e2769fb Merge fix for outstanding balance on dashboard 2016-06-08 17:21:02 +03:00
Hillel Coren
de4e79f537 Fix for invoice report totals 2016-06-07 21:50:09 +03:00
Hillel Coren
13fbb880e1 Fix for invoice report totals 2016-06-07 21:49:20 +03:00
Hillel Coren
4976d5b057 Fix for tests 2016-06-07 21:13:29 +03:00
Hillel Coren
2a109cbfbc Removing log messages 2016-06-07 18:00:30 +03:00
Hillel Coren
7e1a0634f5 Working on tests 2016-06-07 17:55:52 +03:00
Hillel Coren
be11054b31 Working on tests 2016-06-07 17:39:18 +03:00
Hillel Coren
cc55cdc1b5 Working on tests 2016-06-07 17:29:26 +03:00
Hillel Coren
7730904bda Added back API route for quotes 2016-06-06 22:19:49 +03:00
Hillel Coren
1eb334f3b4 Added back API route for quotes 2016-06-06 22:18:15 +03:00
Hillel Coren
7facf518cf Added back API route for quotes 2016-06-06 22:17:16 +03:00
Hillel Coren
a27b8173cb Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-06 19:31:56 +03:00
Hillel Coren
80202b6d92 Added support for searching by invoice number in the API 2016-06-06 19:04:57 +03:00
Hillel Coren
d032ae00fc Added support for searching by invoice number in the API 2016-06-06 19:04:24 +03:00
Joshua Dwire
0967ca65e8 Show "Credit Card" instead of "Stripe" as a payment option. 2016-06-05 15:07:02 -04:00
Hillel Coren
d5669fdbf9 Minor fixes 2016-06-05 21:08:41 +03:00
Hillel Coren
706c26b4d5 Minor fixes 2016-06-05 21:05:11 +03:00
Hillel Coren
85d94b5a36 Minor fixes 2016-06-05 19:11:37 +03:00
Hillel Coren
5c7a15ff83 Minor fixes 2016-06-05 19:10:15 +03:00
Hillel Coren
8b2f7eb39f Check for blank api secret 2016-06-05 18:50:41 +03:00
Hillel Coren
d472fcc93d Check for blank api secret 2016-06-05 18:47:51 +03:00
David Bomba
d27219a6a0 refactoring documentAPI 2016-06-05 20:15:49 +10:00
David Bomba
d5c2fc81bd refactoring documentAPI 2016-06-05 20:13:38 +10:00
David Bomba
8ff41dfc7e refactoring documentAPI 2016-06-05 20:12:21 +10:00
David Bomba
1617be2485 refactoring documentAPI 2016-06-05 20:00:21 +10:00
Hillel Coren
4c8414f616 git update 2016-06-05 08:24:16 +03:00
Hillel Coren
02a6213e34 Updated grandfathered user date 2016-06-04 23:22:27 +03:00
Hillel Coren
0c16d89540 Updated grandfathered user date 2016-06-04 23:22:05 +03:00
Hillel Coren
73a1c6a6e3 Fix for error in Authenticate.php 2016-06-04 23:02:18 +03:00
Hillel Coren
e80af4a95d Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-03 11:23:07 +03:00
Hillel Coren
a7f92d0726 Merge pull request #901 from joshuadwire/wepay-integration 
Wepay integration
 2016-06-03 11:20:31 +03:00
Hillel Coren
d3372680cf Include archived records in JSON export 2016-06-03 11:17:55 +03:00
Hillel Coren
619938bc72 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-02 22:04:12 +03:00
Hillel Coren
0acf4ff1fc Support importing JSON file 2016-06-02 22:03:59 +03:00
Joshua Dwire
49d47bb9e3 Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-06-01 16:46:03 -04:00
David Bomba
2a39fee1c6 Merge pull request #900 from turbo124/develop 
Develop
 2016-06-01 21:39:36 +10:00
David Bomba
86a2dec504 Bug Fixes 2016-06-01 21:38:35 +10:00
David Bomba
671b3ba02a test 2016-06-01 20:15:31 +10:00
David Bomba
f239cfdfb4 bug fixes 2016-06-01 20:03:19 +10:00
Hillel Coren
e08e8c1962 Support downloading PDF through the API 2016-06-01 12:56:59 +03:00
Hillel Coren
78bafbbf09 Support downloading PDF through the API 2016-06-01 12:56:15 +03:00
Hillel Coren
17eb2a7a79 Support saving invoice_id and expense_id with the document 2016-06-01 12:39:42 +03:00
Hillel Coren
c122987bc7 Enabled santizing input before validation 2016-05-31 23:15:37 +03:00
David Bomba
fc0d9f13a8 bug fixes 2016-05-31 20:04:30 +10:00
David Bomba
3a98f6ffdc bug fixes on API Dashboard 2016-05-31 20:03:52 +10:00
David Bomba
47d31b24fd testing 2016-05-31 20:02:41 +10:00
David Bomba
5422f182c2 testing 2016-05-31 20:00:23 +10:00
David Bomba
33a3ce2f39 testing 2016-05-31 19:59:04 +10:00
David Bomba
0659ce55ac testing 2016-05-31 19:58:01 +10:00
David Bomba
b7c99335fd testing 2016-05-31 19:54:57 +10:00
David Bomba
30a281110f Logging Document uploads 2016-05-31 15:01:43 +10:00
Hillel Coren
c061808677 Enabled uploading documents through the API 2016-05-30 13:44:49 +03:00
Hillel Coren
e7caa58d75 Changed route to use plurarl 'documents' 2016-05-30 13:43:41 +03:00
Hillel Coren
ced3daf9c6 Added clear commands when updating 2016-05-29 17:49:09 +03:00
Hillel Coren
38cd6de8da Added clear commands when updating 2016-05-29 17:48:55 +03:00
Hillel Coren
2f1d53d9b3 Enable mobile app for non-pro users 2016-05-29 17:32:08 +03:00
Hillel Coren
8d0bed3754 Enable mobile app for non-pro users 2016-05-29 17:31:03 +03:00
Hillel Coren
607fb58c29 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 
Conflicts:
	app/Models/Account.php
 2016-05-29 12:27:14 +03:00
Hillel Coren
0e75ddb5e6 Added setting to hide second tax rate 2016-05-29 12:26:02 +03:00
Hillel Coren
cca6dcfc4a Merge pull request #878 from benb969/invoices_types 
add support to multiple invoice types
 2016-05-29 12:21:57 +03:00
ben
dadac05532 add support to multiple invoice types 2016-05-29 12:02:44 +03:00
Hillel Coren
145c394e6b Ensure all files are deleted with the account 2016-05-26 20:48:45 +03:00
Hillel Coren
f233582ea8 Ensure all files are deleted with the account 2016-05-26 20:48:27 +03:00
Hillel Coren
b32a9110c7 Fix for deleting documents 2016-05-26 19:04:43 +03:00
Hillel Coren
2043621ac9 Fix for deleting documents 2016-05-26 19:02:53 +03:00
Hillel Coren
26b0169ae9 Fix permission issue with quotes 2016-05-26 15:51:13 +03:00
Hillel Coren
29bccd650d Fix permission issue with quotes 2016-05-26 15:50:23 +03:00
Joshua Dwire
acbc0e887f Support adding WePay ACH from payment page 2016-05-25 16:54:49 -04:00
Joshua Dwire
c9f00274b1 Support storing WePay bank tokens 2016-05-25 15:04:58 -04:00
Joshua Dwire
7d55ab033b Merge branch 'wepay-ach' into wepay-integration 2016-05-25 11:11:47 -04:00
Joshua Dwire
d19a3715f9 Warn user when editing an ACH auto bill invoice 2016-05-25 11:07:20 -04:00
Joshua Dwire
c701c5563c Add payment settings block 2016-05-25 10:36:40 -04:00
Joshua Dwire
1f11d88d6b Store ip addresses for payments and payment methods 2016-05-24 18:00:59 -04:00
Joshua Dwire
29c4f16970 Fix contact authentication 2016-05-24 17:45:38 -04:00
Joshua Dwire
724f5738aa Add contact_key 2016-05-24 17:02:28 -04:00
Hillel Coren
ea2f154b1f Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-05-24 10:18:21 +03:00
Hillel Coren
7cc29de881 Bumped version 2016-05-24 10:18:10 +03:00
Hillel Coren
e201651aa6 Bumped version 2016-05-24 10:17:53 +03:00
David Bomba
5f928ecf01 Merge remote-tracking branch 'upstream/develop' into develop 2016-05-24 14:26:19 +10:00
Hillel Coren
541b19cd5f Updated vendor expenses to new datatable class 2016-05-23 21:03:01 +03:00
Hillel Coren
e7bf0599db Separated out entity datatable classes 2016-05-23 19:52:20 +03:00
Hillel Coren
260b9212b9 Renamed PublicClientController to ClientPortalController 2016-05-23 11:31:49 +03:00
Hillel Coren
f19058e35e Improved message after update 2016-05-23 09:18:39 +03:00
Hillel Coren
86240affab Show company name in client portal dashboard activities 2016-05-23 09:02:31 +03:00
Hillel Coren
371f224c24 Minor fixes for invoice export 2016-05-22 20:01:37 +03:00
Hillel Coren
d0232e00f6 Hide outstanding on dashboard from non-admins 2016-05-22 15:31:41 +03:00
David Bomba
1e370d2cce Implement DocumentAPIController 2016-05-21 18:44:53 +10:00
David Bomba
eb1d5be47c bugs in dashboardapicontroller 2016-05-21 09:17:53 +10:00
Hillel Coren
6caf1ff30d Minor fixes 2016-05-19 09:47:57 +03:00
Hillel Coren
ef65bb7d84 Merge pull request #879 from joshuadwire/wepay-integration 
Wepay integration - Part 3
 2016-05-18 19:22:44 +03:00
Joshua Dwire
f0d276be4c Listen for WePay IPNs 2016-05-18 09:51:20 -04:00
Hillel Coren
17ea888e90 Bumped version number 2016-05-18 10:12:58 +03:00
Hillel Coren
8be1771f47 Bumped version number 2016-05-18 10:12:33 +03:00
Hillel Coren
2e1d340d27 Merge pull request #875 from joshuadwire/wepay-integration 
Wepay integration - Part 2
 2016-05-17 22:25:59 +03:00
Joshua Dwire
4f3bb7eeb4 Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-05-17 15:07:53 -04:00
Joshua Dwire
e905b29510 Partial WePay ACH support 2016-05-17 14:09:39 -04:00
Joshua Dwire
43fade2339 Support app fees and Canadian users 2016-05-17 11:32:17 -04:00
Hillel Coren
861672e9e9 Fix for deleting account 2016-05-17 15:05:07 +03:00
Hillel Coren
faec0a2f04 Fix for deleting account 2016-05-17 15:03:17 +03:00
Hillel Coren
3ed5fdf09f Disabled iOS push notifications by default 2016-05-17 14:36:12 +03:00
Hillel Coren
38866ff6f0 Disabled iOS push notifications by default 2016-05-17 14:35:16 +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
Hillel Coren
5e7cdddc3e Merge pull request #863 from joshuadwire/wepay-integration 
Wepay integration - Part 1
 2016-05-16 11:29:37 +03:00
David Bomba
1d05525ee3 typo 2016-05-16 12:30:24 +10:00
Joshua Dwire
f6942a199f Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-05-15 21:21:59 -04:00
Joshua Dwire
a482c63ee3 Payments bug fixes 2016-05-15 16:27:56 -04:00
Hillel Coren
3df6ad2529 Changes to support transifex.com 2016-05-15 23:16:08 +03:00
Hillel Coren
b067697b1c Support manually importing OFX files 2016-05-15 13:58:11 +03:00
Joshua Dwire
d99d81d655 Make autobill setting numbers match token settings 2016-05-14 23:15:22 -04:00
Joshua Dwire
9afd0741f7 Better WePay setup UI 2016-05-14 22:32:27 -04:00
Joshua Dwire
1524447cd4 WePay fixes; support account updater 2016-05-14 22:22:06 -04:00
Joshua Dwire
947cb4a6f7 Better WePay configuration support 2016-05-14 17:23:20 -04:00
Joshua Dwire
ce04c994dd Support payments and storing cards via WePay. 2016-05-13 09:30:22 -04:00
Hillel Coren
b111adaf17 Added and removed extra lables from activity messages 2016-05-13 15:35:59 +03:00