 李玉春
|
ad432a9454
|
Merge branch 'sprint/187_tianshujie_fixbug' into 'master'
* Finish task #50380.
See merge request easycorp/zentaopms!2143
|
2022-03-08 06:38:52 +00:00 |
|
|
tianshujie
|
54ac0f8c8e
|
* Finish task #50380.
|
2022-03-08 13:52:34 +08:00 |
|
|
王怡栋
|
d62013b39f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-08 13:30:35 +08:00 |
|
|
王怡栋
|
1e8e9d5a45
|
* code for kanban menu.
|
2022-03-08 13:28:48 +08:00 |
|
|
孙广明
|
0c7bb72c10
|
Merge branch 'sprint/187_tianshujie_fixbug' into 'master'
* Finish task #50303.
See merge request easycorp/zentaopms!2142
|
2022-03-08 05:22:20 +00:00 |
|
|
zhujinyong
|
ec019ab0ab
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-08 13:16:19 +08:00 |
|
|
zhujinyong
|
89aaefc8c6
|
* Fix upgrade.
|
2022-03-08 13:15:47 +08:00 |
|
|
王怡栋
|
34e744bb23
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-08 13:03:51 +08:00 |
|
|
王怡栋
|
72d89e3c9f
|
* adjust for buildIndex menu.
|
2022-03-08 13:03:34 +08:00 |
|
|
tianshujie
|
03390a6900
|
* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.
|
2022-03-08 13:01:53 +08:00 |
|
|
孙广明
|
e823f2223c
|
Merge branch 'sprint/187_hufangzhou_makefile' into 'master'
* Need not to merge xuanxuan sql.
See merge request easycorp/zentaopms!2141
|
2022-03-08 03:29:19 +00:00 |
|
|
hufangzhou
|
ee52c0370e
|
* Need not to merge xuanxuan sql.
|
2022-03-08 11:28:16 +08:00 |
|
|
孙广明
|
597124d922
|
Merge branch 'sprint/187_tianshujie_fixbug' into 'master'
* Modify the upgrade error report.
See merge request easycorp/zentaopms!2139
|
2022-03-08 03:18:31 +00:00 |
|
|
tianshujie
|
01d35645e6
|
* Modify the upgrade error report.
|
2022-03-08 11:17:10 +08:00 |
|
|
朱金勇
|
ec5dade7d6
|
Merge branch 'sgm_upgrade' into 'master'
* Add from version.
See merge request easycorp/zentaopms!2138
|
2022-03-08 03:15:55 +00:00 |
|
|
孙广明
|
7c33a75b31
|
* Add from version.
|
2022-03-08 11:10:17 +08:00 |
|
|
王怡栋
|
aff63f4ff7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-08 10:54:08 +08:00 |
|
|
王怡栋
|
b960a07ecf
|
* code for task #49352.
|
2022-03-08 10:52:48 +08:00 |
|
|
王怡栋
|
ed5aa3d335
|
Merge branch 'sprint/master_tanghucheng_bug' into 'master'
* Fix bug #50369.
See merge request easycorp/zentaopms!2133
|
2022-03-08 02:26:35 +00:00 |
|
|
tanghucheng
|
b279fbbc3e
|
* Fix bug #50369.
|
2022-03-08 10:19:07 +08:00 |
|
|
孙广明
|
f898e8c305
|
Merge branch 'sprint/187_liumengyi_moveCustomFiles' into 'master'
* Fix bug #50341.
See merge request easycorp/zentaopms!2131
|
2022-03-08 02:09:20 +00:00 |
|
|
朱金勇
|
8206e65301
|
Merge branch 'sgm_upgrade' into 'master'
* Fix upgrade error.
See merge request easycorp/zentaopms!2130
|
2022-03-08 02:09:00 +00:00 |
|
|
liumengyi
|
084d882f9b
|
* Fix bug #50341.
|
2022-03-08 10:07:42 +08:00 |
|
|
孙广明
|
6155c3ed21
|
Merge branch 'sprint/187_tianshujie_fixbug' into 'master'
Sprint/187 tianshujie fixbug
See merge request easycorp/zentaopms!2127
|
2022-03-08 01:58:50 +00:00 |
|
|
tianshujie
|
f42695af2c
|
* Modify the default width of the project name.
|
2022-03-08 09:57:14 +08:00 |
|
|
孙广明
|
6d14f4019a
|
Merge branch 'sprint/187_liumengyi_moveCustomFiles' into 'master'
* Remove custom modules.
See merge request easycorp/zentaopms!2129
|
2022-03-08 01:57:01 +00:00 |
|
|
liumengyi
|
a386589929
|
* Remove custom modules.
|
2022-03-08 09:54:44 +08:00 |
|
|
孙广明
|
f5f1679073
|
* Fix upgrade error.
|
2022-03-08 09:46:29 +08:00 |
|
|
tianshujie
|
19017161b6
|
* Delete useless variables.
|
2022-03-08 09:45:21 +08:00 |
|
|
zhujinyong
|
445bd93d3e
|
* Check version.
|
2022-03-08 09:41:38 +08:00 |
|
|
tianshujie
|
23f8d33293
|
* Add variable judgment.
|
2022-03-08 08:59:15 +08:00 |
|
|
zhujinyong
|
01c96e266c
|
* Format.
|
2022-03-08 08:58:27 +08:00 |
|
|
朱金勇
|
48d94bd7af
|
Merge branch 'sgm_db' into 'master'
* Add pro/biz/max sql to open.
See merge request easycorp/zentaopms!2126
|
2022-03-08 00:58:11 +00:00 |
|
|
孙广明
|
33fc87131e
|
* Add pro/biz/max sql to open.
|
2022-03-08 08:55:16 +08:00 |
|
|
tianshujie
|
c2f14bb9c2
|
* Finish task #50318.
|
2022-03-08 08:53:55 +08:00 |
|
|
孙广明
|
f76d93b889
|
Merge branch 'sprint/187_hufangzhou_20439' into 'master'
* Fix bug #20439.
See merge request easycorp/zentaopms!2125
|
2022-03-08 00:53:24 +00:00 |
|
|
朱金勇
|
610f42ca09
|
Merge branch 'autotest_ly' into 'master'
Add execution model
See merge request easycorp/zentaopms!2090
|
2022-03-08 00:25:42 +00:00 |
|
|
李玉春
|
bb059dfcaf
|
Merge branch 'devops23_20299' into 'master'
bug 20299
See merge request easycorp/zentaopms!2121
|
2022-03-08 00:25:19 +00:00 |
|
|
zhujinyong
|
4451a14e00
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-07 23:04:17 +08:00 |
|
|
zhujinyong
|
43ef4bc43c
|
* Fix upgrade.
|
2022-03-07 23:00:30 +08:00 |
|
|
hufangzhou
|
9482bb429a
|
* Fix bug #20439.
|
2022-03-07 17:53:29 +08:00 |
|
|
hufangzhou
|
24305ecd66
|
* Fix bug #20439.
|
2022-03-07 17:49:16 +08:00 |
|
|
王怡栋
|
4778730e92
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-07 17:27:25 +08:00 |
|
|
王怡栋
|
b936dae827
|
* code for task #50359.
|
2022-03-07 17:26:33 +08:00 |
|
|
王怡栋
|
10f0c44cd4
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug undefine lane
See merge request easycorp/zentaopms!2124
|
2022-03-07 09:20:17 +00:00 |
|
|
Zongjun Lan
|
3f9ca9c4fe
|
* fix bug undefine lane
|
2022-03-07 17:18:31 +08:00 |
|
|
王怡栋
|
eaba6dcc3c
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #20329,20350,20366.
See merge request easycorp/zentaopms!2123
|
2022-03-07 09:09:58 +00:00 |
|
|
孙广明
|
26cdbe280c
|
Merge branch 'sprint/187_hufangzhou_tw' into 'master'
* Adjust the cn2tw file for xuan extension.
See merge request easycorp/zentaopms!2122
|
2022-03-07 08:48:16 +00:00 |
|
|
唐胡成
|
4c7b17eed2
|
Update create.html.php
|
2022-03-07 08:47:46 +00:00 |
|
|
tanghucheng
|
15e6262065
|
* Fix bug #20329,20350,20366.
|
2022-03-07 16:42:58 +08:00 |
|