 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 |
|
|
李玉春
|
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 |
|
|
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 |
|
|
hufangzhou
|
6cee36b588
|
* Get the current account for install or upgrade.
|
2021-12-27 08:59:00 +08:00 |
|
|
孙广明
|
fead61e40a
|
Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug #17939.
See merge request easycorp/zentaopms!1146
|
2021-12-24 09:26:40 +00:00 |
|
|
liumengyi
|
8425897a08
|
* Fix bug #17939.
|
2021-12-24 17:25:16 +08:00 |
|
|
孙广明
|
178e52b999
|
Merge branch 'sprint/179_tianshujie_bug' into 'master'
* Fix kanban column color problem.
See merge request easycorp/zentaopms!1145
|
2021-12-24 09:16:52 +00:00 |
|
|
王怡栋
|
d7a8b42cbd
|
Merge branch 'app_caoyanyi_lang' into 'master'
* Add language to zentao app.
See merge request easycorp/zentaopms!1144
|
2021-12-24 09:15:17 +00:00 |
|
|
Mr曹
|
465fbda7f4
|
* Add language to zentao app.
|
2021-12-24 17:12:19 +08:00 |
|
|
zenggang
|
01bfc4f928
|
* Fix bug#17941
|
2021-12-24 08:24:05 +00:00 |
|
|
tianshujie
|
90e006c45c
|
* Fix kanban column color problem.
|
2021-12-24 16:11:30 +08:00 |
|
|
孙广明
|
7a217f9a8b
|
Merge branch 'sprint/179_tianshujie_bug' into 'master'
* Fix bug #17935.
See merge request easycorp/zentaopms!1142
|
2021-12-24 07:07:03 +00:00 |
|
|
孙广明
|
37f5ef46b1
|
Merge branch 'sprint/178_hufangzhou_newVersion' into 'master'
* Add the new version.
See merge request easycorp/zentaopms!1141
|
2021-12-24 07:06:48 +00:00 |
|
|
hufangzhou
|
dfa1a100ee
|
* Add the fromVersion.
|
2021-12-24 15:06:11 +08:00 |
|
|
hufangzhou
|
4b2890c766
|
* Add the new version.
|
2021-12-24 15:01:04 +08:00 |
|
|
孙广明
|
a5176fd46e
|
Merge branch 'sprint/179_tianshujie_bug' into 'master'
* Change assigned to avatar to show up to 3.
See merge request easycorp/zentaopms!1139
|
2021-12-24 06:58:30 +00:00 |
|
|
孙广明
|
3f3aad524b
|
Merge branch 'sprint/179_liumengyi_modifyStyle' into 'master'
* Modify style for create card.
See merge request easycorp/zentaopms!1138
|
2021-12-24 06:56:31 +00:00 |
|
|
tianshujie
|
547fdbc3d2
|
* Fix bug #17935.
|
2021-12-24 14:23:17 +08:00 |
|
|
朱金勇
|
4afe02de99
|
Merge branch 'sprint/178_xieqiyu_branch' into 'master'
* Fix bug: batch update branch.
See merge request easycorp/zentaopms!1140
|
2021-12-24 05:46:31 +00:00 |
|
|
xieqiyu
|
1491db714d
|
* Fix bug: batch update branch.
|
2021-12-24 13:45:05 +08:00 |
|
|
朱金勇
|
00993b8884
|
Merge branch 'sprint/178_hufangzhou_api' into 'master'
* Add the zentao api lib for upgrade.
See merge request easycorp/zentaopms!1126
|
2021-12-24 05:42:09 +00:00 |
|
|
tianshujie
|
572e386eea
|
* Change assigned to avatar to show up to 3.
|
2021-12-24 13:35:18 +08:00 |
|
|
liumengyi
|
4979f04de9
|
* Modify style for create card.
|
2021-12-24 13:31:12 +08:00 |
|
|
孙广明
|
a28772a3f6
|
Merge branch 'sprint/179_liumengyi_17927' into 'master'
* Fix bug #17927.
See merge request easycorp/zentaopms!1136
|
2021-12-24 05:21:55 +00:00 |
|
|
孙广明
|
6461596898
|
Merge branch 'sprint/179_zhengrunyu_codecard' into 'master'
*change position of icon-required.
See merge request easycorp/zentaopms!1135
|
2021-12-24 05:21:01 +00:00 |
|
|
liumengyi
|
8be143a091
|
* Fix bug #17927.
|
2021-12-24 13:20:15 +08:00 |
|
|
hufangzhou
|
f043a50e5e
|
* Code for task #17919.
|
2021-12-24 13:20:04 +08:00 |
|
|
zhengrunyu
|
e0b585354d
|
*change position of icon-required.
|
2021-12-24 13:18:54 +08:00 |
|