 hufangzhou
|
30d2fb6cfa
|
* Fix bug #18014.
|
2021-12-28 10:19:20 +08:00 |
|
|
朱金勇
|
aa5fabe52c
|
Merge branch 'liwenrui_fix_xuan_webview_width' into 'master'
* fix webview window width in zentaoclient.
See merge request easycorp/zentaopms!1160
|
2021-12-28 01:31:31 +00:00 |
|
|
Wenrui LI
|
6c152d01f9
|
* fix webview window width in zentaoclient.
|
2021-12-28 09:11:02 +08:00 |
|
|
zhujinyong
|
ded29fd6b8
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-28 08:20:21 +08:00 |
|
|
zhujinyong
|
a0797b61db
|
* Fix bug: remove $this.
|
2021-12-28 08:19:59 +08:00 |
|
|
孙广明
|
2ebe537d7a
|
Merge branch 'sprint/178_hufangzhou_branch' into 'master'
* Fix bug #17999.
See merge request easycorp/zentaopms!1159
|
2021-12-27 10:08:53 +00:00 |
|
|
hufangzhou
|
44783c6933
|
* Fix bug #17999.
|
2021-12-27 18:08:09 +08:00 |
|
|
李玉春
|
1d43e4d994
|
Merge branch 'revert-0d73915c' into 'master'
Revert "Merge branch 'sprint/181_liumengyi_29103' into 'master'"
See merge request easycorp/zentaopms!1158
|
2021-12-27 09:26:30 +00:00 |
|
|
李玉春
|
dcf8be9a81
|
Merge branch 'revert-97ed7c1b' into 'master'
Revert "Merge branch 'sprint/181_tianshujie_sql' into 'master'"
See merge request easycorp/zentaopms!1157
|
2021-12-27 09:26:17 +00:00 |
|
|
孙广明
|
d1f8a778c0
|
Revert "Merge branch 'sprint/181_liumengyi_29103' into 'master'"
This reverts merge request !1155
|
2021-12-27 09:25:34 +00:00 |
|
|
孙广明
|
906641d301
|
Revert "Merge branch 'sprint/181_tianshujie_sql' into 'master'"
This reverts merge request !1153
|
2021-12-27 09:25:00 +00:00 |
|
|
孙广明
|
0d73915c49
|
Merge branch 'sprint/181_liumengyi_29103' into 'master'
* Finish task#46655.
See merge request easycorp/zentaopms!1155
|
2021-12-27 09:19:24 +00:00 |
|
|
liumengyi
|
a7e1623064
|
* Finish task#46655.
|
2021-12-27 15:53:34 +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 |
|
|
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 |
|