Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
38,950 Commits 2 Branches 292 Tags
e71094decc62221da5fc2e4aff3a548806e905ca
Commit Graph
415 Commits
Author SHA1 Message Date
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
zenggang 81849859ca * Adjust code 2022-01-27 07:43:46 +00:00
zenggang f4729ec429 * Adjust code 2022-01-27 07:23:52 +00:00
孙广明 307184ea77 Merge branch 'devops20_liyuchun' into 'master' 
* Adjsut unit cases.

See merge request easycorp/zentaopms!1669
 2022-01-27 05:04:51 +00:00
liyuchun 4b9ee0cc3c * Adjsut unit cases. 2022-01-27 11:16:10 +08:00
caoyanyi 423b7dd303 * Modify access check. 2022-01-27 00:39:43 +00:00
caoyanyi 9b8743c494 * Modify mr view style. 2022-01-26 08:40:55 +00:00
孙广明 edf6d49b46 Merge branch 'devops20_liyuchun' into 'master' 
* Fix error in mr view.

See merge request easycorp/zentaopms!1640
 2022-01-26 03:29:36 +00:00
liyuchun b6bf9f253d * Fix error in mr view. 2022-01-26 10:49:57 +08:00
zenggang 7aa6a292d4 * Adjust code for deleted project 2022-01-26 02:47:19 +00:00
李玉春 e19ca18d37 Merge branch 'devops20_18969' into 'master' 
修复bug 18969

See merge request easycorp/zentaopms!1613
 2022-01-25 09:15:37 +00:00
liyuchun 555fbaddef Merge branch 'devops20' 2022-01-25 16:55:51 +08:00
zenggang 7c2443dc66 * Fix bug#18969 2022-01-25 08:53:55 +00:00
zenggang 5f83afb622 * Unit test and adjust code 2022-01-25 08:33:21 +00:00
zenggang 5183b24bd0 * Adjust code 2022-01-25 02:37:51 +00:00
zenggang 216be433d4 * Adjust code 2022-01-25 01:28:07 +00:00
zenggang 4ab46cb2ea *Finish task#48107,48106,48105,48103 and adjust code 2022-01-25 01:13:49 +00:00
孙广明 461940c671 Merge branch 'devops20_liyuchun' into 'devops20' 
* Finish task #48096.

See merge request easycorp/zentaopms!1567
 2022-01-24 09:23:16 +00:00
liyuchun eba799b60f * Fix bug #18492. 2022-01-24 17:20:19 +08:00
caoyanyi c077f9ff4d * Modify auth check. 2022-01-24 08:20:40 +00:00
caoyanyi a2a1df2b9e * Modify isset check. 2022-01-24 08:08:24 +00:00
caoyanyi d0b289ed21 * Finish task #48108. 2022-01-24 07:46:22 +00:00
zenggang 47e13757a8 * Adjust code 2022-01-21 05:11:52 +00:00
zenggang e315a62440 * Adjust code 2022-01-21 02:38:51 +00:00
zenggang 36c97752b4 * Finish task#48104 2022-01-20 09:25:44 +00:00