 liyuchun
|
4ecc85aa0e
|
Merge branch 'devops16'
|
2021-12-13 12:12:37 +08:00 |
|
|
xieqiyu
|
ad8ed52f22
|
* Code for task#45536.
|
2021-12-10 10:57:56 +08:00 |
|
|
李玉春
|
0ebff09658
|
Merge branch 'sprint/devops16_wangyidong_45504' into 'sprint/devops16'
Sprint/devops16 wangyidong 45504
See merge request easycorp/zentaopms!857
|
2021-12-09 07:56:27 +00:00 |
|
|
王怡栋
|
dc7416ebb4
|
* adjust code for mr.
|
2021-12-09 15:54:41 +08:00 |
|
|
王怡栋
|
c09fcb0c15
|
Merge branch 'devops16_caoyanyi_45499' into sprint/devops16
|
2021-12-09 15:40:44 +08:00 |
|
|
caoyanyi
|
a8abcb6c9f
|
* Add create and edit auth.
|
2021-12-09 02:14:37 +00:00 |
|
|
caoyanyi
|
8249473e63
|
* Finish task #45499.
|
2021-12-09 01:25:55 +00:00 |
|
|
liyuchun
|
8b0da7b97c
|
* Finish task #45491.
|
2021-12-08 09:53:08 +08:00 |
|
|
李玉春
|
bb44039a30
|
Merge branch 'sprint/devops16' into 'sprint/devops16_45500'
# Conflicts:
# module/gitlab/control.php
|
2021-12-07 08:54:25 +00:00 |
|
|
王怡栋
|
cf280763b2
|
Merge branch 'sprint/devops16_liyuchun_45491' into 'master'
* Finish task #45491.
See merge request easycorp/zentaopms!803
(cherry picked from commit ff06288dc8)
b11dd3af * Finish task #45491.
|
2021-12-07 08:49:16 +00:00 |
|
|
zenggang
|
b4685be3de
|
* Finish task#45500
|
2021-12-07 08:15:04 +00:00 |
|
|
tanghucheng
|
c6b731717a
|
* Fix project execution privilege.
|
2021-12-06 09:24:06 +08:00 |
|
|
liyuchun
|
c943151157
|
* Fix bug #16847.
|
2021-12-02 14:28:50 +08:00 |
|
|
李玉春
|
38f5ab4145
|
Merge branch 'master' into 'sprint/175_sgm_fixbug'
# Conflicts:
# module/execution/control.php
# module/message/config.php
|
2021-12-02 05:04:29 +00:00 |
|
|
孙广明
|
4b94092737
|
* Finish task #45162.
|
2021-12-02 09:24:01 +08:00 |
|
|
liyuchun
|
f6301e4c9a
|
Merge branch 'sugon'
|
2021-12-01 16:48:00 +08:00 |
|
|
liumengyi
|
bba0c40dfe
|
* Fix bug #16882, #16924.
|
2021-12-01 11:25:02 +08:00 |
|
|
liumengyi
|
86674338d9
|
* Fix bug #16882.
|
2021-12-01 10:24:45 +08:00 |
|
|
zenggang
|
d60dfdb494
|
* Fix bug#16810
|
2021-11-30 07:43:02 +00:00 |
|
|
孙广明
|
c42cca1249
|
Merge branch 'sprint/168'
|
2021-11-30 14:38:32 +08:00 |
|
|
zenggang
|
5bb1d7b671
|
* Fix bug#16860
|
2021-11-30 03:08:33 +00:00 |
|
|
songchenxuan
|
c43a6b58f5
|
* Finish task #45028.
|
2021-11-29 17:37:18 +08:00 |
|
|
songchenxuan
|
a1d18bd94e
|
* Finish task 45048.
|
2021-11-29 17:15:57 +08:00 |
|
|
songchenxuan
|
908f51250b
|
* Fix bug #15737.
|
2021-11-29 16:17:04 +08:00 |
|
|
zenggang
|
84275ecf86
|
* Finish bug#16883
|
2021-11-29 06:03:03 +00:00 |
|
|
zenggang
|
bee47f64e1
|
* Fix bug#16753
|
2021-11-26 09:49:01 +00:00 |
|
|
zenggang
|
0b965aa699
|
* Fix bug#16745
|
2021-11-26 07:17:55 +00:00 |
|
|
liyuchun
|
facb6f1ce4
|
* Fix bug #16715.
|
2021-11-25 15:59:54 +08:00 |
|
|
王怡栋
|
fde5cb61da
|
Merge branch 'sprint/app10' into sprint/170
|
2021-11-19 08:41:00 +08:00 |
|
|
李玉春
|
68d5d5e903
|
Merge branch 'sprint/170_hufangzhou_16385' into 'sprint/170'
* Fix bug #16385 and fix an error.
See merge request easycorp/zentaopms!534
|
2021-11-19 00:35:13 +00:00 |
|
|
hufangzhou
|
4a07c2324f
|
* Fix bug #16385 and fix an error.
|
2021-11-18 21:41:48 +08:00 |
|
|
zhouxin
|
b8783ecd5c
|
Fix bug 16408.
|
2021-11-18 17:32:02 +08:00 |
|
|
zhouxin
|
e55bc34ee6
|
Fix bug 16408.
|
2021-11-18 16:26:29 +08:00 |
|
|
liumengyi
|
d7763fdee5
|
* Finish task #44369.
|
2021-11-17 15:16:22 +08:00 |
|
|
hufangzhou
|
e3ae68fc04
|
* Add the priviledge.
|
2021-11-09 17:26:32 +08:00 |
|
|
xieqiyu
|
d889184204
|
* Finish task#43920.
|
2021-11-09 16:17:15 +08:00 |
|
|
liyuchun
|
f634d5f20d
|
* Finish task #43933.
|
2021-11-09 08:59:56 +08:00 |
|
|
qiyu-xie
|
f22b3ea149
|
* Code for task#43902.
|
2021-11-07 18:12:57 +08:00 |
|
|
qiyu-xie
|
f94e0ecb08
|
* Code for task#44028.
|
2021-11-07 16:05:02 +08:00 |
|
|
qiyu-xie
|
8f902ccf2d
|
* Code fot task#44028.
|
2021-11-07 13:44:24 +08:00 |
|
|
孙广明
|
75d547998c
|
* Code for task #44005.
|
2021-11-04 16:55:37 +08:00 |
|
|
王怡栋
|
3cdf3b3395
|
Merge branch 'sprint/167_wangyidong_api' into sprint/app10
|
2021-11-01 15:35:49 +08:00 |
|
|
王怡栋
|
a459f5fd47
|
* fix bug for set actions.
|
2021-11-01 15:15:28 +08:00 |
|
|
hufangzhou
|
702c40addd
|
* Finish task #43423.
|
2021-11-01 13:50:53 +08:00 |
|
|
xiawenlong
|
3dc8358434
|
Finish permissionOC
|
2021-10-29 10:09:07 +08:00 |
|
|
liyuchun
|
a2163a67d0
|
* Add auth of api.
|
2021-10-19 20:37:36 +08:00 |
|
|
liyuchun
|
9e83958e1c
|
* Adjust order of change log.
|
2021-10-19 20:34:59 +08:00 |
|
|
liyuchun
|
8c12096a92
|
* Fix bug #15639.
|
2021-10-19 20:23:19 +08:00 |
|
|
李玉春
|
1dea8203c0
|
Merge branch 'sprint/167' into 'sprint/167_xieqiyu_15615'
# Conflicts:
# module/api/view/index.html.php
|
2021-10-19 10:44:18 +00:00 |
|
|
xieqiyu
|
5479e2db3f
|
* Code for bug#15615.
|
2021-10-19 18:40:55 +08:00 |
|