Commit Graph

273 Commits

Author SHA1 Message Date
王怡栋
96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
dingna
27670f7b3a * Finish task #42851. 2021-09-24 09:31:23 +08:00
tianshujie
441cda176d * Modify the global creation return link. 2021-09-15 15:56:19 +08:00
孙广明
be91f00d15 * Fix release back link. 2021-09-14 10:11:08 +08:00
孙广明
6b53c5380b * Fix productplan back link. 2021-09-14 10:06:11 +08:00
zhujinyong
15c3de1171 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-10 08:35:29 +08:00
zhujinyong
d2b43d2a2f * Fix bugs of product api. 2021-09-10 08:35:03 +08:00
xieqiyu
6aa4a3d163 * Fix bug#14951. 2021-09-09 16:13:05 +08:00
孙广明
ea12eaf5f8 * Finish task #42396. 2021-09-08 13:34:34 +08:00
王怡栋
4eee4d5523 Merge branch '15.4' 2021-09-02 19:21:30 +08:00
王怡栋
189cca6b75 * finish task #40874. 2021-08-31 14:33:25 +08:00
tianshujie
77ef906b39 * Set the session for the page's return link. 2021-08-27 14:36:27 +08:00
孙广明
4b230745c1 * Code for task #41775. 2021-08-26 15:45:59 +08:00
Hao Sun
4779bb64b3 * task #41783, #task 41765, implement tutorial mode and add new tutorial task. 2021-08-26 08:45:07 +08:00
王怡栋
4500687de6 * finish task #41923. 2021-08-25 20:10:03 +08:00
孙广明
cf06d1f24f * Code for task #41775. 2021-08-25 15:54:15 +08:00
王怡栋
4e0cd5a965 * fix bug #14540. 2021-08-23 15:46:34 +08:00
qiyu-xie
8856ad6cc4 * Modify create project and program button style. 2021-08-02 14:31:30 +08:00
Hao Sun
4bfa8f6cad * improve UI. 2021-07-30 14:38:39 +08:00
Hao Sun
8de42e5bca * add space between icon and text. 2021-07-30 14:38:39 +08:00
qiyu-xie
e7c113f935 * Finish task#40513. 2021-07-23 14:11:58 +08:00
qiyu-xie
599e51660b * Finish task#40489. 2021-07-22 13:39:59 +08:00
qiyu-xie
94ba06cf2a * Finish task#40511. 2021-07-22 10:23:28 +08:00
zhujinyong
1677574443 * return before $this->send. 2021-07-16 09:40:41 +08:00
holan20180123
ac6f3f5201 * Return id when create object by API. 2021-05-12 16:33:35 +08:00
qiyu-xie
4c40da1ec7 * Modify the navigation of the edit program. 2021-04-25 08:24:25 +08:00
leiyong
abd8af87a6 * Fix bug. 2021-04-01 09:57:12 +03:00
zhujinyong
ba8ac63702 * Fix menu. 2021-03-29 09:09:40 +08:00
Yagami
9b25cc961e * Fix detail for group. 2021-03-25 14:40:53 +08:00
holan20180123
0eda0edd50 * Adjust session. 2021-03-24 16:12:48 +08:00
zhujinyong
1f780be529 * Fix actions of program module. 2021-03-24 15:26:45 +08:00
zhujinyong
4c237e2601 * Fix dynamic logic. 2021-03-24 14:51:28 +08:00
leiyong
fe7fce9512 * Adjust code. 2021-03-24 10:29:10 +08:00
leiyong
f9ec1f84fb * Fix bug. 2021-03-22 11:42:12 +08:00
zhujinyong
a6eff425ca * Adjust menu logic. 2021-03-21 12:15:55 +08:00
zhujinyong
8749c2983d Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-18 16:19:35 +08:00
zhujinyong
9f512843af + Add setAppObjectID of program. 2021-03-17 11:39:32 +08:00
zhujinyong
409a8384dc - remove viewMenu. 2021-03-17 10:10:33 +08:00
Yagami
86416b127d * Code for task #36769. 2021-03-16 16:35:09 +08:00
holan20180123
aaace4b2de * Modify PRJMine to involved. 2021-03-11 15:32:59 +08:00
zhujinyong
4e1ac813a4 * Adjust project/program module. 2021-03-08 10:10:18 +08:00
zhujinyong
426e118db1 * Ajdust project/program module. 2021-03-05 16:09:31 +08:00
Yagami
1ad514e0b0 * Divide program/project/execution. 2021-03-04 09:59:05 +08:00
Yagami
76cb3cee0b * Divide program/project/execution. 2021-03-03 17:45:28 +08:00
zhujinyong
76baa276fd * Adjust program and project module. 2021-03-03 14:52:12 +08:00
qiyu-xie
6ed1e6c8fd * Finish task#36330. 2021-03-03 10:29:03 +08:00
tianshujie98
8a7d17e851 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-03-03 09:41:59 +08:00
tianshujie98
0d11a4dca3 * Finish task #36375. 2021-03-03 09:41:35 +08:00
qiyu-xie
76a08d3b34 * Finish task#36328. 2021-03-03 08:34:00 +08:00
qiyu-xie
5e9755057b * Restore code. 2021-03-02 13:58:58 +08:00