1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 12:12:48 +01:00
Commit Graph

3493 Commits

Author SHA1 Message Date
Hillel Coren
8590f9ad17 Working on new pricing 2016-07-14 12:46:00 +03:00
Hillel Coren
c10fd83c74 Updated change log 2016-07-14 12:10:09 +03:00
Hillel Coren
dce90da0c6 Fix for code refactor 2016-07-14 12:01:05 +03:00
Hillel Coren
2cdba1e4ed Fixes #974 2016-07-14 11:42:10 +03:00
Hillel Coren
bf166a1a6f Fix for [Object] problem with certain designs 2016-07-13 21:10:22 +03:00
Hillel Coren
7c303e514f Temp fix for automated test 2016-07-13 20:16:45 +03:00
Hillel Coren
b9f9c0807d WePay fixes 2016-07-13 16:34:26 +03:00
Hillel Coren
f3a278b9b5 Moved buy now div id 2016-07-13 16:33:49 +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
e68e213237 Bug fixes 2016-07-11 23:38:06 +03:00
Hillel Coren
ad65b61a80 Merge branch 'release-2.6' into develop 2016-07-11 23:34:19 +03:00
Hillel Coren
abe5a8368d Bumped version number to 2.6 2016-07-11 22:59:16 +03:00
Hillel Coren
ca94f5053e Prevent payments for deleted invoices from being included in export 2016-07-11 22:24:49 +03:00
Hillel Coren
6dba7f7153 Minor style change 2016-07-11 22:16:36 +03:00
Hillel Coren
c8573df879 Disabled user test 2016-07-11 22:16:06 +03:00
Hillel Coren
243005b667 Prevent expense or task invoice item from creating a product 2016-07-11 20:17:41 +03:00
Hillel Coren
986487b4c9 Working on new hosted pricing 2016-07-11 20:08:43 +03:00
Hillel Coren
28d8e53764 Updated plan price field name 2016-07-10 16:53:01 +03:00
Hillel Coren
bf8ab297f9 Updated plan price field name 2016-07-10 16:49:48 +03:00
Hillel Coren
5fbae548e2 Updated plan price field name 2016-07-10 16:47:22 +03:00
Hillel Coren
afb34d1de6 Fix saving task without a client 2016-07-10 13:20:22 +03:00
Hillel Coren
3ae8df3fdf Merge migrations 2016-07-10 12:45:42 +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
b128f027c3 Migration for new pricing 2016-07-10 12:39:34 +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
965ff2e252 Working on expense test 2016-07-06 10:44:05 +03:00
Hillel Coren
d83f2dc246 Working on expense test 2016-07-06 10:31:06 +03:00
Hillel Coren
894cac4657 Working on expense test 2016-07-06 10:04:59 +03:00
Hillel Coren
19b8212e32 Working on expense test 2016-07-06 09:56:39 +03:00
Hillel Coren
21a91ff0e1 Added expense category 2016-07-05 21:49:47 +03:00
Holger Lösken
c787c2c150 Merge branch '#583-Add-Task-creating-editing-to-activity-stream' of github.com:codedge/invoiceninja into #583-Add-Task-creating-editing-to-activity-stream 2016-07-05 16:32:56 +00: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
Holger Lösken
9095d90842 Added tasks to activity on dashboard
- Creating and updating tasks creates an activity now
- Each has its own event
- The activity is shown on the dashboard
2016-07-05 18:30:29 +02:00
Hillel Coren
f2cbfec926 Improved options when exporting data 2016-07-05 17:27:30 +03:00
Hillel Coren
979690d116 Improved options when exporting data 2016-07-05 16:09:52 +03:00
Hillel Coren
81898338e0 Added back laravelcollective/bus to support maatwebsite/excel 2016-07-05 16:02:28 +03:00
Hillel Coren
3c66c0166b Fixed bug preventing switching back to subdomain from website 2016-07-05 12:49:09 +03:00
Hillel Coren
1fe671bffb Trim trailing slash from APP_URL 2016-07-05 12:28:28 +03:00
Hillel Coren
e07301291b Merge pull request #953 from codedge/#939-Adding-changelog
Added a CHANGELING.md
2016-07-05 10:48:49 +03:00
Holger Lösken
bc1be59628 Added a CHANGELING.md
- Added CHANGELOG.md
- Updated Contributing guide
2016-07-04 22:05:13 +02:00
Hillel Coren
fdb2aefc66 Improved help for 2checkout.com 2016-07-04 22:26:41 +03:00
Hillel Coren
b5f606df47 Added and as email template variables 2016-07-04 21:47:05 +03:00
Hillel Coren
aba50f66dc Added website field to client CSV import 2016-07-04 21:33:50 +03:00
Hillel Coren
d051ae70ef Make view client dashboard link open in new tab 2016-07-04 21:20:00 +03:00