wangyidong
|
95fb1256d9
|
* finish task #6228.
|
2019-08-20 17:20:43 +08:00 |
|
wangyidong
|
a098f9c515
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2019-08-20 09:56:14 +08:00 |
|
wangyidong
|
fdec96cfa0
|
* change error word.
|
2019-08-20 09:55:09 +08:00 |
|
jinianlan
|
eab94efa07
|
* code for task #6186.
|
2019-08-19 17:53:33 +08:00 |
|
wangyidong
|
153e8b272d
|
* add new version and upgrade.
|
2019-08-19 11:34:29 +08:00 |
|
wangyidong
|
56dd762c7a
|
* git commit for todo-time label width.
|
2019-08-19 09:20:59 +08:00 |
|
wangyidong
|
a3354f303e
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2019-08-16 16:10:53 +08:00 |
|
wangyidong
|
c0451b593b
|
* code for task #6180.
|
2019-08-16 16:10:03 +08:00 |
|
wangyidong
|
c5ccb20195
|
* code for get bug filed options for auto test.
|
2019-08-16 16:09:01 +08:00 |
|
Catouse
|
74825e33fe
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2019-08-16 14:12:47 +08:00 |
|
Catouse
|
255048e8ff
|
* update kindeditor.
|
2019-08-16 14:12:29 +08:00 |
|
wangyidong
|
d8d54f52ba
|
* code for task #6180.
|
2019-08-16 13:06:26 +08:00 |
|
wangyidong
|
66ce614c59
|
* finish task #6180.
|
2019-08-16 12:26:27 +08:00 |
|
wangyidong
|
f40bd1adb5
|
* fix bug #2688.
|
2019-08-15 15:26:15 +08:00 |
|
wangyidong
|
92d402f86d
|
* code for task #6171.
|
2019-08-15 15:03:31 +08:00 |
|
wangyidong
|
bd0eb7d8db
|
* code for task #6171.
|
2019-08-15 13:51:44 +08:00 |
|
wangyidong
|
68f4606648
|
* adjust for task #6174.
|
2019-08-15 11:14:27 +08:00 |
|
wangyidong
|
f2450252ac
|
* fix bug.
|
2019-08-14 15:58:09 +08:00 |
|
wangyidong
|
97fc947913
|
* computeWorkingHours has in updateParentStatus method.
|
2019-08-14 15:34:43 +08:00 |
|
wangyidong
|
e0e6d677b2
|
* adjust for update task status when undelete child task.
|
2019-08-14 15:27:40 +08:00 |
|
wangyidong
|
1ee6b158a1
|
+ add other logo.
|
2019-08-14 10:01:48 +08:00 |
|
wangyidong
|
fa600971b5
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2019-08-14 09:00:49 +08:00 |
|
wangyidong
|
010e585550
|
* finish task #6176.
|
2019-08-14 08:59:39 +08:00 |
|
liugang
|
fd0272d7da
|
* Display labels of user defined flows.
|
2019-08-13 16:32:53 +08:00 |
|
liugang
|
dc022ad849
|
* Optimize function to printExtendFields.
|
2019-08-13 14:58:15 +08:00 |
|
wangyidong
|
901a247203
|
* code for task #6200,6189.
|
2019-08-13 10:57:58 +08:00 |
|
jinianlan
|
72504872ac
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2019-08-12 16:13:39 +08:00 |
|
jinianlan
|
54df20147a
|
* finish task 6191
|
2019-08-12 16:11:48 +08:00 |
|
Catouse
|
b46091a3d1
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2019-08-12 16:07:53 +08:00 |
|
Catouse
|
2e66d11a67
|
* update zui.js.
|
2019-08-12 16:07:43 +08:00 |
|
wangyidong
|
ec6c3d78ec
|
* code for task #6200.
|
2019-08-12 11:56:21 +08:00 |
|
wangyidong
|
9b6207141c
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2019-08-12 10:39:24 +08:00 |
|
wangyidong
|
72cd70ad88
|
* finish task #6213.
|
2019-08-12 10:39:00 +08:00 |
|
jinianlan
|
968390978c
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2019-08-12 08:25:42 +08:00 |
|
jinianlan
|
c6cba5483e
|
* finish task #6173,#6174,#6175,#6183,#6186,#6187.
|
2019-08-12 08:23:00 +08:00 |
|
liugang
|
551acd6ddb
|
* Optimize.
|
2019-08-09 17:35:34 +08:00 |
|
liugang
|
9cf4d28a79
|
* Add comment.
|
2019-08-09 16:15:34 +08:00 |
|
liugang
|
90422eb0e8
|
* Remove useless codes.
|
2019-08-09 16:15:20 +08:00 |
|
wangyidong
|
f5d7bd7697
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2019-08-09 15:53:12 +08:00 |
|
reneeteng
|
6c65cb0b48
|
* Y disk and MeshIoT content edited.
|
2019-08-09 15:43:43 +08:00 |
|
wangyidong
|
03c8fc5ba4
|
* code for task #6194.
|
2019-08-09 15:42:45 +08:00 |
|
wangyidong
|
9d4b78a8f2
|
* finish task #6171.
|
2019-08-09 10:29:57 +08:00 |
|
wangyidong
|
083df68ae9
|
* code task #6180.
|
2019-08-09 10:28:48 +08:00 |
|
wangyidong
|
20ffb9bbbf
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2019-08-08 18:48:56 +08:00 |
|
wangyidong
|
ad844896d3
|
* code for task #6178.
|
2019-08-08 18:48:09 +08:00 |
|
liugang
|
c6fbb324bc
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2019-08-08 18:37:50 +08:00 |
|
liugang
|
5e68baf8c5
|
* Add function to get columns, statusMap, statusList, colorList of kanban.
|
2019-08-08 18:37:25 +08:00 |
|
wangyidong
|
bd9e0ce1f6
|
* finish task #6188.
|
2019-08-08 16:42:05 +08:00 |
|
wangyidong
|
dec97060a6
|
* finish task #6205.
|
2019-08-08 16:29:51 +08:00 |
|
wangyidong
|
ccb5ddd474
|
* finish task #6209.
|
2019-08-08 13:21:56 +08:00 |
|