 zhengrunyu
|
6a3c77e451
|
*Fix bug.
|
2021-12-20 15:44:44 +08:00 |
|
|
zhengrunyu
|
92a7b2a6cc
|
*Fix bug.
|
2021-12-20 15:43:04 +08:00 |
|
|
孙广明
|
3db6c1bf1e
|
* Code for trashes.
|
2021-12-20 15:40:02 +08:00 |
|
|
孙广明
|
428ba360dd
|
* Fix kanban css.
|
2021-12-20 15:40:02 +08:00 |
|
|
liumengyi
|
1244776f69
|
* Add function comments.
|
2021-12-20 15:40:02 +08:00 |
|
|
liumengyi
|
96971d9029
|
* Finish task #46155.
|
2021-12-20 15:40:02 +08:00 |
|
|
tanghucheng
|
c221abf485
|
* Fix bug #17690,17688.
|
2021-12-20 15:40:02 +08:00 |
|
|
tanghucheng
|
418bf9d1f5
|
* Fix css for .open dropdown-toggle.btn.
|
2021-12-20 15:40:02 +08:00 |
|
|
liyuchun
|
6296ed2139
|
Merge branch 'devops17_46138' into devops17
|
2021-12-20 15:36:19 +08:00 |
|
|
liyuchun
|
4f896cf87e
|
* Code for task #46001.
|
2021-12-20 15:35:31 +08:00 |
|
|
李玉春
|
c623ca78ac
|
Merge branch 'devops17' into 'devops17_46138'
# Conflicts:
# module/gitlab/lang/en.php
# module/gitlab/lang/zh-cn.php
# module/group/lang/resource.php
|
2021-12-20 07:34:35 +00:00 |
|
|
mayue
|
a978eff5f0
|
* Fix bug #16292.
|
2021-12-20 15:32:36 +08:00 |
|
|
zenggang
|
586fbf06fc
|
* Adjust code
|
2021-12-20 07:30:21 +00:00 |
|
|
李玉春
|
ac49c3f367
|
Merge branch 'sgm_projectpriv' into 'master'
Sgm projectpriv
See merge request easycorp/zentaopms!1002
|
2021-12-20 07:09:59 +00:00 |
|
|
王怡栋
|
e66ab3ccbd
|
* adjust for API.
|
2021-12-20 15:04:53 +08:00 |
|
|
tianshujie
|
0cceea2b86
|
* Add translation judgment.
|
2021-12-20 14:59:05 +08:00 |
|
|
孙广明
|
88dca1f12a
|
Merge branch 'sprint/179_liumengyi_46155' into 'master'
* Finish task #46155.
See merge request easycorp/zentaopms!1004
|
2021-12-20 06:47:56 +00:00 |
|
|
tianshujie
|
442fbdad44
|
* Finish task #46157.
|
2021-12-20 14:42:06 +08:00 |
|
|
王怡栋
|
dcbe1dd7e4
|
Merge branch 'devops17_caoyanyi_tag' into 'devops17'
Devops17 caoyanyi tag
See merge request easycorp/zentaopms!1005
|
2021-12-20 06:35:45 +00:00 |
|
|
liumengyi
|
14c584555e
|
* Add function comments.
|
2021-12-20 14:35:36 +08:00 |
|
|
liumengyi
|
6fadc5c013
|
* Finish task #46155.
|
2021-12-20 14:29:55 +08:00 |
|
|
孙广明
|
a24a6918e1
|
* Fix kanban style.
|
2021-12-20 14:27:07 +08:00 |
|
|
王怡栋
|
e18576efe7
|
* adjust for resource.
|
2021-12-20 14:24:47 +08:00 |
|
|
songchenxuan
|
70612e93aa
|
*Fix bug #17563.
|
2021-12-20 13:55:22 +08:00 |
|
|
孙广明
|
347f0acdf0
|
Merge branch 'sprint/master_tanghucheng_46181' into 'master'
* Fix bug #17690,17688.
See merge request easycorp/zentaopms!1003
|
2021-12-20 05:53:40 +00:00 |
|
|
tanghucheng
|
6fac380f11
|
* Fix bug #17690,17688.
|
2021-12-20 13:51:29 +08:00 |
|
|
songchenxuan
|
1bbb985b3e
|
*Finish task #46095.
|
2021-12-20 13:44:41 +08:00 |
|
|
tanghucheng
|
5e713ddb07
|
* Fix css for .open dropdown-toggle.btn.
|
2021-12-20 13:42:08 +08:00 |
|
|
孙广明
|
81378356b6
|
* Code for project priv.
|
2021-12-20 11:30:37 +08:00 |
|
|
孙广明
|
2df43b48b8
|
* Fix project priv bug.
|
2021-12-20 11:23:33 +08:00 |
|
|
孙广明
|
84fae4bc7d
|
Merge branch 'kanban'
|
2021-12-20 10:59:07 +08:00 |
|
|
孙广明
|
2fa7acc4d6
|
Merge branch 'sprint/master_tanghucheng_46181' into 'master'
* Finish task #46181.
See merge request easycorp/zentaopms!1000
|
2021-12-20 02:42:18 +00:00 |
|
|
孙广明
|
177c9b158f
|
Merge branch 'sprint/179_tianshujie_46151' into 'kanban'
Sprint/179 tianshujie 46151
See merge request easycorp/zentaopms!991
|
2021-12-20 02:41:05 +00:00 |
|
|
tanghucheng
|
ae9ddf75fe
|
* Finish task #46181.
|
2021-12-20 10:30:30 +08:00 |
|
|
孙广明
|
ab43352a90
|
Merge branch 'sprint/179_zhengrunyu_46159' into 'kanban'
Sprint/179 zhengrunyu 46159
See merge request easycorp/zentaopms!987
|
2021-12-20 01:35:14 +00:00 |
|
|
zhengrunyu
|
08b8e71727
|
*Finish
|
2021-12-20 09:32:34 +08:00 |
|
|
Hao Sun
|
a32c3472a6
|
* Update zui: contextmenu supports submenus.
|
2021-12-20 09:32:34 +08:00 |
|
|
孙广明
|
bc3644053f
|
* Fix js error.
|
2021-12-20 09:32:34 +08:00 |
|
|
孙广明
|
1e13398592
|
* Fix kanban js.
|
2021-12-20 09:32:34 +08:00 |
|
|
孙广明
|
cc7c03b834
|
* Fix code details.
|
2021-12-20 09:32:34 +08:00 |
|
|
孙广明
|
7fb096c451
|
* Finish task #46164.
|
2021-12-20 09:32:34 +08:00 |
|
|
zhouxin
|
39ac40e170
|
Fix bug.
|
2021-12-20 09:32:34 +08:00 |
|
|
zhouxin
|
88b80e2716
|
Finish task #46230,46228,46227.
|
2021-12-20 09:32:34 +08:00 |
|
|
孙广明
|
58a2a8f1d0
|
Merge branch 'sprint/179_liumengyi_46158' into kanban
|
2021-12-20 09:24:40 +08:00 |
|
|
zhujinyong
|
40e6051daa
|
- Remove die() of admin module.
|
2021-12-20 09:15:34 +08:00 |
|
|
zhujinyong
|
90d2447cae
|
- Remove die() of admin module.
|
2021-12-20 09:13:32 +08:00 |
|
|
zhengrunyu
|
a31325053d
|
*Finish task*Finish task*Finish task*Finish task*Finish task*Finish task*Finish task*Finish task
|
2021-12-20 09:10:14 +08:00 |
|
|
zhujinyong
|
72b41be5b0
|
- Remove die() of action module.
|
2021-12-20 09:05:16 +08:00 |
|
|
孙广明
|
1c61b2a759
|
Merge branch 'kanban' into 'sprint/179_liumengyi_46158'
# Conflicts:
# module/kanban/js/view.js
|
2021-12-20 00:53:10 +00:00 |
|
|
朱金勇
|
cf477770fe
|
Merge branch 'sprint/zui_sunhao' into 'master'
* Add and update icons.
See merge request easycorp/zentaopms!996
|
2021-12-20 00:52:21 +00:00 |
|