Commit Graph
217 Commits
Author SHA1 Message Date
王怡栋 5f15025297 Merge branch 'master' into '15.0.beta1'
# Conflicts:
#   module/upgrade/control.php
2021-06-18 02:19:40 +00:00
hufangzhou fcf1d669d7 * Revert the changed code of task #38644. 2021-06-05 18:14:44 +08:00
hufangzhou b0291eeba4 * Fix bug #38644. 2021-06-01 09:29:30 +08:00
hufangzhou 0d0d85c9ff * Finish task #38171. 2021-05-13 16:07:09 +08:00
Yagami 819960316a * Fix error. 2021-04-16 15:12:42 +08:00
Yagami cf7c1dc400 * Fix menu. 2021-04-15 16:43:27 +08:00
Yagami 9ce2232cbf * Add change flow. 2021-04-15 16:09:58 +08:00
holan20180123 d5fcc2fc1a * Finish task #37536. 2021-04-15 09:21:53 +08:00
wangyidong 85bc4283cb * adjust for menu. 2021-04-08 17:12:50 +08:00
Yagami 71de6b2e96 * Fix bug. 2021-03-31 13:34:04 +08:00
Yagami 2034dbd3a3 * Fix bug #6954. 2021-03-31 10:40:50 +08:00
zhujinyong 6582a700bb * Fix story of project. 2021-03-21 16:11:07 +08:00
zhujinyong a6eff425ca * Adjust menu logic. 2021-03-21 12:15:55 +08:00
hufangzhou ff5c09c76f * Adjust the code. 2021-03-12 08:21:40 +08:00
hufangzhou 1e4b9124a9 * Adjust the divider style. 2021-03-11 16:18:03 +08:00
Yagami 60f8cadc08 * Finish task #36435. 2021-03-11 09:31:39 +08:00
Yagami 1082a2425f * Finish task #36436. 2021-03-10 13:43:28 +08:00
holan20180123 33475fb2d2 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-03-09 13:06:56 +08:00
holan20180123 90d0b61380 * Finish task #36431. 2021-03-09 13:05:37 +08:00
hufangzhou 5b6dc5cee4 * Finish task #36434. 2021-03-09 10:30:10 +08:00
holan20180123 4caf65064c * Fix product,project error. 2021-03-08 15:47:09 +08:00
hufangzhou 876a0be2eb * Adjust the custom module. 2021-03-05 13:11:47 +08:00
tianshujie98 117f9b8a7c * Fix bug. 2021-03-04 16:28:08 +08:00
tianshujie98 b0d5278b77 * Modify button language. 2021-03-04 15:11:11 +08:00
Yagami 76cb3cee0b * Divide program/project/execution. 2021-03-03 17:45:28 +08:00
Yagami 53def3b867 * Remove configure scrum method. 2021-03-03 10:37:02 +08:00
tianshujie98 71795a6144 * Finish task #36419. 2021-03-03 10:12:06 +08:00
holan20180123 876d5bf434 * Adjust header of flow., 2021-03-03 09:57:28 +08:00
holan20180123 dbc0a6c9bb * Code for task #36060. 2021-03-03 09:05:46 +08:00
Yagami 294058ddcd * Finish task #36358 and rename mode. 2021-03-02 10:13:51 +08:00
holan20180123 7498a17df7 * Finish task #36082. 2021-02-25 16:54:00 +08:00
Yagami 97ba541261 * Finish task #36042. 2021-02-25 15:02:32 +08:00
Yagami 9a0cc1a747 * Code for task #36042, move subject estimate stage holiday to max. 2021-02-24 16:55:07 +08:00
tianshujie98 3372be4081 * Finish task #36010. 2021-02-24 16:18:34 +08:00
Yagami 5c5bdc213e * Adjust code style. 2021-02-24 15:02:43 +08:00
wangyidong 535fb750b3 * code for change after15mode to mode. 2021-02-23 09:12:48 +08:00
wangyidong 6787d19ac7 * finish task #36010. 2021-02-22 13:04:18 +08:00
Yagami 4027c87f5b * Finish task #36015. 2021-02-20 16:28:45 +08:00
holan20180123 e624596b49 * Finish task #36014. 2021-02-19 10:23:44 +08:00
tianshujie98 ac62e5242e * Adjust code style. 2021-01-29 13:02:17 +08:00
tianshujie98 ea71903442 * Modify vars. 2021-01-28 10:10:47 +08:00
tianshujie98 de8de142e3 * Optimize the prompt interface. 2021-01-27 09:57:52 +08:00
tianshujie98 6d810defb5 * Adjust code style. 2021-01-26 14:18:57 +08:00
tianshujie98 570b32a2d4 * Finish task #9095. 2021-01-26 14:10:23 +08:00
holan20180123 a0ef25a85a * Finish task #9100. 2021-01-25 14:36:10 +08:00
tianshujie98 eb6de62f11 * Finish task #9096. 2021-01-25 13:35:29 +08:00
tianshujie98 8fc2677452 * Finish task #9067. 2021-01-25 08:42:24 +08:00
tianshujie98 9e6ff0a9b2 * Finish task #9021. 2021-01-20 16:44:30 +08:00
tianshujie98 6128f82d16 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-18 15:09:36 +08:00
tianshujie98 9d8ae60c7b * Finish task #9021. 2021-01-18 15:09:15 +08:00