Commit Graph
45865 Commits
Author SHA1 Message Date
wangjianhua 7edfc6d6c8 * Add lang item and fix codes format. 2022-10-09 09:43:57 +08:00
wangjianhua 804cf64783 * Improve css and js of manage repo page. 2022-09-30 15:01:31 +08:00
wangjianhua 04702a6139 * Finish task #70792: link project without product to code repository. 2022-09-30 14:20:19 +08:00
liugang 0c11f5b232 * Optimize. 2022-09-30 09:36:41 +08:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
wangyidong daa0ea847c * rename update sql to 18.0. 2022-09-30 08:51:22 +08:00
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
wangyidong 94e12f2c0a Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240 2022-09-30 08:31:56 +08:00
王怡栋 8e28c42e0f Merge branch 'bug_28011' into 'master'
* Fix bug#28011

See merge request easycorp/zentaopms!5617
2022-09-30 00:30:17 +00:00
王怡栋 d278c0be48 Merge branch 'master_xieqiyu_27008' into 'master'
* Fix bug#27008.

See merge request easycorp/zentaopms!5628
2022-09-30 00:29:46 +00:00
王怡栋 846ee00dd2 Merge branch 'master_xieqiyu_27048' into 'master'
* Fix bug#27048.

See merge request easycorp/zentaopms!5626
2022-09-30 00:29:21 +00:00
王怡栋 f0be075cfe Merge branch 'master_xieqiyu_27125' into 'master'
* Fix bug#27125.

See merge request easycorp/zentaopms!5624
2022-09-30 00:29:03 +00:00
liugang 6b014b187b * Fix bug of edit bug. 2022-09-30 08:28:41 +08:00
王怡栋 e9d7dea3e5 Merge branch 'master_xieqiyu_28107' into 'master'
* Fix bug#28107.

See merge request easycorp/zentaopms!5621
2022-09-30 00:28:10 +00:00
王怡栋 fb0ef6c81d Merge branch 'sprint/zentaopms240_bug#27928' into 'sprint/zentaopms240'
* Fix bug #27928.

See merge request easycorp/zentaopms!5623
2022-09-30 00:27:24 +00:00
王怡栋 eec861592f Merge branch 'sprint/zentaopms240_bug#28147' into 'sprint/zentaopms240'
* Fix bug #28147.

See merge request easycorp/zentaopms!5616
2022-09-30 00:26:15 +00:00
王 于听 1802012184 Merge branch 'sprint/zentaopms240_bug#28182' into 'sprint/zentaopms240'
* Fix bug # 28182.

See merge request easycorp/zentaopms!5630
2022-09-29 09:18:45 +00:00
wangyuting2 e438c9f3ab * Fix bug # 28182. 2022-09-29 09:17:45 +00:00
孙广明 85e5d5c0a8 Merge branch 'sprint/244_tianshujie_70494' into 'master'
Sprint/244 tianshujie 70494

See merge request easycorp/zentaopms!5627
2022-09-29 09:17:37 +00:00
sunguangming ad826bf92b * Fix bug #28202. 2022-09-29 17:14:02 +08:00
sunguangming 7c59e436e4 * Fix bug #28204. 2022-09-29 17:06:30 +08:00
tianshujie d2568442eb * Finish task #70494. 2022-09-29 16:54:35 +08:00
李玉春 fc09ce2d86 Merge branch 'sprint/wzm/28207' into 'master'
* Fix bug #28207

See merge request easycorp/zentaopms!5618
2022-09-29 08:49:47 +00:00
xieqiyu bc0aba20b9 * Fix bug#27008. 2022-09-29 08:42:57 +00:00
刘刚 c809f98365 Merge branch 'zentaopms_239_tanghucheng' into 'zentaopms_239'
* Fix bug for pri.

See merge request easycorp/zentaopms!5625
2022-09-29 08:35:59 +00:00
tianshujie 57df99f43e * Finish task #70494. 2022-09-29 16:34:40 +08:00
xieqiyu 100c4359dd * Fix bug#27048. 2022-09-29 08:34:34 +00:00
tanghucheng 82172a408a * Fix bug for pri. 2022-09-29 16:34:33 +08:00
xieqiyu 45791d127b * Fix bug#27125. 2022-09-29 08:22:59 +00:00
wangyuting2 3a6bca52e8 * Fix bug #27928. 2022-09-29 08:21:43 +00:00
王 于听 64e354471f Merge branch 'sprint/zentaopms240_bug#28213' into 'sprint/zentaopms240'
* Fix bug #28213.

See merge request easycorp/zentaopms!5622
2022-09-29 08:16:47 +00:00
wangyuting2 9c6798f85d * Fix bug #28213. 2022-09-29 08:15:53 +00:00
zenggang 29dbb25855 * Adjust code 2022-09-29 08:13:34 +00:00
xieqiyu e84a192501 * Fix bug#28107. 2022-09-29 08:12:31 +00:00
王 于听 b544e34fa6 Merge branch 'sprint/zentaopms240_bug#28193' into 'sprint/zentaopms240'
Sprint/zentaopms240 bug#28193

See merge request easycorp/zentaopms!5620
2022-09-29 08:05:44 +00:00
sunguangming 4f58d80d64 * Hide bug plan in waterfall project. 2022-09-29 16:05:03 +08:00
wangyuting2 64b22cb464 * Fix bug. 2022-09-29 08:04:53 +00:00
wangyuting2 53cf43823d * Fix bug #28193. 2022-09-29 07:56:40 +00:00
wangyidong 347d7b57c5 * fix bug #28183. 2022-09-29 15:53:16 +08:00
liyuchun b2dd00458a Merge branch 'zentaopms_239_wangjianhua_70790' into zentaopms_239 2022-09-29 15:50:50 +08:00
wangyidong 101ff49a06 * fix bug #28209. 2022-09-29 15:42:39 +08:00
liugang d5279a42b8 * Remove duplicate lang items. 2022-09-29 15:30:20 +08:00
liugang 77b2b17a7b * Fix bug. 2022-09-29 15:25:58 +08:00
李玉春 e3802d13c4 Merge branch 'zentaopms_239' into 'zentaopms_239_wangjianhua_70790'
# Conflicts:
#   db/update17.6.1.sql
2022-09-29 07:06:53 +00:00
李玉春 27d7245fb1 Merge branch 'sprint/244_tianshujie_70503' into 'master'
* Finish task #70503.

See merge request easycorp/zentaopms!5614
2022-09-29 07:05:05 +00:00
wangzemei 8ebea231d8 * Fix bug #28207 2022-09-29 14:56:40 +08:00
zenggang 6a85ed1d6f * Fix bug#28011 2022-09-29 06:56:02 +00:00
wangjianhua 71c3af423d * Finish task #70790: link repo and projects. 2022-09-29 14:56:00 +08:00
tianshujie 04d06bb2b5 * Finish task #70494. 2022-09-29 14:48:09 +08:00
孙广明 9c5e3353e6 Merge branch 'lyk_27556' into 'master'
* Fix bug #27556.

See merge request easycorp/zentaopms!5615
2022-09-29 06:43:24 +00:00