Commit Graph
1473 Commits
Author SHA1 Message Date
wangyuting 17602d5113 * Fix bug #29924. 2022-11-17 02:38:27 +00:00
hufangzhou 3dae19302b * Add the new version. 2022-11-16 06:34:29 +00:00
wangyuting 2f5e0ac70d * Finish task #75239. 2022-11-11 00:46:54 +00:00
wangyidong 2e6e289f1a * fix bug #29528. 2022-11-10 12:08:21 +08:00
tanghucheng e09a070318 * Merge branch 'master' into transfer. 2022-11-09 15:44:42 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
liumengyi 90d07d8261 * Fix bug #29249, and modify 'BI' to 'Statistics'. 2022-11-04 09:54:38 +08:00
wangyuting2 b59ceb1038 * Finish task #72273. 2022-11-03 05:28:49 +00:00
hufangzhou d095daee76 * Add the sql in confirm page. 2022-11-02 08:33:05 +00:00
hufangzhou b08746ca3c * Fix an error. 2022-11-02 08:06:59 +00:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
hufangzhou d09093f42b * Add the new version. 2022-11-02 06:24:20 +00:00
wangyidong f9ec235880 * code for task #74183,74184,74185. 2022-10-31 14:20:48 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
hufangzhou d3f7df5518 * Add the new version. 2022-10-19 05:41:40 +00:00
tanghucheng ccd017af47 * Finish task #72201,72130,72129. 2022-10-18 15:04:35 +08:00
wangyuting2 782bdbb2a8 * Finish task #72257. Fix bug #28511. 2022-10-17 06:33:20 +00:00
tanghucheng 36a8194f4c * Remove merge feedback module for tree and upgrade. 2022-10-17 09:05:08 +08:00
wangyidong 91ae21caec Merge branch 'master' into sprint/feedback_module 2022-10-11 09:33:25 +08:00
wangyidong c13286de9e * code for task #71659. 2022-10-10 14:13:25 +08:00
liugang b288745d89 * Add the projectplan module to the whitelist. 2022-09-30 10:21:27 +08:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
王怡栋 fb0ef6c81d Merge branch 'sprint/zentaopms240_bug#27928' into 'sprint/zentaopms240'
* Fix bug #27928.

See merge request easycorp/zentaopms!5623
2022-09-30 00:27:24 +00:00
wangyuting2 e438c9f3ab * Fix bug # 28182. 2022-09-29 09:17:45 +00:00
wangyuting2 3a6bca52e8 * Fix bug #27928. 2022-09-29 08:21:43 +00:00
wangyuting2 64b22cb464 * Fix bug. 2022-09-29 08:04:53 +00:00
wangyuting2 53cf43823d * Fix bug #28193. 2022-09-29 07:56:40 +00:00
daitingting 4eb2fcc4c7 * Remove useless codes.
* Add note for param.
2022-09-28 09:08:14 +00:00
daitingting 20a5b36a9d * Disable features when upgrade from classic to lean. 2022-09-28 06:35:07 +00:00
wangyuting2 23abb36523 * Disable features during upgrade and installation. 2022-09-27 06:29:55 +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
王怡栋 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
daitingting f7d564e837 * Finish task #70200. 2022-09-26 09:38:11 +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
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
hufangzhou 952f0395c9 * Add the new version 2022-09-23 16:33:40 +08:00
lanzongjun a478be994f * fix bug #27792 2022-09-23 10:12:14 +08:00
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
王怡栋 d0da351eb3 Merge branch 'sprint/zentaopms240_fixbug#27656' into 'sprint/zentaopms240'
* Fix bug #27656.

See merge request easycorp/zentaopms!5453
2022-09-21 07:04:38 +00:00
wangyuting2 75771bafd2 * Fix bug #27656. 2022-09-21 05:50:44 +00:00
lanzongjun 6ab0868d6e resolve conflict 2022-09-21 13:37:43 +08:00
lanzongjun 24f686b75a fix noSprint 2022-09-21 13:35:42 +08:00
王怡栋 a6bed96839 Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
* finish task #69255

See merge request easycorp/zentaopms!5437
2022-09-21 02:03:52 +00:00
daitingting 8490bf7dbf * Rename noExecution to noSprint.
* Optimize codes.
2022-09-21 01:12:39 +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