Commit Graph
20212 Commits
Author SHA1 Message Date
tianshujie98 161c9d4b9a * Adjust code style. 2020-11-25 17:27:18 +08:00
tianshujie98 6996273412 Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-25 17:17:12 +08:00
tianshujie98 5a8d12aa74 * Adjust code style. 2020-11-25 17:16:40 +08:00
qiyu-xie 010532a543 * Finish task#8500. 2020-11-25 17:08:13 +08:00
tianshujie98 58d127ba6a Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-25 16:41:35 +08:00
tianshujie98 9c0d932ebf * Adjust code style. 2020-11-25 16:41:18 +08:00
qiyu-xie eee806c5f9 * Restore changes. 2020-11-25 16:35:50 +08:00
tianshujie98 2819ed0922 Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-25 16:18:56 +08:00
z f161d4133b * code for task #8496. 2020-11-25 16:15:58 +08:00
z 880e182c06 * code for task #8496. 2020-11-25 16:15:58 +08:00
z 2998a36b17 * finish task #8442. 2020-11-25 16:15:58 +08:00
tianshujie98 fc1583b6b0 Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-25 16:14:31 +08:00
tianshujie98 4049054ce4 * Finsh task #8495. 2020-11-25 16:13:51 +08:00
holan20180123 cd9e3d7f29 * Finish task #8497. 2020-11-25 16:10:21 +08:00
holan20180123 1b4e82aa07 * Finish task #8459. 2020-11-25 16:06:05 +08:00
holan20180123 2036a53730 * Finish task #8459. 2020-11-25 15:54:29 +08:00
Yagami 67db77e249 * Finish task #8523. 2020-11-25 15:47:13 +08:00
Yagami 2b8c9fa95d * Fix detail. 2020-11-25 15:47:13 +08:00
Yagami 85660149ad * Finish task #8521. 2020-11-25 15:47:13 +08:00
leiyong 61971243e9 * Add projectstory module. 2020-11-25 15:39:25 +08:00
qiyu-xie 69d115af92 * Fix task#8457. Modify actions field width. 2020-11-25 15:19:24 +08:00
qiyu-xie d70d73ce34 * Finish task#8457. 2020-11-25 15:19:24 +08:00
holan20180123 9d8fa5318d Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-25 15:08:09 +08:00
holan20180123 01cdb9ca79 * Finish task #8497. 2020-11-25 15:07:12 +08:00
tianshujie98 5a49cd76c7 Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-25 14:46:33 +08:00
tianshujie98 919bb4b484 * Remove the parent stage link. 2020-11-25 14:41:34 +08:00
z 18ee52ff86 * finish task #8442. 2020-11-25 14:39:49 +08:00
holan20180123 15331470ba Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-25 14:33:25 +08:00
holan20180123 31e3787b42 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-25 14:30:47 +08:00
tianshujie98 aa45a82c72 Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-25 14:28:48 +08:00
tianshujie98 2ee93bc06b * Finish task #8481. 2020-11-25 14:25:16 +08:00
holan20180123 0d07b3abae * Finish task #8498. 2020-11-25 14:21:08 +08:00
jajasper 78facc12be * Fix bug of integrated zdoo need set X-Frame to allow-from. 2020-11-25 14:05:50 +08:00
Catouse 3014981b9e * support transfer event for contextDropdown by update zui.js. 2020-11-25 13:57:06 +08:00
hufangzhou 584450ed39 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-25 13:44:53 +08:00
hufangzhou f198b6f0a6 * Finish task#8448. 2020-11-25 13:44:44 +08:00
qiyu-xie fa5bef628a * Finish task#8457. 2020-11-25 13:06:05 +08:00
hufangzhou 6cdd6d850b Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-25 12:31:08 +08:00
hufangzhou bfc2ec33ad * Fix an error. 2020-11-25 12:27:04 +08:00
tianshujie98 669994c706 * Delete workload percentage judgment. 2020-11-25 12:13:04 +08:00
leiyong ab815789d1 * Adjust project module code login. 2020-11-25 11:38:26 +08:00
tianshujie98 e7f95cf57b * Add button disabled attribute. 2020-11-25 11:21:13 +08:00
leiyong 5ef321f149 * Adjust code logic. 2020-11-25 10:59:41 +08:00
Yagami 90446d239a * Merge code and finish task #8475. 2020-11-25 10:36:44 +08:00
hufangzhou 4541dcb42e Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-25 10:32:55 +08:00
hufangzhou 3d636dc83f * Modify the language file. 2020-11-25 10:32:43 +08:00
qiyu-xie 78e3fdcad3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-25 10:24:24 +08:00
Catouse 4f4df64957 * update style of buttons in .c-actions and add .btn-action by update zui css. 2020-11-25 10:09:55 +08:00
z 2a77e1f29d * code for task #8496. 2020-11-25 10:06:09 +08:00
z 55fb0867cb * code for task #8496. 2020-11-25 10:06:09 +08:00