Commit Graph
439 Commits
Author SHA1 Message Date
caoyanyi 7ce833f5ad * Modify style for select. 2022-06-24 08:48:02 +08:00
caoyanyi b85f30b3ac * Adjust style. 2022-06-23 15:25:53 +08:00
李玉春 69fa9aa6ed Merge branch 'cyy_optimize' into 'master'
* Adjust style and codes.

See merge request easycorp/zentaopms!4073
2022-06-23 01:02:57 +00:00
caoyanyi dd5cf777d9 * Modify function name. 2022-06-23 08:23:55 +08:00
李玉春 e308778583 Merge branch 'cyy_23862' into 'master'
* Fix bug #23862.

See merge request easycorp/zentaopms!4064
2022-06-23 00:16:10 +00:00
caoyanyi 0c894a4355 * Adjust style and codes. 2022-06-22 16:32:57 +08:00
tianshujie e2669481c7 * Added German and French. 2022-06-22 15:28:45 +08:00
李玉春 497b32f627 Merge branch 'zenops_36' into 'master'
Zenops 36

See merge request easycorp/zentaopms!4066
2022-06-22 07:18:41 +00:00
caoyanyi f8d040cc16 * Modify mr check. 2022-06-22 14:00:56 +08:00
caoyanyi 2d96651ad9 * Modify repo id save. 2022-06-22 11:57:02 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
李玉春 cbed1964c2 Merge branch 'cyy_devops' into 'zenops_36'
* Finish task #57665.

See merge request easycorp/zentaopms!4027
2022-06-22 00:35:31 +00:00
caoyanyi 7813db6bd3 * Adjust codes. 2022-06-22 08:34:40 +08:00
liyuchun 76c813efc9 * Finish task #57657. 2022-06-21 03:25:51 +00:00
caoyanyi 4bd3805ae9 * Add css file. 2022-06-21 11:05:31 +08:00
caoyanyi dfbf69a211 * Finish task #57664. 2022-06-21 10:33:12 +08:00
caoyanyi e138da8508 * Finish task #57665. 2022-06-20 13:02:32 +08:00
liyuchun e447ec9a11 * Remove unused code. 2022-06-16 08:57:09 +00:00
liyuchun 13b26f2119 * Add param when exec pipeline. 2022-06-16 08:55:46 +00:00
liyuchun 08b36c0418 * Finish task #57065. 2022-06-16 07:50:39 +00:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
caoyanyi 828760e66e * Fix bug #23100. 2022-05-31 16:01:26 +08:00
caoyanyi 7bfe6d767e * Fix bug #22688. 2022-05-19 15:48:35 +08:00
wangyidong 1d9f9c0e75 * code for bug #22095. 2022-04-28 17:46:41 +08:00
liyuchun ad7308ef50 * Fix bug #22015. 2022-04-26 08:44:38 +00:00
liyuchun d9f452dc50 * Fix bug #21629. 2022-04-22 12:49:40 +08:00
liyuchun 6726e65206 * Fix bug #20178. 2022-04-21 15:59:21 +08:00
liyuchun 816c36770d * Fix bug #21878. 2022-04-20 15:00:13 +08:00
zhouxudong c449b53e4b * Fix bug #20178. 2022-04-18 13:59:09 +08:00
zhouxudong 532920579e * Fix bug #20178. 2022-04-18 13:20:44 +08:00
zhouxudong 9f50c3abaa * Fix bug #20178. 2022-04-18 11:18:33 +08:00
zenggang 70d00fad9e * Code for task#50697,50685 2022-03-17 03:07:38 +00:00
孙广明 484dae9ad5 Merge branch 'devops24_liyuchun_gitlab' into 'devops24'
在合并请求列表增加提交人

See merge request easycorp/zentaopms!2317
2022-03-16 13:58:34 +00:00
liyuchun 0417b3a1e2 * Add author in mr list. 2022-03-16 17:24:27 +08:00
caoyanyi 4c0d583520 * Fix bug #20626. 2022-03-16 14:15:34 +08:00
zenggang 4464d75123 * Finish task#50685,50680,50672 2022-03-16 05:20:20 +00:00
zenggang f072b034f5 * Finish task#50669,50670 2022-03-15 09:29:20 +00:00
zenggang 2431e1ccc2 * Fix bug#50694,50689 2022-03-15 02:56:31 +00:00
caoyanyi 8a2c1207fd * Finish task #50075. 2022-03-02 09:21:58 +08:00
孙广明 df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
zenggang 574b5400d1 * Fix bug#19866 2022-02-23 07:14:06 +00:00
李玉春 9405f7bf71 Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283'
# Conflicts:
#   db/update16.4.sql
#   module/user/view/story.html.php
2022-02-23 01:33:37 +00:00
zenggang 894689a7e3 * Fix bug#19819 2022-02-22 07:31:02 +00:00
zhujinyong 002e215a3d * Move die to return. 2022-02-22 09:02:00 +08:00
zhengrunyu 0805d25735 * Finish task 49283. 2022-02-21 10:47:27 +08:00
caoyanyi 9392f31b0a * Add language for gitlab merge status. 2022-02-21 09:47:23 +08:00
caoyanyi e4429fbadb * Modify api get group param. 2022-02-14 11:02:07 +08:00
liyuchun 26ec64058c * Fix error. 2022-02-14 08:28:13 +08:00
zenggang b2875e7c20 * Adjust code 2022-01-28 01:17:50 +00:00