Commit Graph
45085 Commits
Author SHA1 Message Date
wangyuting2 d33cc87da9 * Fix bug in review code. 2022-09-29 05:50:16 +00:00
王怡栋 a12d3229b3 Merge branch 'sprint/zentaopms240_task_70546' into 'sprint/zentaopms240'
* Finish task #70546.

See merge request easycorp/zentaopms!5595
2022-09-28 07:24:34 +00:00
王怡栋 3018f58f61 Merge branch 'sprint/zentaopms240_bug#27929' into 'sprint/zentaopms240'
* Fix bug #27929.

See merge request easycorp/zentaopms!5594
2022-09-28 07:24:00 +00:00
王怡栋 7047c50437 Merge branch 'sprint/zentaopms240_task_70560' into 'sprint/zentaopms240'
* Disable features when upgrade from classic to lean.

See merge request easycorp/zentaopms!5593
2022-09-28 07:22:41 +00:00
daitingting 63f84968b7 * Finish task #70546. 2022-09-28 07:17:52 +00:00
wangyuting2 f9310ade48 * Fix bug #27929. 2022-09-28 06:59:18 +00:00
daitingting 20a5b36a9d * Disable features when upgrade from classic to lean. 2022-09-28 06:35:07 +00:00
王怡栋 54526092d4 Merge branch 'sprint/zentaopms240_task_70565' into 'sprint/zentaopms240'
* Disable issue, risk, urstory when switch to lean mode for task #70565,#70566.

See merge request easycorp/zentaopms!5581
2022-09-28 05:08:42 +00:00
daitingting 45d957cc9f * Disable issue, risk, urstory when switch to lean mode for task #70565,#70566. 2022-09-28 02:16:14 +00:00
王怡栋 f3c6166235 Merge branch 'sprint/zentaopms240_task#70851' into 'sprint/zentaopms240'
* Finish task #70851.

See merge request easycorp/zentaopms!5580
2022-09-28 02:09:35 +00:00
wangyidong 2854fd7565 * code for task #70540. 2022-09-28 09:40:56 +08:00
wangyuting2 39c364df74 * Finish task #70851. 2022-09-28 01:38:51 +00:00
wangyidong 4d9856be14 * code for task #70540. 2022-09-28 09:25:52 +08:00
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