 wangyidong
|
e21ba0f6ca
|
* finish task #70326.
|
2022-09-27 16:01:18 +08:00 |
|
|
wangyidong
|
4f822a5bd5
|
* code task #70322.
|
2022-09-27 15:42:53 +08:00 |
|
|
王 于听
|
8e2bc44d73
|
Merge branch 'sprint/zentaopms240_wangyuting' into 'sprint/zentaopms240'
* Add disabledFeatures config.
See merge request easycorp/zentaopms!5574
|
2022-09-27 07:39:43 +00:00 |
|
|
wangyuting2
|
ef6a569f2e
|
* Add disabledFeatures config.
|
2022-09-27 07:38:49 +00:00 |
|
|
王怡栋
|
c22f481780
|
Merge branch 'sprint/zentaopms240_task#70570' into 'sprint/zentaopms240'
* Disable features during upgrade and installation.
See merge request easycorp/zentaopms!5572
|
2022-09-27 07:32:49 +00:00 |
|
|
王怡栋
|
00fe16ac60
|
Merge branch 'sprint/zentaopms240_wangyuting' into 'sprint/zentaopms240'
* Hide lean mode features.
See merge request easycorp/zentaopms!5569
|
2022-09-27 07:32:26 +00:00 |
|
|
wangyidong
|
fd623cb0c4
|
* adjust for code ajax send.
|
2022-09-27 15:18:51 +08:00 |
|
|
wangyuting2
|
23abb36523
|
* Disable features during upgrade and installation.
|
2022-09-27 06:29:55 +00:00 |
|
|
wangyidong
|
2d42ff9e55
|
* code for task #70197.
|
2022-09-27 14:25:44 +08:00 |
|
|
wangyuting2
|
ffc90c7d58
|
* Hide lean mode features.
|
2022-09-27 06:07:49 +00:00 |
|
|
王怡栋
|
99f910d366
|
Merge branch 'sprint/zentaopms240_task_70572' into 'sprint/zentaopms240'
* Finish task 70572.
See merge request easycorp/zentaopms!5566
|
2022-09-27 05:35:18 +00:00 |
|
|
daitingting
|
dc8b4f4ccd
|
* Optimize codes.
|
2022-09-27 05:19:40 +00:00 |
|
|
daitingting
|
799ec7aeeb
|
* Finish task 70572.
|
2022-09-27 03:19:27 +00:00 |
|
|
王怡栋
|
2d868419b2
|
Merge branch 'sprint/zentaopms240_task#70850' into 'sprint/zentaopms240'
* Do task #70850.
See merge request easycorp/zentaopms!5561
|
2022-09-27 03:11:25 +00:00 |
|
|
wangyuting2
|
3874a3e22b
|
* Do task #70850.
|
2022-09-27 03:07:47 +00:00 |
|
|
王怡栋
|
bdcce4f487
|
Merge branch 'sprint/zentaopms240_task#70571' into 'sprint/zentaopms240'
* Finish task #70571.
See merge request easycorp/zentaopms!5558
|
2022-09-27 02:25:58 +00:00 |
|
|
wangyuting2
|
80fe821de6
|
* Finish task #70571.
|
2022-09-27 01:33:34 +00:00 |
|
|
wangyidong
|
b43b1c844a
|
Merge branch 'sprint/zentaopms240_lanzongjun' into sprint/zentaopms240
|
2022-09-27 08:29:09 +08: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 |
|
|
王怡栋
|
e76eb5d5ce
|
Merge branch 'sprint/zentaopms240_bug#27807' into 'sprint/zentaopms240'
* Fix bug #27807.
See merge request easycorp/zentaopms!5547
|
2022-09-27 00:17:18 +00:00 |
|
|
王怡栋
|
4378fbf471
|
Merge branch 'sprint/daitingting_task_70200' into 'sprint/zentaopms240'
* Finish task #70200.
See merge request easycorp/zentaopms!5552
|
2022-09-27 00:16:26 +00:00 |
|
|
daitingting
|
f7d564e837
|
* Finish task #70200.
|
2022-09-26 09:38:11 +00:00 |
|
|
wangyidong
|
6e6ecb4f6a
|
* finish task #70199.
|
2022-09-26 17:28:15 +08:00 |
|
|
wangyuting2
|
951d1c2d1f
|
* Fix bug #27807.
|
2022-09-26 08:11:04 +00:00 |
|
|
wangyidong
|
70c347f3af
|
Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240
|
2022-09-26 15:27:20 +08:00 |
|
|
wangyidong
|
7a48c595b4
|
* code for add data-app attr.
|
2022-09-26 15:26:48 +08:00 |
|
|
王 于听
|
872f0166b4
|
Merge branch 'sprint/zentaopms240_task#70192' into 'sprint/zentaopms240'
* Finish task #70194.
See merge request easycorp/zentaopms!5546
|
2022-09-26 07:07:32 +00:00 |
|
|
wangyuting2
|
3af041060f
|
* Finish task #70194.
|
2022-09-26 07:06:15 +00:00 |
|
|
王 于听
|
38855d1d7e
|
Merge branch 'sprint/zentaopms240_task#70192' into 'sprint/zentaopms240'
* Finish task #70192.
See merge request easycorp/zentaopms!5545
|
2022-09-26 07:06:06 +00:00 |
|
|
wangyuting2
|
129bec2618
|
* Finish task #70192.
|
2022-09-26 06:44:02 +00:00 |
|
|
王 于听
|
00811262c8
|
Merge branch 'sprint/zentaopms240_fixbug#70191' into 'sprint/zentaopms240'
Sprint/zentaopms240 fixbug#70191
See merge request easycorp/zentaopms!5542
|
2022-09-26 06:04:39 +00:00 |
|
|
wangyuting2
|
f1d51e5a0d
|
* Finish task #70191.
|
2022-09-26 06:02:47 +00:00 |
|
|
wangyuting2
|
03da1bcf64
|
* Optimize code for review code.
|
2022-09-26 05:56:56 +00:00 |
|
|
wangyidong
|
0ba479e9e5
|
* finish task #70196.
|
2022-09-26 13:15:48 +08:00 |
|
|
lanzongjun
|
905a71ddf7
|
* fix bug meeting
|
2022-09-23 17:25:45 +08:00 |
|
|
wangyidong
|
685799b216
|
* adjust for set no sprint Menu.
|
2022-09-23 16:22:32 +08:00 |
|
|
王怡栋
|
e82c2da808
|
Merge branch 'sprint/zentaopms240_task_69719' into 'sprint/zentaopms240'
* Finish task #69719.
See merge request easycorp/zentaopms!5514
|
2022-09-23 05:52:28 +00:00 |
|
|
daitingting
|
fb14ecd593
|
* Finish task #69719.
|
2022-09-23 05:18:41 +00:00 |
|
|
王怡栋
|
0a46a85f71
|
Merge branch 'sprint/zentaopms240_task#69723' into 'sprint/zentaopms240'
* Finish task #69723
See merge request easycorp/zentaopms!5505
|
2022-09-23 03:14:57 +00:00 |
|
|
王怡栋
|
affe10c07b
|
Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
* fix bug #27792
See merge request easycorp/zentaopms!5502
|
2022-09-23 03:14:05 +00:00 |
|
|
wangyuting2
|
47a4c0fd0a
|
* Finish task #69723
|
2022-09-23 02:46:31 +00:00 |
|
|
lanzongjun
|
a478be994f
|
* fix bug #27792
|
2022-09-23 10:12:14 +08:00 |
|
|
王怡栋
|
7b655bcdca
|
Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
* fix bug #27795
See merge request easycorp/zentaopms!5498
|
2022-09-23 01:23:15 +00:00 |
|
|
lanzongjun
|
ac75c1ee07
|
* fix bug #27795
|
2022-09-23 09:20:14 +08:00 |
|
|
王怡栋
|
60dd30b380
|
Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
* fix bug #27800
See merge request easycorp/zentaopms!5495
|
2022-09-23 01:07:00 +00:00 |
|
|
王怡栋
|
06098879ba
|
Merge branch 'sprint/zentaopms240_task#69722' into 'sprint/zentaopms240'
* Finish task #69722.
See merge request easycorp/zentaopms!5489
|
2022-09-23 01:05:34 +00:00 |
|
|
lanzongjun
|
5fdd1d0972
|
* fix bug #27800
|
2022-09-23 09:03:04 +08:00 |
|
|
wangyidong
|
a3b4211a4c
|
* fix bug #27643.
|
2022-09-22 16:22:16 +08:00 |
|
|
wangyuting2
|
48187a2051
|
* Fix bug #27805.
|
2022-09-22 08:19:20 +00:00 |
|
|
wangyidong
|
cd1798bee6
|
* fix bug #27768.
|
2022-09-22 16:08:42 +08:00 |
|