Commit Graph
13229 Commits
Author SHA1 Message Date
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
liugang 1ea682dd89 * Optimize codes to get options of the subStatus field in search form. 2019-08-01 16:55:47 +08:00
reneeteng 6e75c8d644 * Lang file update. 2019-08-01 16:30:10 +08:00
wangyidong d3a51bf7f4 * remove upper case letters for lang code. 2019-08-01 16:25:30 +08:00
reneeteng 94e363f9d2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-08-01 15:40:54 +08:00
wangyidong 182e0f7158 * adjust for bug confirm style. 2019-08-01 14:09:07 +08:00
wangyidong 55143c8994 Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-01 13:45:54 +08:00
wangyidong 14de95c847 * adjust for build lang file for translate. 2019-08-01 13:42:03 +08:00
jinianlan 1289533006 * fix Bug #2664 2019-08-01 09:07:46 +08:00
reneeteng 917dfe0696 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-31 17:25:52 +08:00
Yagami b3ea0b9834 * Add lang for workflow. 2019-07-31 14:17:54 +08:00
Yagami 3e8ea0bc98 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-31 14:13:50 +08:00
Yagami 693a0dfe3e * Add lang for workflow. 2019-07-31 14:13:32 +08:00
wangyidong 5eb2d402d0 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-31 14:03:24 +08:00
wangyidong de7d719459 * adjust for task #8280. 2019-07-31 14:03:00 +08:00
Yagami 48fb320604 * Add lang for workflow. 2019-07-31 14:02:02 +08:00
wangyidong a1c8888cf4 * code for task #8280. 2019-07-31 13:43:51 +08:00
Yagami b11645ec2c * Add lang for workflow. 2019-07-31 13:33:39 +08:00
Yagami 63f9916a85 * Add lang for workflow. 2019-07-31 13:24:18 +08:00
Yagami 10752dbefb * Add lang for workflow. 2019-07-31 13:17:51 +08:00
Yagami 26b203e20a * Add lang for workflow. 2019-07-31 09:28:00 +08:00
Yagami 17bc28a65a * Add lang for workflow. 2019-07-31 09:11:13 +08:00
Yagami 5165052731 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-31 08:58:03 +08:00
Yagami 6b10f0ca15 * Add lang for workflow. 2019-07-31 08:57:33 +08:00
jinianlan 15c6c30ee4 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-31 08:55:54 +08:00
jinianlan 7e26346313 * finish task #6155,#6151,#6147,#6144 2019-07-31 08:54:16 +08:00
Yagami 59251affd2 * Finish task #6152. 2019-07-31 08:23:13 +08:00