Commit Graph
29591 Commits
Author SHA1 Message Date
王怡栋 aff63f4ff7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-08 10:54:08 +08:00
王怡栋 b960a07ecf * code for task #49352. 2022-03-08 10:52:48 +08:00
王怡栋 ed5aa3d335 Merge branch 'sprint/master_tanghucheng_bug' into 'master'
* Fix bug #50369.

See merge request easycorp/zentaopms!2133
2022-03-08 02:26:35 +00:00
tanghucheng b279fbbc3e * Fix bug #50369. 2022-03-08 10:19:07 +08:00
孙广明 f898e8c305 Merge branch 'sprint/187_liumengyi_moveCustomFiles' into 'master'
* Fix bug #50341.

See merge request easycorp/zentaopms!2131
2022-03-08 02:09:20 +00:00
朱金勇 8206e65301 Merge branch 'sgm_upgrade' into 'master'
* Fix upgrade error.

See merge request easycorp/zentaopms!2130
2022-03-08 02:09:00 +00:00
liumengyi 084d882f9b * Fix bug #50341. 2022-03-08 10:07:42 +08:00
孙广明 6155c3ed21 Merge branch 'sprint/187_tianshujie_fixbug' into 'master'
Sprint/187 tianshujie fixbug

See merge request easycorp/zentaopms!2127
2022-03-08 01:58:50 +00:00
tianshujie f42695af2c * Modify the default width of the project name. 2022-03-08 09:57:14 +08:00
liumengyi a386589929 * Remove custom modules. 2022-03-08 09:54:44 +08:00
孙广明 f5f1679073 * Fix upgrade error. 2022-03-08 09:46:29 +08:00
tianshujie 19017161b6 * Delete useless variables. 2022-03-08 09:45:21 +08:00
tianshujie 23f8d33293 * Add variable judgment. 2022-03-08 08:59:15 +08:00
zhujinyong 01c96e266c * Format. 2022-03-08 08:58:27 +08:00
tianshujie c2f14bb9c2 * Finish task #50318. 2022-03-08 08:53:55 +08:00
孙广明 f76d93b889 Merge branch 'sprint/187_hufangzhou_20439' into 'master'
* Fix bug #20439.

See merge request easycorp/zentaopms!2125
2022-03-08 00:53:24 +00:00
zhujinyong 4451a14e00 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-07 23:04:17 +08:00
zhujinyong 43ef4bc43c * Fix upgrade. 2022-03-07 23:00:30 +08:00
hufangzhou 9482bb429a * Fix bug #20439. 2022-03-07 17:53:29 +08:00
hufangzhou 24305ecd66 * Fix bug #20439. 2022-03-07 17:49:16 +08:00
王怡栋 4778730e92 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-07 17:27:25 +08:00
王怡栋 b936dae827 * code for task #50359. 2022-03-07 17:26:33 +08:00
王怡栋 10f0c44cd4 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug undefine lane

See merge request easycorp/zentaopms!2124
2022-03-07 09:20:17 +00:00
Zongjun Lan 3f9ca9c4fe * fix bug undefine lane 2022-03-07 17:18:31 +08:00
王怡栋 eaba6dcc3c Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #20329,20350,20366.

See merge request easycorp/zentaopms!2123
2022-03-07 09:09:58 +00:00
唐胡成 4c7b17eed2 Update create.html.php 2022-03-07 08:47:46 +00:00
tanghucheng 15e6262065 * Fix bug #20329,20350,20366. 2022-03-07 16:42:58 +08:00
王怡栋 b2aa0be020 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 19010,19464,19496

See merge request easycorp/zentaopms!2112
2022-03-07 07:41:30 +00:00
王怡栋 759464a51d Merge branch 'sgm_fixbug' into 'master'
* Fix story bug.

See merge request easycorp/zentaopms!2114
2022-03-07 07:40:56 +00:00
孙广明 5175dc617f * Code for story review btn. 2022-03-07 15:37:57 +08:00
Zongjun Lan 7add528024 * fix bug 19496 2022-03-07 15:37:27 +08:00
tianshujie 38d53186ba * Modify the code. 2022-03-07 15:34:10 +08:00
孙广明 62f755c3b2 * Finish task #50341. 2022-03-07 15:28:52 +08:00
朱金勇 76d45ded6d Merge branch 'sprint/187_hufangzhou_50326' into 'master'
* Fix bug #50326.

See merge request easycorp/zentaopms!2115
2022-03-07 07:20:45 +00:00
王怡栋 a412128236 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-07 15:01:43 +08:00
孙广明 2c5d4be0a1 Merge branch 'sprint/187_tianshujie_fixbug' into 'master'
Sprint/187 tianshujie fixbug

See merge request easycorp/zentaopms!2116
2022-03-07 07:01:32 +00:00
王怡栋 aa08dd8b07 * fix bug for batch create todo. 2022-03-07 15:01:11 +08:00
孙广明 9389955a28 Merge branch 'sprint/187_liumengyi_50324' into 'master'
* Finish task #50324.

See merge request easycorp/zentaopms!2117
2022-03-07 06:53:16 +00:00
liumengyi 33403652d0 * Finish task #50363. 2022-03-07 14:48:38 +08:00
tianshujie a1bd5d6d48 * Finish task #50329. 2022-03-07 14:29:01 +08:00
liumengyi 92c6de35f0 * Finish task #50324. 2022-03-07 14:27:50 +08:00
tianshujie 789817259e * Finish task #50304. 2022-03-07 14:25:24 +08:00
孙广明 748626a42e Merge branch 'sprint/187_liumengyi_50321' into 'master'
* Finish task #50321,50341.

See merge request easycorp/zentaopms!2111
2022-03-07 06:20:18 +00:00
tianshujie 1e11c1b4e1 * Fix bug #20287. 2022-03-07 14:15:15 +08:00
李玉春 7c4785dd42 Merge branch 'sprint/185_zhouxudong_49881' into 'master'
Sprint/185 zhouxudong 49881

See merge request easycorp/zentaopms!2113
2022-03-07 06:09:31 +00:00
hufangzhou d077423919 * Fix bug #50326. 2022-03-07 14:06:23 +08:00
liumengyi 119fde1713 * Finish task #50341. 2022-03-07 13:56:51 +08:00
tianshujie d616ef30c0 * Fix bug #20284. 2022-03-07 13:54:53 +08:00
周旭东 4666f2f5f6 Update browse.css 2022-03-07 05:52:11 +00:00
周旭东 2686139e04 Update browsebylist.html.php 2022-03-07 05:51:47 +00:00