Commit Graph

2521 Commits

Author SHA1 Message Date
zhujinyong
ff9ceaccad * Check auth. 2022-01-05 09:05:32 +08:00
liyuchun
c2da5eefe2 Merge branch 'devops18' 2021-12-31 10:38:04 +08:00
孙广明
3d3d4130dd * Code for php8.0. 2021-12-29 16:59:54 +08:00
liyuchun
2b44879ba2 * Adjust code style. 2021-12-29 10:24:39 +08:00
liyuchun
8e98e9831e * Finish task #46551. 2021-12-29 10:02:25 +08:00
liyuchun
9da21e20f0 * Finish task #46550. 2021-12-28 15:45:09 +08:00
hufangzhou
30d2fb6cfa * Fix bug #18014. 2021-12-28 10:19:20 +08:00
mayue
be1671c243 * Modify the code. 2021-12-23 14:34:44 +08:00
mayue
f8f763f9dd * Fix a bug #17638. 2021-12-23 14:15:27 +08:00
songchenxuan
1d7882d51f *Finish task #46100. 2021-12-23 10:06:54 +08:00
songchenxuan
a7258e471b *Finish task #46100. 2021-12-22 14:28:28 +08:00
孙广明
84fae4bc7d Merge branch 'kanban' 2021-12-20 10:59:07 +08:00
朱金勇
8ba0385b58 Merge branch 'sql-optimization-zhangrunyu' into 'master'
SQL optimization

See merge request easycorp/zentaopms!924
2021-12-20 00:47:21 +00:00
Hao Sun
44921262ff * Adjust url card style in client. 2021-12-17 11:33:13 +08:00
zhouxin
0683b91b5c Fixed wrong method used. 2021-12-16 08:30:49 +00:00
朱金勇
d5d4cfe049 Merge branch 'sprint/176_mayue_45544' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!936
2021-12-14 07:43:32 +00:00
mayue
7deea0d588 * Optimize code. 2021-12-14 13:42:54 +08:00
朱金勇
efdadc07a7 Merge branch 'sprint/176_mayue_45544' into 'master'
* Finish a task #45544.

See merge request easycorp/zentaopms!928
2021-12-14 05:34:42 +00:00
Yurun
63bc23d43f Optimize bug module 2021-12-14 10:41:02 +08:00
mayue
77d36b7467 * Finish a task #45544. 2021-12-14 09:49:46 +08:00
zhujinyong
45cdfc8f59 Merge branch 'xuan' 2021-12-14 09:08:15 +08:00
朱金勇
40e1b04661 Merge branch 'sprint/176_songchenxuan_45545' into 'master'
Sprint/176 songchenxuan 45545

See merge request easycorp/zentaopms!880
2021-12-10 07:16:22 +00:00
songchenxuan
a175c752b8 *Finish task #45545. 2021-12-10 14:41:33 +08:00
朱金勇
5ee11088b8 Merge branch 'sprint/176_songchenxuan_45539' into 'master'
Sprint/176 songchenxuan 45539

See merge request easycorp/zentaopms!870
2021-12-10 06:04:23 +00:00
songchenxuan
33efd7faf3 *Finish task #45539. 2021-12-10 11:34:18 +08:00
songchenxuan
30a8d7acb0 *Finish task #45539. 2021-12-10 11:00:04 +08:00
songchenxuan
7d58d95af3 *Finish task #45545. 2021-12-10 09:15:55 +08:00
songchenxuan
2b7e0ed4b3 *Finish task #45545. 2021-12-09 11:16:29 +08:00
孙广明
14b272a1af * Merge 169 untrack file to master. 2021-12-09 10:34:47 +08:00
songchenxuan
8b874bfbbc *Finish task #45545. 2021-12-09 09:20:45 +08:00
mayue
99e725ef37 * Finish task #45544. 2021-12-08 13:25:50 +08:00
孙广明
13f162edd2 * Merge 169 untrack file to master. 2021-12-08 11:07:06 +08:00
chaideqing
06916f0dee * recovery module/execution/css/story.css and refactor #main height 2021-12-07 16:43:21 +08:00
songchenxuan
3f132af95b *Finish task #45539. 2021-12-07 14:51:23 +08:00
songchenxuan
dde57a36cc *Finish task #45539. 2021-12-07 14:03:20 +08:00
songchenxuan
05ea668852 *Finish task #45539. 2021-12-07 10:34:56 +08:00
chaideqing
9a2148a540 * fix xuanxuan 84's bug 2021-12-07 09:27:40 +08:00
hufangzhou
d876550d96 * Add the traditional Chinese language item. 2021-12-07 09:22:58 +08:00
qixinzhi
e4df2494bd * ellipsis long title for zentao card 2021-12-06 17:03:27 +08:00
王怡栋
7091037194 Merge branch 'sprint/175_sgm_upgrade' into 'master'
Sprint/175 sgm upgrade

See merge request easycorp/zentaopms!786
2021-12-06 07:14:51 +00:00
孙广明
69304124b5 * Change for upgrade. 2021-12-06 10:58:52 +08:00
songchenxuan
417c625c84 *Fix bug #17109. 2021-12-06 10:02:17 +08:00
孙广明
5a8e51a9c6 Merge branch 'sprint/master_tanghucheng_project' into 'master'
* Merge programplan into stage.

See merge request easycorp/zentaopms!760
2021-12-06 00:33:10 +00:00
zhujinyong
5f3b5817c9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-05 23:51:59 +08:00
zhujinyong
f6d7234156 * Fix bugs of api. 2021-12-05 23:51:27 +08:00
xieqiyu
a944ec7ccd * Fix bug#17075. 2021-12-03 14:46:12 +08:00
tanghucheng
be4c1f3041 * Merge programplan into stage. 2021-12-03 14:31:47 +08:00
孙广明
669e66e39d Merge branch 'sprint/175_liumengyi_17031' into 'master'
* Fix bug #17031,#17029.

See merge request easycorp/zentaopms!752
2021-12-02 08:44:20 +00:00
liumengyi
cbf1fe21ac * Remove empty lines. 2021-12-02 16:16:03 +08:00
liumengyi
9d7cd3b29e * Fix bug #17031,#17029. 2021-12-02 16:08:17 +08:00