Commit Graph
301 Commits
Author SHA1 Message Date
王怡栋 e093aac4ca Merge branch 'sprint/master_zhouxudong_54477' into 'master'
Sprint/master zhouxudong 54477

See merge request easycorp/zentaopms!3541
2022-05-20 06:07:46 +00:00
leiyong df87ffddd2 * Finish task#54472. 2022-05-20 03:40:45 +00:00
xieqiyu cd1c1e1b63 * Finish task#54477. 2022-05-20 10:52:30 +08:00
zenggang cc7f860ac0 * Fix bug#22451,22473,22475 2022-05-13 04:11:12 +00:00
zenggang 94bf6a70a2 * Adjust code 2022-05-13 00:44:07 +00:00
zenggang e41dc21372 * Fix bugs 2022-05-12 09:06:35 +00:00
zenggang a2b64debb9 * Adjust code 2022-05-11 09:24:30 +00:00
zenggang b5093f3a1b * Code for task#53657 2022-05-11 08:32:50 +00:00
zenggang d8d6ce45f7 * Finish task#53653 2022-05-10 08:58:00 +00:00
李玉春 7dbf565a76 Merge branch 'fixbug_sunjun_19687' into 'master'
Fixbug sunjun 19687

See merge request easycorp/zentaopms!2644
2022-03-31 00:24:37 +00:00
sunjun 83507debe8 *Fixbug #19687 2022-03-30 20:15:16 +08:00
zhouxin 376de6d824 * Fix bug #16707. 2022-03-29 04:28:39 +00:00
zhouxin 603ae3bfdc * Fix bug #16707. 2022-03-29 03:14:50 +00:00
liumengyi 9bd39c1e98 * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:44:11 +08:00
liumengyi e0814cd74b * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:15:08 +08:00
zhujinyong 408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
孙广明 9e171958bf Merge branch 'liyuchun_bug_19323' into 'master'
* Fix bug #19323.

See merge request easycorp/zentaopms!1800
2022-02-15 05:27:00 +00:00
liyuchun 0d16a79b63 * Fix bug #19323. 2022-02-15 08:22:25 +08:00
hufangzhou 82895b18d2 * Fix bug #19471. 2022-02-14 10:50:06 +08:00
mayue f151953a49 * Optimize code. 2022-01-06 15:55:49 +08:00
zhujinyong ff9ceaccad * Check auth. 2022-01-05 09:05:32 +08:00
hufangzhou 1a5adfe15f * Fix bug for compatible php8.0 . 2021-12-28 14:46:10 +08:00
hufangzhou ab5b5bdf87 * Fix bug #17311. 2021-12-09 16:54:30 +08:00
hufangzhou 7f94a46592 * Fix bug #16792. 2021-12-09 09:53:54 +08:00
zhujinyong be26a7c731 * Fix errors of api. 2021-11-29 13:09:05 +08:00
zhujinyong 4b57e8627b * Fix api of program. 2021-11-28 22:17:33 +08:00
zhouxin b7e3fe9003 Finis task #44486,44487,44488. 2021-11-17 15:49:24 +08:00
hufangzhou c576e60197 * Compatible with pro version in mobile. 2021-10-19 17:36:13 +08:00
王怡栋 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