Commit Graph
32904 Commits
Author SHA1 Message Date
zhouxudong dd10aa75f0 * Finish task #56366 #56379 #56382 #56380 2022-06-08 01:06:07 +00:00
zhouxudong b4a27adf49 * Finish task #56379 #56382 #56380. 2022-06-07 08:16:04 +00:00
zhouxudong 4ecda5bee6 * Finish task #56380 #56379. 2022-06-07 07:44:21 +00:00
zhouxudong 02e7d183c7 * Finish task #56379. 2022-06-07 07:01:44 +00:00
liumengyi 6e4ac95a48 * Fix bug #23340. 2022-06-07 10:35:13 +08:00
tianshujie 3033d3e567 * Fix bug #23258. 2022-06-07 09:42:05 +08:00
李玉春 21c7ec71b5 Merge branch 'fixbug_sunjun_22885' into 'master'
fixbug_sunjun_22885

See merge request easycorp/zentaopms!3752
2022-06-07 01:13:09 +00:00
李玉春 0da04fca77 Merge branch 'sprint/scx_executionbug' into 'master'
* Fix bug #23291.

See merge request easycorp/zentaopms!3748
2022-06-07 01:12:52 +00:00
李玉春 9d1276c73a Merge branch 'sprint/tianshujie_bug23335' into 'master'
* Fix bug #23335.

See merge request easycorp/zentaopms!3760
2022-06-07 01:02:23 +00:00
李玉春 61142f9f67 Update managemembers.js 2022-06-07 01:01:59 +00:00
tianshujie 020528cdbb * Fix bug #23335. 2022-06-07 08:59:51 +08:00
王怡栋 3206d611d4 Merge branch 'master_xieqiyu_23116' into 'master'
* Fix bug#23116.

See merge request easycorp/zentaopms!3757
2022-06-07 00:57:45 +00:00
tianshujie d2242277e7 * Fix bug #23335. 2022-06-07 08:57:24 +08:00
李玉春 4bb6bf8843 Merge branch 'fixbug_sunjun_23101' into 'master'
fixbug_sunjun_23101

See merge request easycorp/zentaopms!3737
2022-06-07 00:52:50 +00:00
xieqiyu 36e609f808 * Fix bug#23116. 2022-06-06 16:52:30 +08:00
孙广明 6b9c4f9deb Merge branch 'sprint/fixbug_liumengyi_23271' into 'master'
* Fix bug #23271.

See merge request easycorp/zentaopms!3756
2022-06-06 08:50:48 +00:00
孙广明 05fad2dfbb Merge branch 'sprint/fixbug_liumengyi_23290' into 'master'
* Fix bug #23290.

See merge request easycorp/zentaopms!3753
2022-06-06 08:50:26 +00:00
孙广明 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
liumengyi 5c552b5dff * Fix bug #23271. 2022-06-06 16:34:32 +08: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
liumengyi e40d982355 * Fix bug #23290. 2022-06-06 16:15:39 +08:00
sunjun 13f565ed69 fixbug_sunjun_22885 2022-06-06 08:14:04 +00: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
宋辰轩 9ff12274e2 * Fix bug #23291. 2022-06-06 15:00:09 +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
sunjun d77300ebf8 fixbug_sunjun_23101 2022-06-06 03:56:27 +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 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