Commit Graph
39871 Commits
Author SHA1 Message Date
孙广明 284a43c780 Merge branch 'fix_bug#23320' into 'master'
* Fix bug #23320.

See merge request easycorp/zentaopms!3755
2022-06-06 08:35:03 +00:00
孙广明 4faa6d598d Merge branch 'sprint/tianshujie_bug23113' into 'master'
* Fix bug #23113.

See merge request easycorp/zentaopms!3754
2022-06-06 08:34:27 +00:00
mayue d5bc70122f * Fix bug #23320. 2022-06-06 16:33:00 +08:00
tianshujie 2e9e3ccebd * Fix bug #23113. 2022-06-06 16:31:40 +08:00
王怡栋 415c8be249 Merge branch 'master_xieqiyu_23156' into 'master'
* Fix bug#23156.

See merge request easycorp/zentaopms!3746
2022-06-06 07:56:56 +00:00
王怡栋 5ec3176d45 Merge branch 'master_xieqiyu_23083' into 'master'
* Fix bug#23083.

See merge request easycorp/zentaopms!3750
2022-06-06 07:49:26 +00:00
李玉春 fd356fbb99 Merge branch 'sprint/sunhao/fix_kanban_col_height' into 'master'
* fix kanban lane height with auto height option.

See merge request easycorp/zentaopms!3747
2022-06-06 07:11:13 +00:00
李玉春 35f14676f9 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!3749
2022-06-06 07:10:50 +00:00
tianshujie 814f1a597f * Fix bug #23255. 2022-06-06 15:07:57 +08:00
Hao Sun 29ae8cb398 * fix kanban lane height with auto height option. 2022-06-06 06:58:38 +00:00
孙广明 a5ebd1f530 Merge branch 'sprint/197_liumengyi_upgrade' into 'master'
* Optimize code of task #55677.

See merge request easycorp/zentaopms!3745
2022-06-06 06:24:27 +00:00
liumengyi d37b120fca * Optimize code of task #55677. 2022-06-06 14:22:51 +08:00
王怡栋 d55d51c5f2 Merge branch 'master_xieqiyu_23159' into 'master'
* Fix bug#23159.

See merge request easycorp/zentaopms!3743
2022-06-06 06:22:11 +00:00
王怡栋 377ed72c92 Merge branch 'sprint/master_lanzongjun_fixbug_new' into 'master'
* finish bug #23282

See merge request easycorp/zentaopms!3744
2022-06-06 06:21:25 +00:00
lanzongjun c25d199878 * finish bug #23282 2022-06-06 14:20:34 +08:00
lanzongjun 89bf907dff * finish bug #23282 2022-06-06 14:16:38 +08:00
tianshujie 246d0f8654 * Fix bug #23259. 2022-06-06 14:15:07 +08:00
孙广明 7a9d13b62c Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #23289.

See merge request easycorp/zentaopms!3742
2022-06-06 06:07:50 +00:00
tianshujie 6635e019cf * Fix bug #23289. 2022-06-06 14:01:55 +08:00
王怡栋 f147c6dcc4 Merge branch 'sgm_fixbug' into 'master'
* Fix bugs.

See merge request easycorp/zentaopms!3741
2022-06-06 05:55:50 +00:00
孙广明 f8d681efac * Fix bugs. 2022-06-06 13:54:06 +08:00
孙广明 a05910ea9c Merge branch 'sprint/197_liumengyi_upgrade' into 'master'
* Add upgrade function of task #55677.

See merge request easycorp/zentaopms!3740
2022-06-06 05:43:40 +00:00
liumengyi d1cb067d29 * Add upgrade function of task #55677. 2022-06-06 13:41:23 +08:00
王怡栋 503b57ecb9 Merge branch 'sgm_fixbug' into 'master'
* Fix bug #23252.

See merge request easycorp/zentaopms!3739
2022-06-06 05:16:56 +00:00
孙广明 42ed017780 * Fix bug #23252. 2022-06-06 13:13:38 +08:00
孙广明 352cb8adf2 Merge branch 'zg_23246' into 'master'
* Fix bug#23246

See merge request easycorp/zentaopms!3738
2022-06-06 05:04:26 +00:00
zenggang c69ffb8d7d * Fix bug#23246 2022-06-06 04:30:37 +00:00
王怡栋 913ea1b898 Merge branch 'master_fixbug' into 'master'
* Fix bug #23267.

See merge request easycorp/zentaopms!3736
2022-06-06 03:18:04 +00:00
tanghucheng 2200dadea6 * Fix bug #23267. 2022-06-06 11:16:08 +08:00
李玉春 4709cb6e9f Merge branch 'sprint/scx_zaction' into 'master'
Sprint/scx zaction

See merge request easycorp/zentaopms!3734
2022-06-06 02:14:14 +00:00
李玉春 6fe727b009 Update model.php 2022-06-06 02:13:20 +00:00
宋辰轩 cfb0d45d7a Merge branch 'sprint/scx_zaction' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/scx_zaction 2022-06-06 10:10:00 +08:00
宋辰轩 8f4cc42550 * Modify function return. 2022-06-06 10:09:48 +08:00
李玉春 49c1f2161c Update ztcli 2022-06-06 02:09:19 +00:00
caoyanyi 7dfa16f3b5 * Modify cli params. 2022-06-06 09:57:10 +08:00
孙广明 5468fe8ee5 Merge branch 'master_xieqiyu_23242' into 'master'
* Fix bug#23242.

See merge request easycorp/zentaopms!3733
2022-06-06 01:53:54 +00:00
zhujinyong 7f95ea2c09 * Check unique for api doc. 2022-06-06 09:24:44 +08:00
zhujinyong 9f322ef866 * Renew apis. 2022-06-06 08:53:54 +08:00
宋辰轩 6af617ec3b Merge branch 'master' into sprint/scx_zaction 2022-06-06 08:30:30 +08:00
xieqiyu 4bd7502e34 * Fix bug#23083. 2022-06-06 01:46:45 +08:00
xieqiyu 0bfb4cea16 * Fix bug#23156. 2022-06-06 00:45:22 +08:00
xieqiyu d93f2aca36 * Fix bug#23159. 2022-06-06 00:35:16 +08:00
xieqiyu e69afb987b * Fix bug#23242. 2022-06-05 20:13:05 +08:00
朱金勇 b4936703f1 Merge branch 'master_xieqiyu_23159' into 'master'
* Fix bug#23159.

See merge request easycorp/zentaopms!3732
2022-06-02 10:17:21 +00:00
孙广明 82f09dcb51 Merge branch 'master_xieqiyu_23154' into 'master'
* Fix bug#23154.

See merge request easycorp/zentaopms!3731
2022-06-02 09:43:11 +00:00
孙广明 f14516b7b1 Merge branch 'sprint/liumengyi_fixbug' into 'master'
* Fix bug #23236.

See merge request easycorp/zentaopms!3730
2022-06-02 09:10:49 +00:00
liumengyi 356d69025a * Fix bug #23236. 2022-06-02 17:08:00 +08:00
孙广明 0a68d0b6fb Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #23230.

See merge request easycorp/zentaopms!3728
2022-06-02 08:37:04 +00:00
tianshujie 10b763fdf2 * Fix bug #23230. 2022-06-02 16:35:48 +08:00
王怡栋 a5deb20879 Merge branch 'sgm_license' into 'master'
* Change zentao license.

See merge request easycorp/zentaopms!3727
2022-06-02 08:35:35 +00:00