 liyuchun
|
adac3aefdf
|
* Finish task #46544.
|
2021-12-30 14:19:28 +08:00 |
|
|
liyuchun
|
1f4ee55810
|
* Finish task #46544,46556.
|
2021-12-30 14:05:57 +08:00 |
|
|
李玉春
|
07756750db
|
Merge branch 'devops18_46555' into 'devops18'
* Finish task#46555
See merge request easycorp/zentaopms!1189
|
2021-12-30 05:33:10 +00:00 |
|
|
李玉春
|
430cf30f55
|
Merge branch 'devops18_wangyidong_46553' into 'devops18'
Devops18 wangyidong 46553
See merge request easycorp/zentaopms!1190
|
2021-12-30 05:30:24 +00:00 |
|
|
zenggang
|
3bfc8e04c1
|
* Adjust code
|
2021-12-30 05:24:37 +00:00 |
|
|
王怡栋
|
bb63a8f6ab
|
* adjust code.
|
2021-12-30 11:10:45 +08:00 |
|
|
zenggang
|
bfde525f13
|
* Finish task#46555
|
2021-12-30 03:08:42 +00:00 |
|
|
王怡栋
|
7c5be1093e
|
* adjust code task #46553.
|
2021-12-30 10:38:01 +08:00 |
|
|
王怡栋
|
134cd55f46
|
* adjust for task #46553.
|
2021-12-30 10:31:19 +08:00 |
|
|
王怡栋
|
061bf4388c
|
* adjust for unit test.
|
2021-12-30 10:08:00 +08:00 |
|
|
王怡栋
|
625a6a47c4
|
* code for task #46553.
|
2021-12-30 08:38:54 +08:00 |
|
|
王怡栋
|
6bbb031a07
|
Merge branch 'sprint/liyuchun_devops18' into 'devops18'
* Fix bug #18047.
See merge request easycorp/zentaopms!1177
|
2021-12-29 08:06:48 +00:00 |
|
|
liyuchun
|
4991afb982
|
* Fix bug #18047.
|
2021-12-29 13:45:40 +08:00 |
|
|
李玉春
|
7d8aa9da78
|
Merge branch 'devops18_46549' into 'devops18'
* Finish task#46549
See merge request easycorp/zentaopms!1175
|
2021-12-29 03:19:45 +00:00 |
|
|
王怡栋
|
f03376f79d
|
Merge branch 'sprint/liyuchun_devops18' into 'devops18'
* Fix error when change source project.
See merge request easycorp/zentaopms!1176
|
2021-12-29 03:00:23 +00:00 |
|
|
liyuchun
|
b9c8bd4afd
|
* Fix error when change source project.
|
2021-12-29 10:45:05 +08:00 |
|
|
zenggang
|
8e4cfa8744
|
* Finish task#46549
|
2021-12-29 02:29:19 +00:00 |
|
|
王怡栋
|
3a6e39f834
|
Merge branch 'sprint/liyuchun_devops18' into 'devops18'
* Finish task #46551.
See merge request easycorp/zentaopms!1174
|
2021-12-29 02:25:31 +00:00 |
|
|
liyuchun
|
2b44879ba2
|
* Adjust code style.
|
2021-12-29 10:24:39 +08:00 |
|
|
liyuchun
|
8e98e9831e
|
* Finish task #46551.
|
2021-12-29 10:02:25 +08:00 |
|
|
李玉春
|
4270c776f1
|
Merge branch 'devops18_wangyidong_46552' into 'devops18'
Devops18 wangyidong 46552
See merge request easycorp/zentaopms!1173
|
2021-12-29 01:51:53 +00:00 |
|
|
王怡栋
|
2e7530441b
|
* adjust for task #46552.
|
2021-12-29 09:49:43 +08:00 |
|
|
李玉春
|
08f5b605b6
|
Merge branch 'devops18_liwenrui_repo_rules' into 'devops18'
* tweak repos rules api, send raw rules only.
See merge request easycorp/zentaopms!1169
|
2021-12-29 00:57:57 +00:00 |
|
|
王怡栋
|
0ba53391eb
|
* adjust for error.
|
2021-12-29 08:36:58 +08:00 |
|
|
王怡栋
|
2a4c3cfa0e
|
* code for task #46552.
|
2021-12-28 16:55:35 +08:00 |
|
|
Wenrui LI
|
293c00235e
|
* tweak repos rules api, send raw rules only.
|
2021-12-28 16:22:16 +08:00 |
|
|
李玉春
|
65386f6344
|
Merge branch 'devops18_46547' into 'devops18'
* Finish task#46547
See merge request easycorp/zentaopms!1168
|
2021-12-28 08:21:46 +00:00 |
|
|
zenggang
|
601e4498b0
|
* Finish task#46547
|
2021-12-28 08:10:12 +00:00 |
|
|
李玉春
|
c6609d792e
|
Merge branch 'devops18_46554' into 'devops18'
* Finish task#46554
See merge request easycorp/zentaopms!1166
|
2021-12-28 07:59:06 +00:00 |
|
|
李玉春
|
03c38f01c9
|
Merge branch 'devops17_17941' into 'devops18'
* Fix bug#17941
See merge request easycorp/zentaopms!1143
|
2021-12-28 07:54:01 +00:00 |
|
|
王怡栋
|
c59c408da4
|
Merge branch 'sprint/liyuchun_devops18' into 'devops18'
Sprint/liyuchun devops18
See merge request easycorp/zentaopms!1167
|
2021-12-28 07:49:59 +00:00 |
|
|
liyuchun
|
9da21e20f0
|
* Finish task #46550.
|
2021-12-28 15:45:09 +08:00 |
|
|
王怡栋
|
667cf60e42
|
* code for task #46552.
|
2021-12-28 15:16:08 +08:00 |
|
|
zenggang
|
7713ab8f29
|
* Finish task#46554
|
2021-12-28 07:00:36 +00:00 |
|
|
liyuchun
|
dc46e684fe
|
* Fix bug #18023.
|
2021-12-28 14:10:59 +08:00 |
|
|
王怡栋
|
85ae7e23cb
|
Merge branch 'sprint/178_hufangzhou_xuanxuan' into 'master'
* Fix an error for xuanxuan.
See merge request easycorp/zentaopms!1154
|
2021-12-27 07:51:11 +00:00 |
|
|
hufangzhou
|
e73cd865c1
|
* Fix an error for xuanxuan.
|
2021-12-27 15:49:15 +08:00 |
|
|
孙广明
|
97ed7c1be6
|
Merge branch 'sprint/181_tianshujie_sql' into 'master'
* Add sql file.
See merge request easycorp/zentaopms!1153
|
2021-12-27 07:31:39 +00:00 |
|
|
tianshujie
|
e2dcd9c5a9
|
* Add sql file.
|
2021-12-27 15:23:14 +08:00 |
|
|
孙广明
|
7f6d93632a
|
Merge branch 'Modify_code' into 'master'
* Modify code.
See merge request easycorp/zentaopms!1152
|
2021-12-27 05:23:27 +00:00 |
|
|
mayue
|
697b2fd318
|
* Modify code.
|
2021-12-27 13:20:57 +08:00 |
|
|
孙广明
|
0cd459d5b8
|
Merge branch 'sprint/179_sunhao/kanban_dropmenu' into 'master'
* Fix kanban dropmenu not work as expected.
See merge request easycorp/zentaopms!1151
|
2021-12-27 05:04:40 +00:00 |
|
|
Hao Sun
|
9e96f6a49e
|
* Fix kanban dropmenu not work as expected.
|
2021-12-27 11:54:33 +08:00 |
|
|
朱金勇
|
8ce5511ecb
|
Merge branch 'sprint/179_sunhao/contextmenu' into 'master'
* Fix contextmenu not work in dropdown mode.
See merge request easycorp/zentaopms!1149
|
2021-12-27 03:38:20 +00:00 |
|
|
朱金勇
|
7d1535f5a6
|
Merge branch 'sprint/178_hufangzhou_api' into 'master'
* Adjust the params of createDemoData when manual import.
See merge request easycorp/zentaopms!1150
|
2021-12-27 03:37:54 +00:00 |
|
|
hufangzhou
|
b7ca55d9ca
|
* Adjust the params of createDemoData when manual import.
|
2021-12-27 11:36:46 +08:00 |
|
|
Hao Sun
|
6e77c55a8f
|
* Fix contextmenu not work in dropdown mode.
|
2021-12-27 11:32:46 +08:00 |
|
|
孙广明
|
2529f1b487
|
Merge branch 'sprint/178_hufangzhou_upgrade' into 'master'
* Adjust the sql file name in upgrade.
See merge request easycorp/zentaopms!1148
|
2021-12-27 01:24:45 +00:00 |
|
|
hufangzhou
|
488297dcaf
|
* Adjust the sql file name in upgrade.
|
2021-12-27 09:23:49 +08:00 |
|
|
孙广明
|
be9508d0c8
|
Merge branch 'sprint/178_hufangzhou_user' into 'master'
* Get the current account for install or upgrade.
See merge request easycorp/zentaopms!1147
|
2021-12-27 01:07:33 +00:00 |
|