 wangyuting2
|
e5976d126c
|
* Optimize lang file.
|
2022-09-22 02:42:36 +00:00 |
|
|
王怡栋
|
e5cad7fd7a
|
Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
* fix bug #27684#27607
See merge request easycorp/zentaopms!5460
|
2022-09-21 09:14:08 +00:00 |
|
|
lanzongjun
|
222a65223f
|
* fix meeting
|
2022-09-21 16:30:05 +08:00 |
|
|
wangyuting2
|
75771bafd2
|
* Fix bug #27656.
|
2022-09-21 05:50:44 +00:00 |
|
|
lanzongjun
|
7bc2071cc7
|
Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240_lanzongjun
|
2022-09-21 08:40:34 +08:00 |
|
|
lanzongjun
|
7fd743aef6
|
* fix upgrade selectmode
|
2022-09-21 08:39:35 +08:00 |
|
|
王怡栋
|
47d0b6e08a
|
Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
* finish task #69706
See merge request easycorp/zentaopms!5429
|
2022-09-20 08:34:01 +00:00 |
|
|
lanzongjun
|
701e75324b
|
Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240_lanzongjun
|
2022-09-20 15:39:47 +08:00 |
|
|
lanzongjun
|
d3cec62717
|
* finish task #69706
|
2022-09-20 15:38:00 +08:00 |
|
|
wangyuting2
|
f546d9a1a6
|
* Fix back button bug.
|
2022-09-20 07:30:13 +00:00 |
|
|
wangyuting2
|
4134b15aa5
|
* Optimize mergeprogram css.
|
2022-09-20 06:53:18 +00:00 |
|
|
wangyuting2
|
fbde75c48b
|
* Fix default program bug.
|
2022-09-20 00:28:31 +00:00 |
|
|
王怡栋
|
92ae907e16
|
Merge branch 'sprint/zentaopms240_wangyuting' into 'sprint/zentaopms240'
* Optimize code.
See merge request easycorp/zentaopms!5394
|
2022-09-19 06:15:08 +00:00 |
|
|
wangyuting2
|
12c566a9ab
|
* Optimize code.
|
2022-09-19 05:42:06 +00:00 |
|
|
王怡栋
|
4aafe0c67d
|
Merge branch 'sprint/zentaopms240_processconflict' into 'sprint/zentaopms240'
* Process conflict.
See merge request easycorp/zentaopms!5382
|
2022-09-19 05:34:15 +00:00 |
|
|
lanzongjun
|
bd59282401
|
modify upgrade
|
2022-09-19 13:13:12 +08:00 |
|
|
daitingting
|
86c7dc5061
|
* Process conflict.
* Call classic2Lean function when upgrade from classic of 15.
|
2022-09-16 09:01:08 +00:00 |
|
|
wangyidong
|
6b541a7c60
|
Merge branch 'sprint/zentaopms240_lanzongjun' into sprint/zentaopms240
|
2022-09-16 16:26:29 +08:00 |
|
|
lanzongjun
|
f8691316b0
|
* task #69250#69251
|
2022-09-16 15:31:44 +08:00 |
|
|
lanzongjun
|
49faebaad7
|
* task #69250#69251
|
2022-09-16 14:58:39 +08:00 |
|
|
lanzongjun
|
b0c3bccc9d
|
* task #69250
|
2022-09-16 11:07:26 +08:00 |
|
|
wangyuting2
|
3d54c6ea82
|
* Finish task #69256.
|
2022-09-16 01:25:47 +00:00 |
|
|
wangyuting2
|
74a5adef7d
|
* Optimize code.
|
2022-09-15 03:22:36 +00:00 |
|
|
wangyuting2
|
392aa32c00
|
* Add selectmergemode page.
|
2022-09-15 03:11:09 +00:00 |
|
|
tianshujie
|
324ec42a34
|
* Fix bug #25911.
|
2022-08-02 09:20:08 +08:00 |
|
|
tianshujie
|
8f62881ec6
|
* Fix the problem of no project executing after data merging.
|
2022-08-01 17:22:54 +08:00 |
|
|
孙广明
|
b896377846
|
* Change zentao license.
|
2022-06-08 10:02:29 +08:00 |
|
|
孙广明
|
b528156589
|
* Change license.
|
2022-06-08 09:34:46 +08:00 |
|
|
宋辰轩
|
53c84c3480
|
* Delete /tmp/patch and patch actions after upgrade.
|
2022-05-26 17:10:33 +08:00 |
|
|
tianshujie
|
f652d15c2f
|
* Fix bug #22693.
|
2022-05-19 17:39:04 +08:00 |
|
|
wangyidong
|
c04ec4db8f
|
* fix for merge program when upgrade.
|
2022-05-12 13:46:57 +08:00 |
|
|
孙广明
|
3a7a46e836
|
Merge branch 'liyuchun_fixbug_15975' into 'master'
* Fix bug #15975.
See merge request easycorp/zentaopms!3126
|
2022-04-26 07:49:34 +00:00 |
|
|
liyuchun
|
e8b57c9889
|
* Fix bug #17230.
|
2022-04-26 06:28:57 +00:00 |
|
|
wangyidong
|
668637fc18
|
* adjust for web page.
|
2022-04-25 15:20:05 +08:00 |
|
|
王怡栋
|
d78a7aeb2a
|
Merge branch '165_package'
|
2022-04-08 13:55:52 +08:00 |
|
|
tanghucheng
|
6f8d2334fd
|
* Fix upgrade vision for litevip.
|
2022-04-07 14:12:57 +08:00 |
|
|
孙广明
|
9065d0527e
|
* Add upgrade logic.
|
2022-04-07 11:29:49 +08:00 |
|
|
tianshujie
|
b2e99c8dd4
|
* Modify the jump link mode.
|
2022-04-02 10:37:43 +08:00 |
|
|
王怡栋
|
e051df4562
|
* fix for merge program.
|
2022-03-29 11:01:22 +08:00 |
|
|
王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
|
tianshujie
|
13102d5b80
|
* Modify the code logic.
|
2022-03-18 09:35:28 +08:00 |
|
|
tianshujie
|
aadec120db
|
* Delete encrypt module folder when upgrading.
|
2022-03-17 17:01:40 +08:00 |
|
|
sgm0422
|
ca5624db56
|
* Fix upgrade error.
|
2022-03-10 14:16:48 +08:00 |
|
|
tianshujie
|
2ef598afcc
|
* Fix the problem of white screen after upgrade.
|
2022-03-02 09:35:34 +08:00 |
|
|
tianshujie
|
35dc1de44d
|
* Fix code review issues.
|
2022-03-01 09:35:52 +08:00 |
|
|
孙广明
|
6b1c882cac
|
* Fix upgrade lang.
|
2022-02-28 10:16:30 +08:00 |
|
|
tianshujie
|
941bba2658
|
* Modify the repeated upgrade problem.
|
2022-02-28 09:51:53 +08:00 |
|
|
tianshujie
|
e1e2686493
|
* Modify the issue of feature review.
|
2022-02-23 16:56:22 +08:00 |
|
|
孙广明
|
7be1378030
|
Merge branch 'sprint/186/tianshujie_upgrade' into 'sprint/185'
Sprint/186/tianshujie upgrade
See merge request easycorp/zentaopms!1912
|
2022-02-23 06:17:37 +00:00 |
|
|
tianshujie
|
2d1c81a4fe
|
* Modify the code format.
|
2022-02-23 13:42:54 +08:00 |
|