Commit Graph
40298 Commits
Author SHA1 Message Date
hufangzhou 9ac5c54bec * Modify the triggering conditions. 2022-06-14 17:36:47 +08:00
hufangzhou 080f54a1b2 * Remove the unused code. 2022-06-14 17:32:47 +08:00
hufangzhou a1a2d4f055 * Add trigger condition. 2022-06-14 17:10:02 +08:00
hufangzhou 760cb05fb9 * Format the code. 2022-06-14 16:53:48 +08:00
hufangzhou fa3520017b * Adjust the code. 2022-06-14 16:26:44 +08:00
hufangzhou 17c1200b2c * Finish task #55002. 2022-06-14 16:20:15 +08:00
王怡栋 fa81f27748 Merge branch 'sprint/201_tianshujie_23663' into 'master'
* Fix bug #23663.

See merge request easycorp/zentaopms!3902
2022-06-14 06:25:45 +00:00
王怡栋 bfc378eba2 Merge branch 'master_xieqiyu_56935' into 'master'
* Finish task#56935.

See merge request easycorp/zentaopms!3899
2022-06-14 06:24:47 +00:00
王怡栋 68cf5cf967 Merge branch 'sprint/hufangzhou_ci' into 'master'
* Modify the makefile for gitlab ci.

See merge request easycorp/zentaopms!3895
2022-06-14 06:23:58 +00:00
王怡栋 f70f0c9f97 Merge branch 'sprint/master_zhouxudong_56910' into 'master'
Sprint/master zhouxudong 56910

See merge request easycorp/zentaopms!3898
2022-06-14 06:23:20 +00:00
hufangzhou c5aa828a09 * Add the git pull command. 2022-06-14 14:21:56 +08:00
hufangzhou ad41c62797 * Add the xuanxuan web. 2022-06-14 14:13:37 +08:00
tianshujie 1eda1081d1 * Fix bug #23663. 2022-06-14 13:49:07 +08:00
tianshujie ed2664f731 * Fix bug #23663. 2022-06-14 13:46:38 +08:00
hufangzhou ffffeeb6ec * Temporarily fix environment variables for gitlab ci. 2022-06-14 13:46:05 +08:00
朱金勇 4d960b1ff3 Merge branch 'sprint/sunhao/kanban' into 'master'
* update kanban lib, fix option "sortable" not work sometimes.

See merge request easycorp/zentaopms!3901
2022-06-14 05:45:25 +00:00
hufangzhou 50877d82a9 * Change the xuan repo path to /home/gitlab-runner. 2022-06-14 13:39:29 +08:00
孙广明 0397a7b0b5 Merge branch 'sprint/203_mayue_bug#23410' into 'master'
* Fix bug #23410.

See merge request easycorp/zentaopms!3897
2022-06-14 05:35:39 +00:00
王怡栋 f5788a4535 Merge branch 'sprint/204_tianshujie_57098' into 'master'
Sprint/204 tianshujie 57098

See merge request easycorp/zentaopms!3900
2022-06-14 05:28:03 +00:00
Hao Sun bb0d1e58c2 * update kanban lib, fix option "sortable" not work sometimes. 2022-06-14 05:23:54 +00:00
tianshujie 3d9012cfca * Finish task #57098. 2022-06-14 13:18:52 +08:00
xieqiyu 254dbf58e5 * Finish task#56935. 2022-06-14 13:10:19 +08:00
hufangzhou ca6eb3fcc5 * Simplified code. 2022-06-14 12:33:38 +08:00
mayue a70fd10f87 * Fix bug #23410. 2022-06-14 11:17:25 +08:00
hufangzhou 2ef3df34b4 * Remove the git pull command for gitlab ci. 2022-06-14 10:51:05 +08:00
孙广明 a9a75958c7 Merge branch 'sgm_57157' into 'master'
* Finish task #57157.

