Commit Graph

64 Commits

Author SHA1 Message Date
daitingting
8650982994 * Fix issues of function review. 2022-11-25 05:50:02 +00:00
daitingting
7f19feff3a * Finish task #77137. 2022-11-23 01:43:12 +00:00
wangyuting
17602d5113 * Fix bug #29924. 2022-11-17 02:38:27 +00:00
daitingting
cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
王怡栋
444834b316 Merge branch 'sprint/zentaopms240' into 'sprint/zentaopms240_lanzongjun'
# Conflicts:
#   module/custom/js/mode.js
#   module/custom/lang/de.php
#   module/custom/lang/en.php
#   module/custom/lang/fr.php
#   module/custom/lang/zh-cn.php
#   module/custom/view/mode.html.php
#   module/project/control.php
#   module/project/lang/zh-cn.php
2022-09-27 00:28:36 +00:00
wangyuting2
129bec2618 * Finish task #70192. 2022-09-26 06:44:02 +00:00
wangyuting2
f1d51e5a0d * Finish task #70191. 2022-09-26 06:02:47 +00:00
lanzongjun
905a71ddf7 * fix bug meeting 2022-09-23 17:25:45 +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
d3cec62717 * finish task #69706 2022-09-20 15:38:00 +08:00
wangyuting2
4134b15aa5 * Optimize mergeprogram css. 2022-09-20 06:53:18 +00:00
wangyuting2
6d68de7b11 * Adjust css. 2022-09-19 05:56:23 +00:00
wangyidong
6b541a7c60 Merge branch 'sprint/zentaopms240_lanzongjun' into sprint/zentaopms240 2022-09-16 16:26:29 +08:00
lanzongjun
b0c3bccc9d * task #69250 2022-09-16 11:07:26 +08:00
lanzongjun
78107e92dc * task #69250 2022-09-15 17:31:47 +08:00
wangyuting2
392aa32c00 * Add selectmergemode page. 2022-09-15 03:11:09 +00:00
wangyidong
cab10571b3 * adjust for after exec page. 2022-08-15 15:11:06 +08:00
zenggang
1d9f6dd503 * Adjust code 2022-03-23 08:27:30 +00:00
zenggang
1357480ac6 * Finish task#51109,51108,51128 2022-03-23 07:54:03 +00:00
caoyanyi
a0548058e5 * Fix bug #12206. 2022-03-17 10:52:40 +08:00
tianshujie
e1e2686493 * Modify the issue of feature review. 2022-02-23 16:56:22 +08:00
tianshujie
85982b6cf0 * Modify the style of the migration files page. 2022-02-23 13:21:37 +08:00
tianshujie
339f282210 * Added confirmation to view files page. 2022-02-23 11:07:21 +08:00
tianshujie
9e85e74822 * Finish task #49459. 2022-02-21 17:22:34 +08:00
hufangzhou
0105b70258 * Finish task #48000. 2022-01-25 08:19:04 +08:00
hufangzhou
bf119b5cb8 * Hide the other products. 2022-01-14 14:48:24 +08:00
xieqiyu
8f05f4c257 * Modify upgrade tips style. 2022-01-05 13:04:57 +08:00
孙广明
fe3e96de2d * Fix bug #17051. 2021-12-03 09:46:58 +08:00
hufangzhou
21faa0dc2a * Finish task #44361. 2021-11-18 11:30:28 +08:00
hufangzhou
0d39951950 * Code for task #44361. 2021-11-17 16:14:53 +08:00
tianshujie98
a075fd552e * Finish task #41726. 2021-08-23 15:24:07 +08:00
tianshujie98
c9c8e494d0 * Ajust code. 2021-07-19 16:30:48 +08:00
tianshujie98
8409cb5b54 * Adjust style. 2021-07-16 16:08:16 +08:00
tianshujie98
574ecd7bd3 * Fix the issue #173. 2021-07-16 14:12:08 +08:00
tianshujie98
6977cf91ed * Add select all. 2021-07-13 13:38:14 +08:00
tianshujie98
309f6047ee * Fix logic problems. 2021-07-13 10:11:34 +08:00
tianshujie98
bad9c9e042 * Finish task #40016,40017. 2021-07-12 14:52:46 +08:00
tianshujie98
55130c2ee9 * Finish task #40003. 2021-07-10 10:12:49 +08:00
zhujinyong
f54307a4cc * Fix code style. 2021-03-10 23:07:20 +08:00
Yagami
aeee54b1f3 * Add upgrade repo logic. 2021-01-08 13:31:05 +08:00
Yagami
efeea142bc * Add video. 2020-11-03 13:33:30 +08:00
Catouse
6c4885cd24 * task #8164, improve UI of upgrade/mergeprogram view. 2020-10-30 11:08:18 +08:00
Yagami
d1f2919365 * Fix details. 2020-10-30 10:30:38 +08:00
Yagami
27986da851 * Code for task #8164. 2020-10-26 16:36:32 +08:00
Yagami
5082e5a913 * Add upgrade view. 2020-10-26 16:36:32 +08:00
Yagami
b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
Yagami
0ee24ac23c * Hidden product. 2020-08-03 13:42:48 +08:00
z
79db80e3b4 * adjust for merge program style. 2020-06-16 10:39:01 +08:00
z
70ed978c2d * adjust for merge program. 2020-06-15 16:24:00 +08:00
z
1f42d3867d * set program team. 2020-06-12 16:40:26 +08:00