Commit Graph

32875 Commits

Author SHA1 Message Date
tianshujie
2e9e3ccebd * Fix bug #23113. 2022-06-06 16:31:40 +08: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
tianshujie
246d0f8654 * Fix bug #23259. 2022-06-06 14:15:07 +08:00
tianshujie
6635e019cf * Fix bug #23289. 2022-06-06 14:01:55 +08: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
孙广明
42ed017780 * Fix bug #23252. 2022-06-06 13:13:38 +08:00
zenggang
c69ffb8d7d * Fix bug#23246 2022-06-06 04:30:37 +00: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
宋辰轩
8f4cc42550 * Modify function return. 2022-06-06 10:09:48 +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
宋辰轩
6af617ec3b Merge branch 'master' into sprint/scx_zaction 2022-06-06 08:30:30 +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
xieqiyu
d5f294fd7b * Fix bug#23159. 2022-06-02 04:25:09 +08: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
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
孙广明
6446a75af5 * Change zentao license. 2022-06-02 16:32:59 +08:00
孙广明
1dd0b6c022 Merge branch 'sprint/197_tianshujie_bug23213' into 'master'
* Fix bug #23213.

See merge request easycorp/zentaopms!3725
2022-06-02 08:04:56 +00:00
liumengyi
7a14f8a946 * Fix bug #23213. 2022-06-02 16:03:40 +08:00
tianshujie
653e681ed2 * Fix bug #23213. 2022-06-02 16:02:19 +08:00
liumengyi
4d2c34c122 * Fix bug #23213. 2022-06-02 15:59:57 +08:00
孙广明
61ad544156 Merge branch 'zentaopms_198' 2022-06-02 15:04:56 +08:00
孙广明
cf5dbf0f23 * Remove unused code. 2022-06-02 14:53:51 +08:00
孙广明
23d19bd6b3 * Code for export users. 2022-06-02 14:52:16 +08:00
李玉春
66ca553dad Merge branch 'sprint/master_zhouxudong_23111' into 'master'
Sprint/master zhouxudong 23111 19265

See merge request easycorp/zentaopms!3722
2022-06-02 06:32:26 +00:00
zhouxudong
3e4db334a5 * Fix bug #19265. 2022-06-02 06:24:53 +00:00
孙广明
716c7ca6e6 Merge branch 'fixbug_sunjun_23182' into 'master'
fixbug_sunjun_23182

See merge request easycorp/zentaopms!3703
2022-06-02 06:17:56 +00:00
孙广明
38b9119de9 Merge branch 'fixbug_sunjun_22971' into 'master'
fixbug_sunjun_22971

See merge request easycorp/zentaopms!3721
2022-06-02 06:17:36 +00:00
孙广明
9fe2c296a5 Merge branch 'sprint/198_mayue_task#55852' into 'master'
* Finish task #55852.

See merge request easycorp/zentaopms!3716
2022-06-02 06:16:12 +00:00
孙广明
b99385ee25 Merge branch 'fixbug_sunjun_22959' into 'master'
fixbug_sunjun_22959

See merge request easycorp/zentaopms!3717
2022-06-02 06:15:41 +00:00
孙广明
df1c3d0556 Merge branch 'liyuchun_fixbug' into 'master'
* Finish task #55841.

See merge request easycorp/zentaopms!3718
2022-06-02 06:15:25 +00:00
sunjun
136d48f85e fixbug_sunjun_22971 2022-06-02 06:14:57 +00:00
liumengyi
4e71cb29a8 * Fix bug #23031. 2022-06-02 14:12:00 +08:00
liyuchun
620aa77d04 * Finish task #55841. 2022-06-02 06:02:58 +00:00
孙广明
ea678a3736 Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #23132.

See merge request easycorp/zentaopms!3710
2022-06-02 05:55:29 +00:00
sunjun
d3c0e96b98 fixbug_sunjun_22959 2022-06-02 05:40:49 +00:00
zenggang
c95c50021d * Adjust code 2022-06-02 05:33:38 +00:00
zenggang
982d1c72aa * Adjust code 2022-06-02 05:32:33 +00:00