 孙广明
|
b6984e33da
|
Merge branch 'sprint/179_zhengrunyu_' into 'kanban'
*Fix bug.
See merge request easycorp/zentaopms!983
|
2021-12-17 05:31:02 +00:00 |
|
|
zhengrunyu
|
211af57714
|
*Fix bug.
|
2021-12-17 13:28:03 +08:00 |
|
|
孙广明
|
7e088767b9
|
Merge branch 'sprint/179_zhengrunyu_' into 'kanban'
*Finish task.
See merge request easycorp/zentaopms!982
|
2021-12-17 05:24:52 +00:00 |
|
|
zhengrunyu
|
80cd2e52fd
|
*Fix .
|
2021-12-17 13:23:09 +08:00 |
|
|
zhengrunyu
|
0e5b54464c
|
*Finish task.
|
2021-12-17 13:18:10 +08:00 |
|
|
王怡栋
|
b213ed54ba
|
Merge branch 'sprint/devops17_liyuchun' into 'devops17'
* Fix bug #17640.
See merge request easycorp/zentaopms!980
|
2021-12-17 05:04:26 +00:00 |
|
|
王怡栋
|
b96a5b286d
|
* adjust for task #46002.
|
2021-12-17 13:03:56 +08:00 |
|
|
Hao Sun
|
44921262ff
|
* Adjust url card style in client.
|
2021-12-17 11:33:13 +08:00 |
|
|
liyuchun
|
0f49c232f3
|
* Fix bug #17640.
|
2021-12-17 11:12:05 +08:00 |
|
|
李玉春
|
43d07b8cd0
|
Merge branch 'sgm_projectpriv' into 'master'
* Reset project priv.
See merge request easycorp/zentaopms!979
|
2021-12-17 03:03:39 +00:00 |
|
|
zhujinyong
|
10dfc32924
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-17 10:24:23 +08:00 |
|
|
zhujinyong
|
de2e4be174
|
* Fix test.
|
2021-12-17 10:23:57 +08:00 |
|
|
孙广明
|
6ee1345b07
|
* Reset project priv.
|
2021-12-17 10:13:49 +08:00 |
|
|
tianshujie
|
cd4b1019ef
|
Merge branch 'kanban' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/179_tianshujie_46151
|
2021-12-17 09:30:32 +08:00 |
|
|
tianshujie
|
9ad591fc93
|
* Realize the function of sub-molecules.
|
2021-12-17 09:27:50 +08:00 |
|
|
孙广明
|
2722e08c1c
|
Merge branch 'sprint/177_zhengruyu_' into 'kanban'
*Finish task.*Finish task.*Finish task.*Finish task.*Finish task.*Finish...
See merge request easycorp/zentaopms!978
|
2021-12-17 01:17:13 +00:00 |
|
|
zhengrunyu
|
a40d4b9ce1
|
*Finish task.
|
2021-12-17 09:11:22 +08:00 |
|
|
孙广明
|
31fcde628b
|
Merge branch 'sprint/179_liumengyi_46240' into 'kanban'
* Finish task #46240.
See merge request easycorp/zentaopms!977
|
2021-12-17 00:57:09 +00:00 |
|
|
zhengrunyu
|
a377632a45
|
*Finish task.
|
2021-12-17 08:54:46 +08:00 |
|
|
zhengrunyu
|
3a7789e413
|
*Finish task
|
2021-12-17 08:54:46 +08:00 |
|
|
zhengrunyu
|
80ca6c5585
|
*Finish task.*Finish task.*Finish task.*Finish task.*Finish task.*Finish task.*Finish task.*Finish task.
|
2021-12-17 08:54:46 +08:00 |
|
|
liumengyi
|
cc59614c39
|
* Finish task #46240.
|
2021-12-17 08:49:43 +08:00 |
|
|
王怡栋
|
1a66159617
|
* code for task #46002.
|
2021-12-17 08:47:23 +08:00 |
|
|
李玉春
|
ddf625db0b
|
Merge branch 'sprint/30_zhouxin_bug_17513' into 'kanban'
Fix bug #17513.
See merge request easycorp/zentaopms!962
|
2021-12-17 00:08:59 +00:00 |
|
|
xieqiyu
|
b67911b304
|
* Pass the data of the merged branch.
|
2021-12-16 17:19:25 +08:00 |
|
|
zhouxin
|
0683b91b5c
|
Fixed wrong method used.
|
2021-12-16 08:30:49 +00:00 |
|
|
tianshujie
|
d5f1c13624
|
Merge branch 'kanban' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/179_tianshujie_46151
|
2021-12-16 14:50:49 +08:00 |
|
|
李玉春
|
e7305d63d4
|
Merge branch 'devops17_46142' into 'devops17'
* Finish task#46142
See merge request easycorp/zentaopms!970
|
2021-12-16 06:47:10 +00:00 |
|
|
李玉春
|
413865019a
|
Merge branch 'sprint/179_tianshujie_error' into 'kanban'
* Modify the error.
See merge request easycorp/zentaopms!972
|
2021-12-16 06:43:34 +00:00 |
|
|
tianshujie
|
ea92c854d6
|
* Modify the error.
|
2021-12-16 14:41:36 +08:00 |
|
|
tianshujie
|
f58bbf9ad1
|
Merge branch 'kanban' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/179_tianshujie_46151
|
2021-12-16 14:37:41 +08:00 |
|
|
孙广明
|
802e7c8f1a
|
Merge branch 'sprint/177_tianshujie_46148' into kanban
|
2021-12-16 14:36:15 +08:00 |
|
|
songchenxuan
|
c7a49edda8
|
*Finish task #46136.
|
2021-12-16 14:36:01 +08:00 |
|
|
孙广明
|
2d2c70abe4
|
Merge branch 'kanban' into 'sprint/177_tianshujie_46148'
# Conflicts:
# module/kanban/control.php
# module/kanban/model.php
|
2021-12-16 06:28:32 +00:00 |
|
|
tianshujie
|
5444c8f471
|
* Query Kanban data.
|
2021-12-16 14:26:03 +08:00 |
|
|
tianshujie
|
ad9fdd1330
|
Merge branch 'kanban' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/179_tianshujie_46151
|
2021-12-16 14:23:31 +08:00 |
|
|
tianshujie
|
348bede8f0
|
* Modify the code.
|
2021-12-16 14:21:21 +08:00 |
|
|
tianshujie
|
99095f8785
|
* Add a sub-column page.
|
2021-12-16 14:18:57 +08:00 |
|
|
孙广明
|
0ae5f57d7f
|
Merge branch 'sprint/179_liumengyi_addpriv' into kanban
|
2021-12-16 14:14:34 +08:00 |
|
|
孙广明
|
50f207d053
|
Merge branch 'kanban' into 'sprint/179_liumengyi_addpriv'
# Conflicts:
# module/group/lang/resource.php
|
2021-12-16 06:14:24 +00:00 |
|
|
孙广明
|
0ce78c1930
|
Merge branch 'sprint/30_zhouxin_bug_17524' into 'kanban'
Fix bug 17524.
See merge request easycorp/zentaopms!971
|
2021-12-16 05:19:22 +00:00 |
|
|
zhouxin
|
27ee4d87ed
|
Fix bug 17524.
|
2021-12-16 05:15:08 +00:00 |
|
|
caoyanyi
|
d9a5f136b1
|
* Add gitlab tag create function and page.
|
2021-12-16 05:13:43 +00:00 |
|
|
caoyanyi
|
372fa0fa9c
|
* Add test case for gitlab tag create.
|
2021-12-16 05:13:18 +00:00 |
|
|
朱金勇
|
54651928cf
|
Merge branch 'sprint/xuan_sunhao/improve_client_ui' into 'master'
* Task #45453, improve UI for opening in xuan client.
See merge request easycorp/zentaopms!969
|
2021-12-16 05:06:35 +00:00 |
|
|
Hao Sun
|
8bf3c8e6e1
|
* Adjust navbar position in client.
|
2021-12-16 12:02:33 +08:00 |
|
|
Hao Sun
|
348e44a00e
|
* Adjust navbar position in client.
|
2021-12-16 11:41:12 +08:00 |
|
|
Hao Sun
|
42599b5d8a
|
* Fix text color in app header in client.
|
2021-12-16 11:16:53 +08:00 |
|
|
zenggang
|
af434d440a
|
* Finish task#46142
|
2021-12-16 03:12:21 +00:00 |
|
|
xieqiyu
|
b300ca39da
|
* Change branch language for manage.
|
2021-12-16 11:09:02 +08:00 |
|