 王怡栋
|
e08cbf07d0
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-14 15:52:40 +08:00 |
|
|
王怡栋
|
aa38fe6ec9
|
* adjust for compute burn.
|
2022-03-14 15:50:57 +08:00 |
|
|
zhujinyong
|
ea63748351
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-14 15:12:53 +08:00 |
|
|
zhujinyong
|
976299d506
|
* Fix type of fields.
|
2022-03-14 15:12:32 +08:00 |
|
|
孙广明
|
d1a3c84b57
|
Merge branch 'autoTest_liumengyi_task' into 'master'
* Add auto test of task.
See merge request easycorp/zentaopms!2232
|
2022-03-14 06:42:12 +00:00 |
|
|
liumengyi
|
3c75a1555e
|
* Add auto test of task.
|
2022-03-14 14:39:59 +08:00 |
|
|
朱金勇
|
0ba0e25d66
|
Merge branch 'sgm_upgrade' into 'master'
* Fix upgrade bug.
See merge request easycorp/zentaopms!2230
|
2022-03-14 06:36:24 +00:00 |
|
|
孙广明
|
140c7652ad
|
* Fix upgrade bug.
|
2022-03-14 14:23:19 +08:00 |
|
|
zhujinyong
|
b5da3ce7d5
|
* Execute xuanxuan update sql.
|
2022-03-14 13:55:52 +08:00 |
|
|
朱金勇
|
89aea98b25
|
Merge branch 'sgm_upgrade' into 'master'
* Fix upgrade bug.
See merge request easycorp/zentaopms!2227
|
2022-03-14 03:32:07 +00:00 |
|
|
孙广明
|
16bfad8acd
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug for priv.
See merge request easycorp/zentaopms!2226
|
2022-03-14 03:31:17 +00:00 |
|
|
孙广明
|
1beb9196e3
|
* Fix upgrade bug.
|
2022-03-14 11:30:04 +08:00 |
|
|
tanghucheng
|
4cbe8ae9a2
|
* Fix bug for priv.
|
2022-03-14 11:23:55 +08:00 |
|
|
zhujinyong
|
32d12d4ef2
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-14 10:35:18 +08:00 |
|
|
zhujinyong
|
7a3e077afa
|
* The setting of system.common has no vision.
|
2022-03-14 10:34:47 +08:00 |
|
|
孙广明
|
87458bc808
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #20702,20698,20642.
See merge request easycorp/zentaopms!2223
|
2022-03-14 02:13:14 +00:00 |
|
|
孙广明
|
5820a746ba
|
Merge branch 'sprint/187_hufangzhou_20704' into 'master'
* Fix bug #20704.
See merge request easycorp/zentaopms!2224
|
2022-03-14 02:12:35 +00:00 |
|
|
hufangzhou
|
c402f35eda
|
* Fix bug #20704.
|
2022-03-14 10:08:25 +08:00 |
|
|
tanghucheng
|
a25fd822bd
|
* Fix bug #20702,20698,20642.
|
2022-03-14 09:55:44 +08:00 |
|
|
孙广明
|
4806292eff
|
Merge branch 'autotest_denghongtao' into 'master'
Autotest denghongtao
See merge request easycorp/zentaopms!2222
|
2022-03-14 01:28:12 +00:00 |
|
|
[denghongtao]
|
aac3861c31
|
* Add auto test.
|
2022-03-14 09:22:53 +08:00 |
|
|
[denghongtao]
|
5ac561a338
|
Update old test
|
2022-03-14 09:17:47 +08:00 |
|
|
孙广明
|
94068dcb1f
|
Merge branch 'sprint/187_hufangzhou_20665' into 'master'
* Fix bug #20665.
See merge request easycorp/zentaopms!2221
|
2022-03-14 01:08:47 +00:00 |
|
|
hufangzhou
|
8187472563
|
* Fix bug #20665.
|
2022-03-14 09:06:42 +08:00 |
|
|
王怡栋
|
7fd6757311
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Modify the problem that the execution label cannot be fully displayed.
See merge request easycorp/zentaopms!2220
|
2022-03-14 00:58:01 +00:00 |
|
|
tianshujie
|
56c5c966ea
|
* Modify the problem that the execution label cannot be fully displayed.
|
2022-03-14 08:55:39 +08:00 |
|
|
孙广明
|
04493aa3af
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug for feedback.
See merge request easycorp/zentaopms!2219
|
2022-03-14 00:33:41 +00:00 |
|
|
tanghucheng
|
f90bdb2a0c
|
* Fix bug for feedback.
|
2022-03-14 08:32:03 +08:00 |
|
|
王怡栋
|
49218a4097
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* code format
See merge request easycorp/zentaopms!2215
|
2022-03-14 00:26:35 +00:00 |
|
|
zhujinyong
|
ee8298f9f6
|
* Check login.
|
2022-03-13 23:57:59 +08:00 |
|
|
zhujinyong
|
87909913c8
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-13 22:42:56 +08:00 |
|
|
朱金勇
|
9851110785
|
Merge branch 'sprint/187_hufangzhou_zentaosql' into 'master'
* Add the functions to zentao.sql .
See merge request easycorp/zentaopms!2218
|
2022-03-13 14:32:46 +00:00 |
|
|
zhujinyong
|
7f32ac7f61
|
* Fix error when updating.
|
2022-03-13 22:30:40 +08:00 |
|
|
hufangzhou
|
9a3d7b3a1f
|
* Add the functions to zentao.sql .
|
2022-03-13 22:30:12 +08:00 |
|
|
朱金勇
|
2b429cc75b
|
Merge branch 'sprint/187_hufangzhou_sql' into 'master'
* Modify the default value of visions field.
See merge request easycorp/zentaopms!2217
|
2022-03-13 13:07:23 +00:00 |
|
|
hufangzhou
|
e91c1acbb7
|
* Modify the default value of visions field.
|
2022-03-13 19:31:51 +08:00 |
|
|
zhujinyong
|
12ed4a79b3
|
* Fix upgrade.
|
2022-03-13 19:19:13 +08:00 |
|
|
朱金勇
|
ceb1df9bdc
|
Merge branch 'sgm_waterfall' into 'master'
* Fix weekly bug.
See merge request easycorp/zentaopms!2216
|
2022-03-13 11:01:04 +00:00 |
|
|
孙广明
|
6a6af4e1a2
|
* Fix weekly bug.
|
2022-03-13 15:08:54 +08:00 |
|
|
Zongjun Lan
|
9b8f238779
|
* code format
|
2022-03-11 17:31:31 +08:00 |
|
|
王怡栋
|
e56cf08647
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20640,#20647
See merge request easycorp/zentaopms!2210
|
2022-03-11 09:29:56 +00:00 |
|
|
Zongjun Lan
|
22c49a0949
|
* fix bug #20647
|
2022-03-11 16:29:00 +08:00 |
|
|
zhujinyong
|
abb301884f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-11 15:55:03 +08:00 |
|
|
zhujinyong
|
bebc33acb4
|
* Fix bug#20651.
|
2022-03-11 15:54:36 +08:00 |
|
|
孙广明
|
3a491529c7
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!2213
|
2022-03-11 07:50:07 +00:00 |
|
|
tanghucheng
|
fb78d74984
|
* Fix bug.
|
2022-03-11 15:48:25 +08:00 |
|
|
zhujinyong
|
ad46d46e81
|
* Fix comment.
|
2022-03-11 15:28:43 +08:00 |
|
|
孙广明
|
350c5207cc
|
Merge branch 'autotest_ly' into 'master'
update project data
See merge request easycorp/zentaopms!2212
|
2022-03-11 07:25:22 +00:00 |
|
|
孙广明
|
8b1c98b575
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix sql for lite grouppriv.
See merge request easycorp/zentaopms!2205
|
2022-03-11 07:24:33 +00:00 |
|
|
孙广明
|
a541af7376
|
更新db/zentao.sql
|
2022-03-11 07:24:09 +00:00 |
|