Commit Graph
33238 Commits
Author SHA1 Message Date
mayue cf8da1955d * Fix bug #18961. 2022-01-26 10:21:28 +08:00
孙广明 5eadae0143 Merge branch 'sprint/183_zhouxin_18950' into 'master'
Fix bug.

See merge request easycorp/zentaopms!1599
2022-01-25 06:09:12 +00:00
孙广明 ad3b7bfdbd Merge branch 'sprint/183_tianshujie_bug' into 'master'
* Fix bug #18944,18947,18946.

See merge request easycorp/zentaopms!1598
2022-01-25 06:08:39 +00:00
zhouxin 2141537a36 Fix bug. 2022-01-25 06:06:41 +00:00
tianshujie f7d58603fa * Fix bug #18944,18947,18946. 2022-01-25 14:05:23 +08:00
孙广明 4b1731dac0 Merge branch 'sprint/183_sunhao/new_icons' into 'master'
* Add new icons: "icon-ver" and "icon-publish".

See merge request easycorp/zentaopms!1582
2022-01-25 05:52:18 +00:00
孙广明 24a4746f8a Merge branch 'sprint/183_xieqiyu_fixbug' into 'master'
* Modify product plan desc.

See merge request easycorp/zentaopms!1597
2022-01-25 05:39:37 +00:00
孙广明 cac8eaa104 Merge branch 'sprint/183_tianshujie_bug' into 'master'
Sprint/183 tianshujie bug

See merge request easycorp/zentaopms!1596
2022-01-25 05:38:26 +00:00
xieqiyu dd15b07346 * Modify product plan desc. 2022-01-25 13:37:44 +08:00
tianshujie 363af0483b * Remove useless code. 2022-01-25 13:37:33 +08:00
tianshujie 428f613968 * Modify icon. 2022-01-25 13:31:55 +08:00
tianshujie 4185f88f29 * Fix bug #18948,18836,18804. 2022-01-25 13:27:38 +08:00
孙广明 5fec7d3964 Merge branch 'sprint/183_mayue_18875' into 'master'
* Fix bug #18875.

See merge request easycorp/zentaopms!1595
2022-01-25 05:20:04 +00:00
孙广明 703b4c713b Merge branch 'Fixbug' into 'master'
*Add finishCard and activateCard's history and dynamic.

See merge request easycorp/zentaopms!1594
2022-01-25 05:19:26 +00:00
mayue 5ee2825c26 * Fix bug #18875. 2022-01-25 13:15:18 +08:00
zhengrunyu bf807ad822 *Add finishCard and activateCard's history and dynamic. 2022-01-25 13:14:25 +08:00
孙广明 d9fade1caa Merge branch 'sprint/183_xieqiyu_fixbug' into 'master'
* Modify the mutual test problem.

See merge request easycorp/zentaopms!1593
2022-01-25 05:12:06 +00:00
孙广明 7d49af3c39 Merge branch 'sprint/183_liumengyi_18945' into 'master'
* Fix bug #18945.

See merge request easycorp/zentaopms!1592
2022-01-25 05:05:43 +00:00
xieqiyu 5d0f26bb46 * Modify the mutual test problem. 2022-01-25 13:04:32 +08:00
liumengyi 9828cad357 * Fix bug #18945. 2022-01-25 11:24:06 +08:00
孙广明 2ec4e43353 Merge branch 'sprint/183_tianshujie_18838' into 'master'
* Fix bug #18838.

See merge request easycorp/zentaopms!1591
2022-01-25 03:20:31 +00:00
孙广明 df75841d5b Merge branch 'sprint/183_xt_card' into 'master'
Sprint/183 xt card

See merge request easycorp/zentaopms!1587
2022-01-25 03:19:35 +00:00
tianshujie 7001f6c2d5 * Fix bug #18838. 2022-01-25 11:16:14 +08:00
孙广明 7a77064493 Merge branch 'sprint/183_zhouxin_fixbugs' into 'master'
Adjust code.

See merge request easycorp/zentaopms!1588
2022-01-25 03:12:57 +00:00
孙广明 5af5b98a3c Merge branch 'Fixbug' into 'master'
*Fix bug18942.

See merge request easycorp/zentaopms!1589
2022-01-25 03:12:35 +00:00
zhengrunyu b3ebd6f98b *Fixbug18942. 2022-01-25 11:11:16 +08:00
孙广明 771f5fb087 Merge branch 'sprint/183_liumengyi_18935' into 'master'
* Fix bug #18936, #18924.

See merge request easycorp/zentaopms!1590
2022-01-25 03:06:41 +00:00
zhengrunyu 8e470d86a4 *Fix bug18942. 2022-01-25 11:03:05 +08:00
liumengyi 571f530460 * Fix bug #18936, #18924. 2022-01-25 11:03:05 +08:00
zhouxin a5343e7d36 Adjust code. 2022-01-25 02:52:07 +00:00
xieqiyu a0306d6c6b * Delete space line. 2022-01-25 10:42:21 +08:00
tianshujie a0f307452a Merge branch 'sprint/183_xt_card' of https://gitlab.zcorp.cc/easycorp/zentaopms into card 2022-01-25 10:39:44 +08:00
tianshujie 8b0bd45bf6 * Build add delete flag. 2022-01-25 10:39:17 +08:00
xieqiyu f010d79708 * Add color. 2022-01-25 10:34:12 +08:00
xieqiyu eae8f49e94 * Modify error. 2022-01-25 10:14:32 +08:00
孙广明 3883262c0e Merge branch 'sprint/scx_international_lang' into 'master'
*International lang.

See merge request easycorp/zentaopms!1584
2022-01-25 02:13:55 +00:00
xieqiyu a182d70628 * Display duplicate imported cards. 2022-01-25 10:11:41 +08:00
tianshujie a8334bed66 * Modify details. 2022-01-25 10:02:59 +08:00
songchenxuan 47b110a388 *International lang. 2022-01-25 09:55:10 +08:00
songchenxuan 73207475ae *International lang. 2022-01-25 09:54:31 +08:00
Hao Sun 929f8ebcc0 * add new icons: "icon-ver" and "icon-publish". 2022-01-25 09:39:22 +08:00
tianshujie 14c68e0cf7 * Modify card style. 2022-01-25 09:29:43 +08:00
tianshujie 62d7380d6e Merge branch 'sprint/183_xt_card' of https://gitlab.zcorp.cc/easycorp/zentaopms into card 2022-01-25 09:26:10 +08:00
tianshujie 590715c6d4 * Query plan and version creator. 2022-01-25 09:25:35 +08:00
李玉春 520e09914f Merge branch 'sgm_fixbug' into 'master'
* Fix delete kanban column bug.

See merge request easycorp/zentaopms!1581
2022-01-25 01:22:30 +00:00
xieqiyu 1801b1e783 * Add pending future to the product plan. 2022-01-25 09:10:26 +08:00
孙广明 b2d1125ff9 * Fix delete kanban column bug. 2022-01-25 08:47:57 +08:00
孙广明 2c350e6ad6 Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug #18907.

See merge request easycorp/zentaopms!1577
2022-01-25 00:20:26 +00:00
孙广明 8730efa7e7 Merge branch 'sprint/183_hufangzhou_48000' into 'master'
* Finish task #48000.

See merge request easycorp/zentaopms!1578
2022-01-25 00:20:10 +00:00
hufangzhou 0105b70258 * Finish task #48000. 2022-01-25 08:19:04 +08:00