See merge request easycorp/zentaopms!3896
2022-06-14 02:49:49 +00:00
孙广明 da2b704d31 * Finish task #57157. 2022-06-14 10:46:29 +08:00
hufangzhou c9f7798ea3 * Modify the makefile for gitlab ci. 2022-06-14 10:44:59 +08:00
zhouxudong c16b1fd1c3 * Finish task #56910. 2022-06-14 02:44:20 +00:00
孙广明 d9e036ba0c Merge branch 'sgm_56629' into 'master'
* Add en lang.

See merge request easycorp/zentaopms!3894
2022-06-14 02:26:04 +00:00
孙广明 e287ded97e * Add en lang. 2022-06-14 10:25:33 +08:00
王怡栋 89506d91c6 Merge branch 'sgm_56629' into 'master'
* Finish task #56629.

See merge request easycorp/zentaopms!3893
2022-06-14 02:24:12 +00:00
孙广明 089662bd5e * Finish task #56629. 2022-06-14 10:20:29 +08:00
王怡栋 ae1bc3cfc1 Merge branch 'sprint/master_zhouxudong_23554' into 'master'
Sprint/master zhouxudong 23554

See merge request easycorp/zentaopms!3886
2022-06-14 02:00:12 +00:00
zhouxudong aedd5764a9 * Finish task #23554. 2022-06-14 01:58:37 +00:00
tianshujie a6b47e84a9 * Finish task #57098. 2022-06-14 09:55:56 +08:00
zhouxudong 3fcccf17f1 * Finish task #56910. 2022-06-14 01:47:39 +00:00
王怡栋 4b8e8cd21e Merge branch 'master_xieqiyu_56936' into 'master'
* Finish task#56936.

See merge request easycorp/zentaopms!3887
2022-06-14 01:26:03 +00:00
王怡栋 a464cf61d2 Merge branch 'sgm_56635' into 'master'
Sgm 56635

See merge request easycorp/zentaopms!3884
2022-06-14 01:25:40 +00:00
王怡栋 24e35041ae Merge branch 'master_xieqiyu_56909' into 'master'
* Finish task#56909.

See merge request easycorp/zentaopms!3885
2022-06-14 01:25:05 +00:00
孙广明 f09c614299 * Add comment. 2022-06-14 09:25:04 +08:00
王怡栋 e6977466e6 Merge branch 'master_xieqiyu_56907' into 'master'
* Finish task#56907.

See merge request easycorp/zentaopms!3883
2022-06-14 01:20:37 +00:00
王怡栋 6a2e3d116f Merge branch 'sprint/master_zhouxudong_56908' into 'master'
Sprint/master zhouxudong 56908

See merge request easycorp/zentaopms!3890
2022-06-14 01:17:18 +00:00
王怡栋 0e042d43ba Merge branch 'sprint/master_zhouxudong_23427' into 'master'
Sprint/master zhouxudong 23427

See merge request easycorp/zentaopms!3881
2022-06-14 01:12:35 +00:00
王怡栋 d4d2088347 Merge branch 'sprint/204_liumengyi_57099' into 'master'
* Finish task #57099.

See merge request easycorp/zentaopms!3891
2022-06-14 00:25:27 +00:00
朱金勇 a3483fc425 Merge branch 'sprint/hufangzhou_ciyml' into 'master'
* Add the make package job.

See merge request easycorp/zentaopms!3889
2022-06-13 09:47:58 +00:00
朱金勇 a6060e91f1 Merge branch 'sprint/hufangzhou_minify' into 'master'
* Change the minify tools.

See merge request easycorp/zentaopms!3888
2022-06-13 09:47:26 +00:00
liumengyi 39dabf6ff3 * Finish task #57099. 2022-06-13 16:02:23 +08:00
zhouxudong 483ecf2847 * Finish task #56908. 2022-06-13 08:01:10 +00:00
hufangzhou f72341c868 * Add the make package job. 2022-06-13 15:59:45 +08:00