Commit Graph
33321 Commits
Author SHA1 Message Date
xieqiyu 16f8efac4e * Fix bug#23724. 2022-06-15 18:38:01 +08:00
zhujinyong b2bf48c7d3 Merge branch 'sprint/sunhao/task56942' 2022-06-15 17:58:22 +08:00
朱金勇 1a5b537ec7 Merge branch 'cyy_zcli' into 'master'
* Add api for jobs and repos.

See merge request easycorp/zentaopms!3941
2022-06-15 09:54:22 +00:00
zhujinyong b8189edbf7 Merge branch 'sprint/sunhao/picker' 2022-06-15 17:53:37 +08:00
Hao Sun 60f23970ba * task #56942, optimize UI for task create form. 2022-06-15 09:53:25 +00:00
zhujinyong dfcada81f1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-06-15 17:52:37 +08:00
王怡栋 95df7b5e3c Merge branch 'master_xieqiyu_23662' into 'master'
* Fix bug#23662.

See merge request easycorp/zentaopms!3949
2022-06-15 09:32:05 +00:00
王怡栋 d5c3e6a452 Merge branch 'sprint/master_zhouxudong_23672' into 'master'
* Fix bug #23672.

See merge request easycorp/zentaopms!3947
2022-06-15 09:29:16 +00:00
王怡栋 f064336c1f Merge branch 'sprint/tianshujie_57095' into 'master'
* Finish task #57095.

See merge request easycorp/zentaopms!3951
2022-06-15 09:28:49 +00:00
王怡栋 4985d76009 Merge branch 'sprint/hufangzhou_56361' into 'master'
* Finish task #56361.

See merge request easycorp/zentaopms!3945
2022-06-15 09:28:14 +00:00
tianshujie 4fcf0b7dc3 * Finish task #57095. 2022-06-15 17:26:39 +08:00
王怡栋 62d83018f0 Merge branch 'sprint/master_tanghucheng' into 'master'
* Fix bug #23775.

See merge request easycorp/zentaopms!3944
2022-06-15 09:23:55 +00:00
xieqiyu f460aa58fd * Fix bug#23662. 2022-06-15 17:07:18 +08:00
孙广明 1f13b14799 Merge branch 'master' into 'sprint/204_tianshujie_57095'
# Conflicts:
#   module/execution/css/all.css
2022-06-15 09:03:47 +00:00
zhouxudong 3b01055e5f * Fix bug #23672. 2022-06-15 09:00:16 +00:00
tianshujie b6a1b3eb79 * Finish task #57095. 2022-06-15 16:55:28 +08:00
tianshujie 1f0f1ff36e * Finish task #57095. 2022-06-15 16:52:26 +08:00
tianshujie 7f000fd968 * Finish task #57095. 2022-06-15 16:41:12 +08:00
孙广明 b5d1401b88 Merge branch 'liyuchun_bug' into 'master'
* Fix error.

See merge request easycorp/zentaopms!3943
2022-06-15 08:25:04 +00:00
xieqiyu ac34aaa200 * Finish task#56930,56929,56928. 2022-06-15 16:23:06 +08:00
王怡栋 a6b264d1a7 Merge branch 'sprint202_leiyong_task_56926' into 'master'
Sprint202 leiyong task 56926

See merge request easycorp/zentaopms!3942
2022-06-15 08:20:11 +00:00
tianshujie 520ab92338 * Finish task #57095. 2022-06-15 16:17:16 +08:00
liyuchun 9c675ceb6b * Fix error. 2022-06-15 08:12:42 +00:00
tanghucheng 7d8325f469 * Fix bug #23775. 2022-06-15 16:12:03 +08:00
hufangzhou d83ce3c27c * Can't post the disabled value to rear end. 2022-06-15 16:06:39 +08:00
leiyong 32b846cdf5 * Finish task#56926. 2022-06-15 07:57:50 +00:00
xieqiyu e96fff70a3 * Finish task#56930,56929,56928. 2022-06-15 15:56:34 +08:00
caoyanyi 0486181ed7 * Add api for jobs and repos. 2022-06-15 15:51:37 +08:00
xieqiyu 58e7a4ff19 * Finish task#56930,56929,56928. 2022-06-15 15:32:33 +08:00
孙广明 9500b44b17 Merge branch 'fixbug_23668' into 'master'
* Fix bug #23668.

See merge request easycorp/zentaopms!3938
2022-06-15 07:20:13 +00:00
孙广明 97d6c0bca9 Merge branch 'sprint/204_liumengyi_57089' into 'master'
* Fix bug #23744.

See merge request easycorp/zentaopms!3935
2022-06-15 07:19:56 +00:00
liumengyi 764d54148d * Fix bug 23744. 2022-06-15 15:18:47 +08:00
zhouxin 4fd80b7663 * Fix bug #23668. 2022-06-15 07:17:55 +00:00
hufangzhou 9b32199272 * Finish task #56361. 2022-06-15 15:11:41 +08:00
tianshujie 2c176439d3 * Finish task #57095. 2022-06-15 15:09:34 +08:00
mayue ee058f67f1 * Finish task #57393. 2022-06-15 15:09:05 +08:00
liumengyi 5054fd14b2 * Optimize code. 2022-06-15 15:08:58 +08:00
liumengyi a77547cfa6 * Optimize code. 2022-06-15 15:07:58 +08:00
liumengyi f75c14ea54 * Fix bug #23744. 2022-06-15 15:04:31 +08:00
王怡栋 0a6decf08a Merge branch 'sgm_details' into 'master'
* Code for sprint code width.

See merge request easycorp/zentaopms!3933
2022-06-15 06:27:03 +00:00
zhouxudong 85dac08786 * Fix bug #23693. 2022-06-15 06:22:17 +00:00
zhouxudong 6307cd07e2 * Fix bug #23693.* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.* Fix bug #23693. 2022-06-15 06:20:28 +00:00
Hao Sun c34385954d * support for updating kanban without refresh the whole page. 2022-06-15 06:05:59 +00:00
王怡栋 3318147874 Merge branch 'sprint/204_liumengyi_57089' into 'master'
* Fix bug #23744.

See merge request easycorp/zentaopms!3931
2022-06-15 05:59:21 +00:00
liumengyi 023eaedf83 * Fix bug #23744. 2022-06-15 13:57:12 +08:00
孙广明 d568e34896 * Code for sprint code width. 2022-06-15 13:53:06 +08:00
王怡栋 99f6d0f16f Merge branch 'sprint/master_zhouxudong_56918' into 'master'
* Finish task #56918.

See merge request easycorp/zentaopms!3929
2022-06-15 05:33:58 +00:00
孙广明 80a39e398d Merge branch 'sprint/204_liumengyi_57089' into 'master'
* Fix bug #23738.

See merge request easycorp/zentaopms!3930
2022-06-15 05:27:13 +00:00
liumengyi 23be41cd71 * Fix bug #23738. 2022-06-15 13:25:41 +08:00
孙广明 9df2853a61 Merge branch 'sprint_204_57094' into 'master'
Sprint 204 57094

See merge request easycorp/zentaopms!3928
2022-06-15 03:09:37 +00:00