 liyuchun
|
c2da5eefe2
|
Merge branch 'devops18'
|
2021-12-31 10:38:04 +08:00 |
|
|
liyuchun
|
55c7c7e848
|
* Fix bug #18078.
|
2021-12-30 16:13:40 +08:00 |
|
|
liyuchun
|
adac3aefdf
|
* Finish task #46544.
|
2021-12-30 14:19:28 +08:00 |
|
|
zenggang
|
bfde525f13
|
* Finish task#46555
|
2021-12-30 03:08:42 +00:00 |
|
|
liumengyi
|
50efcdf342
|
* Finish task #46661.
|
2021-12-28 15:59:57 +08:00 |
|
|
zenggang
|
7713ab8f29
|
* Finish task#46554
|
2021-12-28 07:00:36 +00:00 |
|
|
hufangzhou
|
8b82566999
|
* Fix bug #17924.
|
2021-12-24 10:53:15 +08:00 |
|
|
liyuchun
|
178a45b6b5
|
Merge branch 'devops17'
|
2021-12-23 15:15:21 +08:00 |
|
|
tianshujie
|
a9c8d74b72
|
* Fix bug #17882.
|
2021-12-23 14:26:46 +08:00 |
|
|
caoyanyi
|
8ebdeefebf
|
* Add auth and language.
|
2021-12-23 05:59:54 +00:00 |
|
|
tianshujie
|
25a2e79f43
|
* Finish task #46242.
|
2021-12-23 09:59:34 +08:00 |
|
|
孙广明
|
75a3d20358
|
Merge branch 'master' into 'sprint/179_tianshujie_46241'
# Conflicts:
# module/group/lang/resource.php
# module/kanban/css/space.css
# module/kanban/js/view.js
|
2021-12-22 06:03:21 +00:00 |
|
|
tianshujie
|
dab44100d5
|
* Finish task #46241.
|
2021-12-22 13:16:32 +08:00 |
|
|
李玉春
|
84f2cfb102
|
Merge branch 'sgm_fixbug' into 'master'
* Finish task #46161.
See merge request easycorp/zentaopms!1059
|
2021-12-22 02:53:35 +00:00 |
|
|
孙广明
|
08c7f0cc50
|
* Finish task #46161.
|
2021-12-22 10:31:43 +08:00 |
|
|
hufangzhou
|
5b0923a7a3
|
* Resolve the issue of merge branch.
|
2021-12-22 10:07:18 +08:00 |
|
|
liyuchun
|
b9a2d19393
|
* Finish task #46140.
|
2021-12-21 16:55:55 +08:00 |
|
|
李玉春
|
30acf3d2a7
|
Merge branch 'devops17' into 'devops17_wangyidong_46002'
# Conflicts:
# db/update16.0.beta1.sql
|
2021-12-21 03:19:16 +00: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 |
|
|
tianshujie
|
442fbdad44
|
* Finish task #46157.
|
2021-12-20 14:42:06 +08:00 |
|
|
王怡栋
|
e18576efe7
|
* adjust for resource.
|
2021-12-20 14:24:47 +08:00 |
|
|
孙广明
|
84fae4bc7d
|
Merge branch 'kanban'
|
2021-12-20 10:59:07 +08:00 |
|
|
zenggang
|
54b9265be1
|
* Finish task#46138
|
2021-12-17 05:58:48 +00:00 |
|
|
孙广明
|
50f207d053
|
Merge branch 'kanban' into 'sprint/179_liumengyi_addpriv'
# Conflicts:
# module/group/lang/resource.php
|
2021-12-16 06:14:24 +00:00 |
|
|
caoyanyi
|
d9a5f136b1
|
* Add gitlab tag create function and page.
|
2021-12-16 05:13:43 +00:00 |
|
|
liumengyi
|
21d7584660
|
* Add card permissions.
|
2021-12-16 10:37:07 +08:00 |
|
|
liumengyi
|
990f1fb88c
|
* Add permission for card.
|
2021-12-16 09:35:50 +08:00 |
|
|
liumengyi
|
7fded68a0d
|
* Fix bug for view card.
|
2021-12-14 13:53:14 +08:00 |
|
|
liumengyi
|
8ad14bea25
|
* Finish task #45820.
|
2021-12-14 10:42:59 +08:00 |
|
|
tianshujie
|
f77e54af6d
|
* Modify Kanban Authority Language Item.
|
2021-12-10 16:14:03 +08:00 |
|
|
liumengyi
|
6f8133482d
|
* Finish task #45830.
|
2021-12-10 14:21:13 +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 |
|
|
李玉春
|
30aa071426
|
Revert "Merge branch 'sprint/devops16_liyuchun_45491' into 'master'"
This reverts merge request !803
|
2021-12-09 10:34:47 +08:00 |
|
|
liyuchun
|
76748224eb
|
* Finish task #45491.
|
2021-12-09 10:34:47 +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 |
|
|
liumengyi
|
7ea719984d
|
* Add kanban space edit function.
|
2021-12-09 08:59:40 +08: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 |
|
|
tianshujie
|
9f2364c021
|
* Modify zone to space.
|
2021-12-07 16:07:50 +08:00 |
|
|
tianshujie
|
b69d36f0d1
|
* Add Kanban first level navigation.
|
2021-12-07 14:59:30 +08: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 |
|