Commit Graph
1119 Commits
Author SHA1 Message Date
朱金勇 d8852453dc Merge branch 'sprint/xuan_sunhao/adjust_card_style' into 'master'
* Optimize style for cards in client.

See merge request easycorp/zentaopms!985
2021-12-17 07:39:30 +00:00
孙广明 9f7eecf9c6 * Finish task #46164. 2021-12-17 15:25:59 +08:00
Hao Sun fd3a645a30 * Optimize style for cards in client. 2021-12-17 14:11:50 +08:00
朱金勇 3381dd3ab0 Merge branch 'sprint/xuan_sunhao/adjust_card_style' into 'master'
* Adjust url card style in client.

See merge request easycorp/zentaopms!981
2021-12-17 06:10:26 +00:00
songchenxuan 59bbd18c55 *Finish task #46099. 2021-12-17 13:58:31 +08:00
Hao Sun 44921262ff * Adjust url card style in client. 2021-12-17 11:33:13 +08:00
songchenxuan fb8793f1d3 *Finish task #46099. 2021-12-15 17:29:31 +08:00
xieqiyu 6227d52547 * Finish task#46097. 2021-12-15 17:24:46 +08:00
mayue 4adf6e0a52 * Fix bug #17015. 2021-12-15 17:17:57 +08:00
朱金勇 b3b60dd4e4 Merge branch 'sprint/176_songchenxuan_45545' into 'master'
*Fix task #45545 bug.

See merge request easycorp/zentaopms!941
2021-12-15 00:39:56 +00:00
songchenxuan 731c7fb45c *Fix task #45545 bug. 2021-12-14 17:33:01 +08:00
Hao Sun 2f862118d8 * Refactor progress-pie instead of rings to improve perf. 2021-12-14 14:31:41 +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
tanghucheng 781314142c * Fix bug #17316. 2021-12-14 10:20:34 +08:00
mayue 77d36b7467 * Finish a task #45544. 2021-12-14 09:49:46 +08:00
Yurun d7538814a7 Optimize execution module 2021-12-14 09:47:53 +08:00
zhujinyong 45cdfc8f59 Merge branch 'xuan' 2021-12-14 09:08:15 +08:00
李玉春 47c4b4e526 Merge branch 'sprint/devops16_wangyidong_test' into 'master'
* code for bug #17438.

See merge request easycorp/zentaopms!915
2021-12-13 08:10:11 +00:00
王怡栋 eadbb0e1de * adjust code. 2021-12-13 16:09:40 +08:00
王怡栋 69023a52bc * code for bug #17438. 2021-12-13 15:24:04 +08:00
songchenxuan 53e4b2d102 *Finish task #45535. 2021-12-13 13:53:03 +08:00
songchenxuan 8a0881aef4 *Finish task #45543. 2021-12-13 10:14:50 +08:00
朱金勇 161233a64f Merge branch 'sprint/176_xieqiyu_45536' into 'master'
Sprint/176 xieqiyu 45536

See merge request easycorp/zentaopms!884
2021-12-10 06:15:15 +00:00
朱金勇 d148ae7cf4 Merge branch 'sprint/176_songchenxuan_45535' into 'master'
*Finish task #45535.

See merge request easycorp/zentaopms!872
2021-12-10 06:04:55 +00:00
songchenxuan ac9d06cf7c *Finish task #45539. 2021-12-10 11:05:11 +08:00
liumengyi 6ec0f178a4 * Modify judgment method. 2021-12-10 11:04:30 +08:00
xieqiyu ad8ed52f22 * Code for task#45536. 2021-12-10 10:57:56 +08:00
孙广明 12ce541d9e * Code for task #45818. 2021-12-09 10:50:05 +08:00
tianshujie 7c3a8dc753 * Fix bug #17259. 2021-12-09 10:34:47 +08:00
孙广明 44bbe31440 * Fix kanban bug. 2021-12-09 10:34:47 +08:00
tianshujie 8e7432ad08 * Fix bug #17173,17173. 2021-12-09 10:34:47 +08:00
tanghucheng 7458b8ef92 * Fix bug #17225. 2021-12-09 10:34:47 +08:00
hufangzhou 32601cd5ff * Fix bug #17185. 2021-12-09 10:34:47 +08:00
tanghucheng 70e124b9ef * Fix bug #17126. 2021-12-09 10:34:47 +08:00
tianshujie 545652e0e4 * Fix bug #17259. 2021-12-08 16:50:48 +08:00
孙广明 114629ec8d Merge branch 'sprint/master_tanghucheng_project' into 'master'
* Fix bug #17126.

See merge request easycorp/zentaopms!797
2021-12-08 07:08:40 +00:00
李玉春 0c4f0dc504 Merge branch 'sgm_fixbug' into 'master'
* Fix kanban bug.

See merge request easycorp/zentaopms!823
2021-12-08 05:10:01 +00:00
孙广明 74cfe9aa75 * Fix kanban bug. 2021-12-08 11:33:34 +08:00
songchenxuan 66c2768b6a *Finish task #45535. 2021-12-08 11:30:02 +08:00
孙广明 834684ca51 Merge branch 'sprint/174_tianshujie_17173' into 'master'
* Fix bug #17173,17173.

See merge request easycorp/zentaopms!812
2021-12-07 09:24:13 +00:00
tianshujie 4fdb7107dc * Fix bug #17173,17173. 2021-12-07 17:22:14 +08:00
tanghucheng 6f6dc4741a * Fix bug #17225. 2021-12-07 17:13:23 +08:00
chaideqing 06916f0dee * recovery module/execution/css/story.css and refactor #main height 2021-12-07 16:43:21 +08:00
hufangzhou 9359d427f5 * Fix bug #17185. 2021-12-07 15:25:31 +08:00
tanghucheng 8afc0024e0 * Fix bug #17126. 2021-12-07 10:07:02 +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
孙广明 379baac86d Merge branch 'master' into 'sprint/master_tanghucheng_project'
# Conflicts:
#   module/programplan/lang/en.php
2021-12-07 00:38:58 +00:00
tanghucheng ac12590b03 * Fix bug #17130,17129,17128. 2021-12-06 15:28:53 +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