 孙广明
|
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 |
|
|
李玉春
|
39e8a3fae7
|
Revert "Merge branch 'devops_caoyanyi' into 'master'"
This reverts merge request !1515
|
2022-01-20 05:42:05 +00:00 |
|
|
caoyanyi
|
f87294adf7
|
* Modify page error.
|
2022-01-20 05:37:33 +00:00 |
|
|
liyuchun
|
7e96eb9f68
|
Merge branch 'devops19'
|
2022-01-19 16:55:57 +08:00 |
|
|
zenggang
|
4b0d2e842a
|
* Fix bug#18456,18393,18392
|
2022-01-17 06:49:36 +00:00 |
|
|
hufangzhou
|
d0cfa7531e
|
* Add the new version.
|
2022-01-11 09:19:47 +08:00 |
|
|
李玉春
|
f08514b544
|
Merge branch 'devops18_18277' into 'master'
* Fix bug#18277
See merge request easycorp/zentaopms!1316
|
2022-01-10 00:46:09 +00:00 |
|
|
liyuchun
|
ab097f3a61
|
* Fix bug #18264.
|
2022-01-10 08:39:41 +08:00 |
|
|
zenggang
|
a87d365a09
|
* Fix bug#18277
|
2022-01-07 03:03:44 +00:00 |
|
|
李玉春
|
c357477762
|
Merge branch 'devops18_47047' into 'master'
* Finish task#47047
See merge request easycorp/zentaopms!1272
|
2022-01-06 03:00:38 +00:00 |
|
|
李玉春
|
4ca46cc91f
|
Merge branch 'devops18_47057' into 'master'
* Finish task#47057
See merge request easycorp/zentaopms!1260
|
2022-01-06 02:59:30 +00:00 |
|
|
zenggang
|
08132a448d
|
* Adjust code
|
2022-01-05 06:39:32 +00:00 |
|
|
zenggang
|
79859569b3
|
* Finish task#47047
|
2022-01-05 06:24:19 +00:00 |
|
|
zenggang
|
443a00c606
|
* Finish task#47057
|
2022-01-05 02:16:33 +00:00 |
|
|
caoyanyi
|
5d9dc4885b
|
* Finish task #47051.
|
2022-01-05 02:03:30 +00:00 |
|
|
liyuchun
|
2c5d8abc45
|
* Fix bug #18150.
|
2022-01-04 16:15:17 +08:00 |
|
|
liyuchun
|
c2da5eefe2
|
Merge branch 'devops18'
|
2021-12-31 10:38:04 +08:00 |
|