 wangyuting2
|
55098e290a
|
* Finish task #69258.
|
2022-09-20 07:26:13 +00:00 |
|
|
王 于听
|
a17b1a8f10
|
Merge branch 'sprint/zentaopms240_wangyuting' into 'sprint/zentaopms240'
* Optimize mergeprogram css.
See merge request easycorp/zentaopms!5426
|
2022-09-20 06:57:20 +00:00 |
|
|
wangyuting2
|
cea05451b1
|
* Add lang.
|
2022-09-20 06:56:09 +00:00 |
|
|
wangyuting2
|
4134b15aa5
|
* Optimize mergeprogram css.
|
2022-09-20 06:53:18 +00:00 |
|
|
王怡栋
|
e25aef80ff
|
Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
* finish task #69700#69702
See merge request easycorp/zentaopms!5420
|
2022-09-20 05:25:27 +00:00 |
|
|
lanzongjun
|
429a08cb1a
|
* finish task #69700
|
2022-09-20 10:11:02 +08:00 |
|
|
王怡栋
|
6fa5f93776
|
Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
modify install view and finish task #69698#69703#69704#69705#69701
See merge request easycorp/zentaopms!5416
|
2022-09-20 01:15:51 +00:00 |
|
|
lanzongjun
|
6cd72e94ac
|
* finish task #69701
|
2022-09-20 09:11:56 +08:00 |
|
|
lanzongjun
|
305e8cd794
|
* finish task #69698#69703#69704#69705
|
2022-09-20 08:58:41 +08:00 |
|
|
lanzongjun
|
c78b1b57af
|
modify install view
|
2022-09-20 08:47:58 +08:00 |
|
|
lanzongjun
|
a626cb6f98
|
Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240_lanzongjun
|
2022-09-20 08:42:03 +08:00 |
|
|
王 于听
|
eb0e76c8db
|
Merge branch 'sprint/zentaopms240_wangyuting_fixbug' into 'sprint/zentaopms240'
* Fix default program bug.
See merge request easycorp/zentaopms!5415
|
2022-09-20 00:34:36 +00:00 |
|
|
wangyuting2
|
fbde75c48b
|
* Fix default program bug.
|
2022-09-20 00:28:31 +00:00 |
|
|
王怡栋
|
2bd35ee543
|
Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
Sprint/zentaopms240 lanzongjun
See merge request easycorp/zentaopms!5408
|
2022-09-19 08:45:09 +00:00 |
|
|
lanzongjun
|
5a61af92e8
|
Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240_lanzongjun
|
2022-09-19 16:19:15 +08:00 |
|
|
lanzongjun
|
9960576e69
|
modify mode width
|
2022-09-19 16:18:38 +08:00 |
|
|
lanzongjun
|
7711ea0abf
|
modify upgrade install
|
2022-09-19 15:47:11 +08:00 |
|
|
lanzongjun
|
877e156ea1
|
modify upgrade install
|
2022-09-19 15:46:02 +08:00 |
|
|
lanzongjun
|
0f3c05a720
|
Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240_lanzongjun
|
2022-09-19 15:34:44 +08:00 |
|
|
lanzongjun
|
592cf557a9
|
modify upgrade install
|
2022-09-19 15:29:21 +08:00 |
|
|
lanzongjun
|
e9d4597d74
|
modify upgrade install
|
2022-09-19 15:28:43 +08:00 |
|
|
王怡栋
|
75ce6bdf2f
|
Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
* finish task #69255
See merge request easycorp/zentaopms!5401
|
2022-09-19 07:25:41 +00:00 |
|
|
lanzongjun
|
d980ef31ba
|
modify upgrade install
|
2022-09-19 15:25:06 +08:00 |
|
|
lanzongjun
|
07ad0b92f6
|
modify upgrade install
|
2022-09-19 15:21:43 +08:00 |
|
|
lanzongjun
|
322ac53e2b
|
resolve conflict
|
2022-09-19 14:55:20 +08:00 |
|
|
lanzongjun
|
8f92f57390
|
* finish task #69255
|
2022-09-19 14:52:21 +08:00 |
|
|
王怡栋
|
781fb37d7b
|
Merge branch 'sprint/zentaopms240_fixbug' into 'sprint/zentaopms240'
* Adjust css.
See merge request easycorp/zentaopms!5395
|
2022-09-19 06:15:34 +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
|
6d68de7b11
|
* Adjust css.
|
2022-09-19 05:56:23 +00:00 |
|
|
wangyuting2
|
12c566a9ab
|
* Optimize code.
|
2022-09-19 05:42:06 +00:00 |
|
|
wangyidong
|
927db9d77c
|
Merge branch 'sprint/daitingting_task_69245' into sprint/zentaopms240
|
2022-09-19 13:36:12 +08:00 |
|
|
王怡栋
|
b26b951972
|
Merge branch 'sprint/zentaopms240' into 'sprint/daitingting_task_69245'
# Conflicts:
# module/custom/view/mode.html.php
|
2022-09-19 05:35:56 +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 |
|
|
王怡栋
|
94805ca5d1
|
Merge branch 'sprint/zentaopms240_daitingting_optimize' into 'sprint/zentaopms240'
* Add noExecution field in project table.
See merge request easycorp/zentaopms!5379
|
2022-09-19 05:33:51 +00:00 |
|
|
lanzongjun
|
4d0ce9f58c
|
Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240
|
2022-09-19 13:31:09 +08:00 |
|
|
lanzongjun
|
c86e0a8914
|
modify lang
|
2022-09-19 13:31:01 +08:00 |
|
|
lanzongjun
|
7ff2af63ff
|
modify lang
|
2022-09-19 13:30:23 +08:00 |
|
|
兰宗俊
|
74c149a50d
|
Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
Sprint/zentaopms240 lanzongjun
See merge request easycorp/zentaopms!5391
|
2022-09-19 05:16:34 +00:00 |
|
|
lanzongjun
|
bd59282401
|
modify upgrade
|
2022-09-19 13:13:12 +08:00 |
|
|
wangyidong
|
154023878a
|
* code for task #69248.
|
2022-09-19 11:29:40 +08:00 |
|
|
wangyidong
|
ed71a58df4
|
* code for task #69248.
|
2022-09-19 11:21:43 +08:00 |
|
|
lanzongjun
|
c86e8179fd
|
Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240_lanzongjun
|
2022-09-19 08:48:37 +08:00 |
|
|
lanzongjun
|
ffa25acdbe
|
modify custom
|
2022-09-19 08:40:27 +08:00 |
|
|
daitingting
|
bb5c0540cc
|
* Use fixer to get mode.
|
2022-09-16 09:15:47 +00:00 |
|
|
daitingting
|
ecef99b54a
|
* Rmove useless code.
|
2022-09-16 09:12:20 +00:00 |
|
|
daitingting
|
c2de68159e
|
* Remove repeat codes.
|
2022-09-16 09:05:54 +00:00 |
|
|
daitingting
|
86c7dc5061
|
* Process conflict.
* Call classic2Lean function when upgrade from classic of 15.
|
2022-09-16 09:01:08 +00:00 |
|
|
wangyidong
|
78d1de70c2
|
* code for task #69248.
|
2022-09-16 16:28:50 +08: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 |
|