Commit Graph
20177 Commits
Author SHA1 Message Date
tianshujie98 2ee93bc06b * Finish task #8481. 2020-11-25 14:25:16 +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
qiyu-xie 2cbe7b8a79 * Finish task#8464. 2020-11-25 09:42:13 +08:00
tianshujie98 7c4908478c * Adjust the back button link. 2020-11-25 09:34:08 +08:00
hufangzhou 69631e3dc3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-25 09:15:40 +08:00
hufangzhou 37f8d75f1e * Finish task#8455. 2020-11-25 09:15:28 +08:00
tianshujie98 29c953918c Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-25 09:13:32 +08:00
tianshujie98 0c4aee39c9 * Finish task #8479. 2020-11-25 09:13:08 +08:00
leiyong 302a68291c * Adjust getExecutionsByProject method. 2020-11-24 23:23:54 +08:00
leiyong 3eafb1ac5d Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-24 23:22:27 +08:00
hufangzhou 9a20bab153 * Finish task#8494. 2020-11-24 22:46:33 +08:00
qiyu-xie 888bd3721f * Finish task#8457. 2020-11-24 17:33:33 +08:00
Catouse 424193e084 * improve style of contextmenu in recentproject block. 2020-11-24 17:26:13 +08:00
Yagami c1b1db4ae6 * Delete field in program create page. 2020-11-24 17:22:42 +08:00
Catouse 3d14cd6a52 * task #8506, change dropdown to context-dropdown and fix conflict of dropdown-menu with overflow style. 2020-11-24 17:11:06 +08:00
Catouse a5ccc8a6e9 * improve style of recentproject block. 2020-11-24 17:11:06 +08:00
Catouse c3c9994742 * fix drag-and-drop conflict when block content has panel-heading in dashbard page. 2020-11-24 17:11:06 +08:00
leiyong 5a6f487faa Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-24 16:49:32 +08:00
leiyong ac5d658933 * Adjust getExecutionPairsByProduct method. 2020-11-24 15:58:26 +08:00
z bef3194549 * code for task #8496. 2020-11-24 15:38:21 +08:00
z 3c7da6dc60 * code for task #8496. 2020-11-24 15:38:21 +08:00
z 7f0e4e13f8 * adjust for upgrade. 2020-11-24 15:38:21 +08:00
Yagami 97ac6f0b9c * Merge code. 2020-11-24 14:46:19 +08:00
Yagami 9c59c495ee * Finish task #8525. 2020-11-24 14:46:19 +08:00
qiyu-xie e7856c6d32 * Finish task#8493. 2020-11-24 14:33:23 +08:00
holan20180123 e9fcbe9c21 * Finish task #8507. 2020-11-24 14:11:09 +08:00
tianshujie98 760733d902 Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-24 13:56:44 +08:00
tianshujie98 8ad7105f01 * Adjust the order. 2020-11-24 13:51:42 +08:00
holan20180123 2be6076089 * Finish task 8490. 2020-11-24 13:45:40 +08:00
tianshujie98 ad283b76c6 Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-24 13:16:23 +08:00
leiyong 8f11da1edd * Finish task#8461. 2020-11-24 13:15:27 +08:00
tianshujie98 600c28082a Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-24 13:13:09 +08:00
tianshujie98 247c687f49 * Adjust the order. 2020-11-24 13:11:03 +08:00
leiyong 54ffdaea7a * Fix edit stage error. 2020-11-24 13:05:36 +08:00
qiyu-xie 48c8c8b9a8 * Fix task#8483.#8484.#8485.#8486.#8487. 2020-11-24 13:00:36 +08:00
tianshujie98 2160ae0958 * Adjust code style. 2020-11-24 12:29:02 +08:00
tianshujie98 0697a67f16 * Merge. 2020-11-24 12:18:49 +08:00