1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-22 17:31:35 +02:00
Commit Graph

419 Commits

Author SHA1 Message Date
Hillel Coren
53c59b79e3 Fix for invoice item model 2016-08-14 09:49:01 +03:00
Hillel Coren
c7c253fbd8 Merge branch 'release-2.6.9'
Conflicts:
	app/Http/routes.php
	app/Ninja/PaymentDrivers/BasePaymentDriver.php
	composer.lock
	resources/lang/en/texts.php
	resources/views/reports/chart_builder.blade.php
2016-08-14 09:07:44 +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
0f391e8c8b Fix for user permissions 2016-08-09 09:49:57 +03:00
Hillel Coren
8256e88286 Fix for user permissions 2016-08-09 09:48:41 +03:00
Hillel Coren
ce899cfe4d Permission fix for saving invoice 2016-08-08 23:47:45 +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
128921e512 Fix refunding payment for archived gateway 2016-08-02 13:06:44 +03:00
Hillel Coren
60ce0716a9 Fix refunding payment for archived gateway 2016-08-02 13:06:04 +03:00
Hillel Coren
babbf8ea71 Fix for grandfathered check 2016-08-01 11:08:14 +03:00
Hillel Coren
cb9a67063d Fix for grandfathered check 2016-08-01 11:07:44 +03:00
Hillel Coren
0f6555fb55 Fix display of expense exchange rates 2016-07-27 13:54:42 +03:00
Hillel Coren
d44213bce9 Fix display of expense exchange rates 2016-07-27 13:54:00 +03:00
Hillel Coren
a758a26caf Fix for asdf 2016-07-24 14:40:17 +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
9d9fa2ff7e Fix for default payment method check 2016-07-20 10:20:13 +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