Commit Graph
32031 Commits
Author SHA1 Message Date
hufangzhou 2809bc0b94 * Perfect details. 2021-12-21 15:42:26 +08:00
王怡栋 97bbefbd09 * adjust for update sql. 2021-12-21 15:28:40 +08:00
王怡栋 b7ce8814fb Merge branch 'sprint/devops17_liyuchun' into 'devops17'
* Code for task #46001.

See merge request easycorp/zentaopms!1035
2021-12-21 07:27:35 +00:00
liyuchun 4508fec3a3 * Adjust annotation. 2021-12-21 15:26:31 +08:00
孙广明 b20d55dc28 Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug #17765, #17763, #17737.

See merge request easycorp/zentaopms!1036
2021-12-21 07:24:04 +00:00
liumengyi 3825315c6b * Add comment. 2021-12-21 15:23:19 +08:00
liumengyi e2cbf7dab7 * Fix bug #17765, #17763, #17737. 2021-12-21 15:21:18 +08:00
zhujinyong 816e2a3e00 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-21 14:53:50 +08:00
zhujinyong 5a1e31adf2 * Refactor getList of branch. 2021-12-21 14:53:05 +08:00
孙广明 a29de2106e Merge branch 'fix-die' into 'master'
Fix die naming compatibility

See merge request easycorp/zentaopms!1033
2021-12-21 06:37:35 +00:00
hufangzhou 872a8b2bbd * Finish task #46096. 2021-12-21 14:30:38 +08:00
王怡栋 075856775b Merge branch 'devops17' of https://gitlab.zcorp.cc/easycorp/zentaopms into devops17 2021-12-21 14:26:20 +08:00
Yurun c19e44c044 Fix die naming compatibility 2021-12-21 14:25:53 +08:00
王怡栋 29daabbb57 * add unit test case for repo getrepobyurl. 2021-12-21 14:24:48 +08:00
王怡栋 199443ccb3 Merge branch 'devops17_caoyanyi_bug' into 'devops17'
* Modify placeholder.

See merge request easycorp/zentaopms!1032
2021-12-21 06:18:15 +00:00
caoyanyi dd807b4192 * Modify placeholder. 2021-12-21 06:11:10 +00:00
zhujinyong f6e6ef8bff Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-21 14:06:54 +08:00
zhujinyong 14ee3504fa * Compatibility from PHP5.4. 2021-12-21 14:06:24 +08:00
孙广明 0fa8bbfb70 Merge branch 'sprint/179_tianshujie_17754' into 'master'
* Fix bug #17756,#17755,#17754,#17752,#17747.

See merge request easycorp/zentaopms!1031
2021-12-21 06:03:33 +00:00
朱金勇 3a8eabb057 Merge branch 'change-die-zhangrunyu' into 'master'
Change die

See merge request easycorp/zentaopms!1029
2021-12-21 05:59:10 +00:00
tianshujie 171045fab4 * Fix bug #17756,#17755,#17754,#17752,#17747. 2021-12-21 13:59:03 +08:00
孙广明 4de57a92d2 Merge branch 'sprint/179_liumengyi_46244' into 'master'
* Finish task #46244, #46243.

See merge request easycorp/zentaopms!1030
2021-12-21 05:56:06 +00:00
liumengyi 3bb8ba6b1d * Change 'let' to 'var'. 2021-12-21 13:55:00 +08:00
朱金勇 f2110111fb Merge branch 'sprint/178_songchenxuan_46095' into 'master'
Sprint/178 songchenxuan 46095

See merge request easycorp/zentaopms!1028
2021-12-21 05:53:23 +00:00
liumengyi 96ded748b6 * Add punctuation. 2021-12-21 13:50:40 +08:00
songchenxuan 72a6d27e6c *Finish task #46095. 2021-12-21 13:48:40 +08:00
liumengyi b8166358ad * Finish task #46244, #46243. 2021-12-21 13:46:31 +08:00
朱金勇 0b213848a5 Merge branch 'sprint/178_songchenxuan_17584' into 'master'
*Fix bug #17584.

See merge request easycorp/zentaopms!1014
2021-12-21 05:38:27 +00:00
Yurun 08935cfe5b Optimize 2021-12-21 13:21:12 +08:00
songchenxuan 72252707d3 *Fix bug #17584. 2021-12-21 11:55:35 +08:00
songchenxuan 116b1a717d *Fix bug #17584. 2021-12-21 11:54:54 +08:00
孙广明 187c67fd3b Merge branch 'sprint/179_tianshujie_bug' into 'master'
* Fix bug #17694,17683.

See merge request easycorp/zentaopms!1027
2021-12-21 03:32:08 +00:00
zhujinyong 01a62fe94b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-21 11:28:26 +08:00
zhujinyong 9ed65123b5 * Fix bug: display dropmenu when no lib. 2021-12-21 11:27:55 +08:00
tianshujie 7d49e79513 * Fix bug #17694,17683. 2021-12-21 11:26:26 +08:00
王怡栋 a6bb7e123f Merge branch 'devops17_caoyanyi_bug' into 'devops17'
* Modify page style and back url.

See merge request easycorp/zentaopms!1026
2021-12-21 03:21:51 +00:00
liyuchun 83f8fc47f1 Merge branch 'devops17_wangyidong_46002' into devops17 2021-12-21 11:20:04 +08:00
李玉春 30acf3d2a7 Merge branch 'devops17' into 'devops17_wangyidong_46002'
# Conflicts:
#   db/update16.0.beta1.sql
2021-12-21 03:19:16 +00:00
caoyanyi 76453ea1ba * Modify page style and back url. 2021-12-21 03:16:45 +00:00
朱金勇 49ae6abad6 Merge branch 'sprint/178_songchenxuan_17563' into 'master'
*Fix bug #17563.

See merge request easycorp/zentaopms!1013
2021-12-21 03:11:57 +00:00
朱金勇 338657c59f Merge branch 'sprint/178_songchenxuan_17684' into 'master'
*Fix bug #17684.

See merge request easycorp/zentaopms!1024
2021-12-21 03:09:34 +00:00
王怡栋 a8bcb49883 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-21 11:08:56 +08:00
朱金勇 da2117bb2e Merge branch 'sprint/179_sunhao/icon' into 'master'
* Update icons: add icon-sonarqube, remove icon-zone, update icon-cube.

See merge request easycorp/zentaopms!1025
2021-12-21 03:08:34 +00:00
王怡栋 bf4dcdd19c * adjust get api version. 2021-12-21 11:08:28 +08:00
孙广明 68e2a1c668 Merge branch 'sprint/179_zhengrunyu_46146' into 'master'
*Fix bug

See merge request easycorp/zentaopms!1023
2021-12-21 03:05:42 +00:00
zhengrunyu 1681d07f6a *Fix task 46163. 2021-12-21 11:04:12 +08:00
zhengrunyu f7ff2b00d9 *Fix bug. 2021-12-21 10:58:30 +08:00
Hao Sun c4638ccc9d * Update icons: add icon-sonarqube, remove icon-zone, update icon-cube. 2021-12-21 10:58:22 +08:00
songchenxuan 147c03f2f0 *Fix bug #17684. 2021-12-21 10:17:51 +08:00
zhengrunyu 8599448fda *Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug 2021-12-21 10:08:11 +08:00