Commit Graph
16146 Commits
Author SHA1 Message Date
wangyidong f8d8eecd9d Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-21 16:50:27 +08:00
wangyidong 12b217ffcb * finish task #6227. 2019-08-21 16:50:09 +08:00
liugang 190a83bc94 * Adjust codes to display subStatus in kanban. 2019-08-21 16:34:52 +08:00
wangyidong 253e0ab3a8 * finish task #6231. 2019-08-21 15:32:29 +08:00
wangyidong 8c239149e9 * finish task #6234. 2019-08-21 10:32:50 +08:00
wangyidong ab197cee1d * finish task #6235. 2019-08-21 10:30:20 +08:00
wangyidong 9e43c72ab8 Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-21 10:29:11 +08:00
wangyidong afe1340323 * finish task #6259. 2019-08-21 10:28:23 +08:00
jinianlan aa1609117e Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-21 10:27:32 +08:00
jinianlan f1ef72dfbb * code for task 6244,6242. 2019-08-21 10:25:32 +08:00
wangyidong c35167f38a * finish task #6238. 2019-08-21 10:18:32 +08:00
wangyidong f1684ad8e9 * finish task #6241. 2019-08-21 10:15:58 +08:00
wangyidong f71f9c35c6 * adjust for english notes. 2019-08-21 10:12:08 +08:00
wangyidong 8bdcfef980 * finish task #6243. 2019-08-21 10:11:44 +08:00
wangyidong 336e6e2e30 * finish task #6246. 2019-08-21 10:09:14 +08:00
wangyidong 61a03933c3 * finish task #6247. 2019-08-21 10:06:25 +08:00
wangyidong 923a18f5d6 * finish task #6248. 2019-08-21 09:53:35 +08:00
wangyidong 83525e6152 * finish task #6249. 2019-08-21 09:40:35 +08:00
wangyidong fb57ecdfd0 * finish task #6250. 2019-08-21 09:31:29 +08:00
wangyidong 5182a0d984 * finish task #6252. 2019-08-21 09:30:01 +08:00
wangyidong 6960c43352 * finish task #6256. 2019-08-21 09:23:01 +08:00
wangyidong 5f3ec326bf * finish task #6257. 2019-08-21 09:21:21 +08:00
wangyidong e9a8c643b3 * finish task #6258. 2019-08-21 08:59:50 +08:00
wangyidong f24b888446 * finish task #6259. 2019-08-21 08:55:13 +08:00
wangyidong 475fb0732a * finish task #6260. 2019-08-21 08:47:53 +08:00
wangyidong cd52f39438 * finish task #6261. 2019-08-21 08:43:55 +08:00
wangyidong 5afc39c8e7 * finish task #6229. 2019-08-20 17:24:40 +08:00
wangyidong f601e76a6a Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-20 17:21:25 +08:00
wangyidong 95fb1256d9 * finish task #6228. 2019-08-20 17:20:43 +08:00
reneeteng 2ecbf865eb * Lang file update. 2019-08-20 16:29:42 +08:00
reneeteng 19d6e2407f * Lang file update. 2019-08-20 15:03:26 +08:00
liugang 5cde119e9d * Fix bug of status. 2019-08-20 14:47:23 +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