1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 07:02:34 +01:00
Commit Graph

484 Commits

Author SHA1 Message Date
Hillel Coren
5d04bdab21 Add credits to the client portal 2016-09-23 12:02:48 +03:00
Hillel Coren
02cfdf90eb Improve expense display name 2016-09-22 10:24:55 +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
c5b685d390 Enable users with 'View all' to see w/o editing 2016-09-20 17:34:13 +03:00
Hillel Coren
73781e88d5 Fix issue with hipster design with quotes 2016-09-19 14:08:21 +03:00
Hillel Coren
ec963e0823 Added basic task report 2016-09-18 20:45:41 +03:00
Hillel Coren
e743af4d24 Merged #1062 2016-09-15 13:41:09 +03:00
David Sivocha
63ea0a00d4 Adds an Entity Presenter to ExpenseCategory
Without the presentable trait and at the basic level a default
EntityPresenter, adding Expense Categories breaks when trying to view
the edit page for the expense.
2016-09-12 16:01:14 +01:00
Hillel Coren
359271d6c8 Fix undefined on playful quote 2016-09-12 09:38:02 +03:00
Hillel Coren
ce3a510037 Working on the dashboard 2016-09-11 17:30:23 +03:00
Hillel Coren
9543336b31 Show 'Unnamed Client' for clients w/o a name 2016-09-06 14:55:31 +03:00
Hillel Coren
d14cf5f9ed Working on invoice fields 2016-09-05 15:28:59 +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
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
fd5fa8f557 Prevent entering payment for recurring invoice through the API 2016-08-28 20:52:25 +03:00
Hillel Coren
2a195db798 Fix adjustment when deleting failed payment 2016-08-28 14:55:53 +03:00
Hillel Coren
d09bb3b851 Remove failed/refunded payments from reports 2016-08-28 13:20:16 +03:00
Hillel Coren
d55cdd7619 Working on sidebar 2016-08-23 23:20:03 +03:00
Hillel Coren
ad5b185c7c Add key for activities 2016-08-17 10:55:50 +03:00
Hillel Coren
c01e42ac87 Added option to include line item taxes in line total 2016-08-15 18:08:06 +03:00
Hillel Coren
54a00f7bea Fix for invoice item model 2016-08-14 09:50:41 +03:00
Hillel Coren
ce2c71843c Working on the bot 2016-08-13 22:19:37 +03:00
Hillel Coren
0a7381294e Working on the bot 2016-08-10 17:04:17 +03:00
Hillel Coren
8256e88286 Fix for user permissions 2016-08-09 09:48:41 +03:00
Hillel Coren
e85517c4a8 Permission fix for saving invoice 2016-08-08 23:47:09 +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
60ce0716a9 Fix refunding payment for archived gateway 2016-08-02 13:06:04 +03:00
Hillel Coren
cb9a67063d Fix for grandfathered check 2016-08-01 11:07:44 +03:00
Hillel Coren
d44213bce9 Fix display of expense exchange rates 2016-07-27 13:54:00 +03:00
Hillel Coren
d51c437c3c Fix for asdf 2016-07-24 14:40:03 +03:00
Hillel Coren
498578cefc Rollback to 2.6.5 2016-07-21 15:35:23 +03:00
Hillel Coren
61d3adecff Merge pull request #957 from codedge/#949-Improve-activity-stream-invoices
Show client name next to invoice no. on dashboard
2016-07-20 11:54:17 +03:00
Hillel Coren
9bfe233c9f Fix for default payment method check 2016-07-20 10:19:39 +03:00
Hillel Coren
7249b29bf6 Change settings navigation order 2016-07-18 23:28:30 +03:00
Hillel Coren
7cb797fcc2 Fix for cancel account 2016-07-18 22:07:23 +03:00
Hillel Coren
e41d47eb0d Prevent charging downgraded accounts 2016-07-16 23:19:43 +03:00
Hillel Coren
36e50e7bcb Fixes for the API 2016-07-15 16:47:18 +03:00
Hillel Coren
cf3465b5e2 Fix for token billing 2016-07-15 11:23:19 +03: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
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
5f8ae65310 Working on expense category permissions 2016-07-07 11:44:15 +03:00
Hillel Coren
cd9aae1e22 Working on expense categories 2016-07-06 21:35:16 +03:00
Holger Lösken
42c51ea94a Create virtual display_name field on client
- Create virtual display_name field on client
- Create accessor for it
2016-07-06 19:42:36 +02:00
Holger Lösken
f091cbd060 Show client name next to invoice no. on dashboard
- Fix #949 and resolves #949
- Display client name next to invoice number on dashboard
2016-07-06 18:30:23 +02: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
1fe671bffb Trim trailing slash from APP_URL 2016-07-05 12:28:28 +03:00
Hillel Coren
fdb2aefc66 Improved help for 2checkout.com 2016-07-04 22:26:41 +03:00
Hillel Coren
aba50f66dc Added website field to client CSV import 2016-07-04 21:33:50 +03:00
Hillel Coren
251438dc41 Fix for expenseCategories 2016-07-04 20:19:22 +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
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
3f974d0344 Optimized send recurring invoices command 2016-07-01 10:29:24 +03:00
Hillel Coren
9603439a33 Added additional designs 2016-06-29 22:48:56 +03:00
Hillel Coren
7c0875841a Fixed autobill message in emails 2016-06-26 12:59:42 +03:00
Hillel Coren
45fce3bfe9 Payment webhook fixes 2016-06-24 18:15:51 +03:00
Hillel Coren
d71017e203 Payment webhook bug fixes 2016-06-23 20:17:02 +03:00
Hillel Coren
6ad49cf281 Fixing payment hooks 2016-06-23 16:15:52 +03:00
Hillel Coren
93c3521952 Improve check for duplicate gateways 2016-06-22 21:42:09 +03:00
Hillel Coren
c9a19cbd76 Fixes for WePay 2016-06-21 19:10:22 +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
David Bomba
6e57976075 typo 2016-06-13 20:26:47 +10:00
David Bomba
369b696297 typo 2016-06-13 20:23:14 +10:00
David Bomba
fedbd74319 Integrating Expense categories into API 2016-06-13 20:18:30 +10:00
David Bomba
f6aa3340d7 Expense Categories Model 2016-06-11 12:47:26 +10:00
Hillel Coren
ffa67cef3b Refactoring payments code... 2016-06-09 10:56:22 +03:00
Hillel Coren
1039aec1d0 Always load user even if they're deleted 2016-06-08 08:11:05 +03:00
Hillel Coren
4976d5b057 Fix for tests 2016-06-07 21:13:29 +03:00
Hillel Coren
7facf518cf Added back API route for quotes 2016-06-06 22:17:16 +03:00
Hillel Coren
8b2f7eb39f Check for blank api secret 2016-06-05 18:50:41 +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
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
Hillel Coren
17eb2a7a79 Support saving invoice_id and expense_id with the document 2016-06-01 12:39:42 +03:00
Hillel Coren
51d9b2b427 Prevent converting a qoute from incrementing the counter 2016-06-01 10:56:44 +03:00
Hillel Coren
42ac9507e5 Enabled importing products 2016-05-31 23:15:55 +03:00
Hillel Coren
d175fc872a Don't render pdf if not attached and fix typo 2016-05-29 19:32:45 +03:00
Hillel Coren
a9302d4d01 Fixes for is_quote 2016-05-29 15:34:44 +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
ben
dadac05532 add support to multiple invoice types 2016-05-29 12:02:44 +03:00
Joshua Dwire
1c119fe35a ACH autobill bug fixes 2016-05-26 15:22:09 -04:00
Hillel Coren
29bccd650d Fix permission issue with quotes 2016-05-26 15:50:23 +03: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
a5fdb88d79 Add support for auto bill on due date 2016-05-24 22:49:06 -04:00
Joshua Dwire
724f5738aa Add contact_key 2016-05-24 17:02:28 -04:00
Joshua Dwire
f8835268b4 Update DB structure 2016-05-24 14:16:42 -04:00
Hillel Coren
e7bf0599db Separated out entity datatable classes 2016-05-23 19:52:20 +03:00