Commit Graph
13255 Commits
Author SHA1 Message Date
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
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
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 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 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
wangyidong 321b27c81b * finish task #6208. 2019-08-08 13:12:49 +08:00
wangyidong 2fbe7943f3 * finish task #6212. 2019-08-08 10:25:03 +08:00
reneeteng e27d2f4012 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-08-07 16:21:23 +08:00
reneeteng 842667e0a0 * Lang testcase type. 2019-08-07 16:20:43 +08:00
wangyidong 7964ce412f * finish task #6190. 2019-08-07 15:27:39 +08:00
wangyidong 7bdb12995a * finish task #6185. 2019-08-07 14:15:13 +08:00
wangyidong beefd94f9d * fix for compute password strength when login. 2019-08-07 11:30:45 +08:00
wangyidong 9e152a5620 Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-07 09:51:34 +08:00
wangyidong 53c6a6bc5c * finish task #6179. 2019-08-07 09:50:27 +08:00
liugang 506aaa3d74 * Change sub status when status is changed and sub status is not set, and record the changes. 2019-08-06 18:05:31 +08:00
jinianlan 6cbd736ddc * finish task #6204. 2019-08-06 17:33:46 +08:00
jinianlan fc3dbd87ff Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-06 17:04:52 +08:00
jinianlan 4deb236c54 * finish task #6193. 2019-08-06 17:03:44 +08:00
liugang cd0e4ee3fe * Adjust lang files. 2019-08-06 14:35:43 +08:00
jinianlan 8794e9c8df Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-06 10:46:12 +08:00
jinianlan b03634638a * fix Bug #2679,#2637,#2590,finish task #6172,#6182 2019-08-06 10:40:22 +08:00
liugang d2e807f127 * Set function to get status by ajax. 2019-08-06 09:41:45 +08:00
wangyidong 9a55866871 Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-05 17:28:48 +08:00
wangyidong 2c052fee90 * finish task #6177. 2019-08-05 17:28:29 +08:00
liugang ca3032e325 * Set hidden status in pages. 2019-08-05 17:25:30 +08:00
wangyidong 8943de7c93 * adjust for auto height. 2019-08-05 14:15:31 +08:00
wangyidong 9c758a25eb Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-05 14:05:32 +08:00
wangyidong e78adb5f41 * code for task #8446 2019-08-05 14:04:17 +08:00
jinianlan b69e070b59 * fix Bug 2654 2019-08-02 18:36:43 +08:00
wangyidong b71b877e2b Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-02 13:40:47 +08:00
wangyidong 922800cb81 * change for task #8445. 2019-08-02 13:40:13 +08:00
jinianlan fc2eda8fa6 * fix Bug 2671 2019-08-01 17:38:49 +08:00
reneeteng 7e0d1c74c9 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-08-01 17:23:48 +08:00