Commit Graph
99 Commits
Author SHA1 Message Date
daitingting df38b1400c * Fix bug #30209. 2022-11-24 06:20:49 +00:00
daitingting b4296bb71e * Fix bug #30171. 2022-11-24 02:52:17 +00:00
王怡栋 fb9bdee652 Merge branch 'zentaopms_263_bug_#30174' into 'master'
* Fix bug #30174.

See merge request easycorp/zentaopms!6347
2022-11-24 02:12:55 +00:00
daitingting a3cc874acc * Fix bug #30174. 2022-11-24 01:55:13 +00:00
daitingting 48d2209722 * Fix bug #30165,#30170. 2022-11-23 08:10:39 +00:00
daitingting 96623039db * Fix bug #30151. 2022-11-23 06:05:32 +00:00
daitingting 3750be48c5 * Finish task #77143. 2022-11-22 08:17:17 +00:00
hufangzhou 3dae19302b * Add the new version. 2022-11-16 06:34:29 +00:00
daitingting 3d287772cc * Finish task #74858. 2022-11-04 01:49:32 +00:00
代婷婷 c105930472 Merge branch 'zentaopms_239' into 'zentaopms_239_task_#74667'
# 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
2022-11-03 05:36:38 +00:00
daitingting b07b1031ea * Finish task #74667. 2022-11-03 03:15:41 +00:00
daitingting 998866a374 * Finish task #74180. 2022-11-03 01:40:17 +00:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
daitingting 47db9c31e3 * Finish task #74179. 2022-10-31 05:19:20 +00:00
wangyuting2 606ea74471 * Optimize code. 2022-09-30 05:52:05 +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
wangyuting2 80fe821de6 * Finish task #70571. 2022-09-27 01:33:34 +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 3af041060f * Finish task #70194. 2022-09-26 07:06:15 +00:00
lanzongjun 905a71ddf7 * fix bug meeting 2022-09-23 17:25:45 +08:00
daitingting f2abc5711c * Optimize tips for task #69246. 2022-09-22 05:39:45 +00:00
lanzongjun c4f00619e4 * finish task #69255 2022-09-21 09:35:22 +08:00
daitingting d038c1e64c * Finish task #69246,#69247. 2022-09-20 05:08:06 +00:00
lanzongjun 6cd72e94ac * finish task #69701 2022-09-20 09:11:56 +08:00
lanzongjun 7ff2af63ff modify lang 2022-09-19 13:30:23 +08:00
wangyidong 6b541a7c60 Merge branch 'sprint/zentaopms240_lanzongjun' into sprint/zentaopms240 2022-09-16 16:26:29 +08:00
lanzongjun 1d9a11cc66 * task #69250#69251 2022-09-16 15:08:38 +08:00
lanzongjun d80acf6a78 * task #69250 2022-09-16 13:28:50 +08:00
daitingting c44bc35ec6 * Adjust language. 2022-09-16 02:38:51 +00:00
tianshujie f0dec448ce * Finish task #61177. 2022-07-20 08:36:04 +08:00
tianshujie 896ac04352 * Finish task #61177. 2022-07-19 14:34:54 +08:00
tianshujie 7791a30013 * Finish task #61177. 2022-07-19 13:32:03 +08:00
tianshujie f23564efbf * Fix bug #24434. 2022-06-28 12:23:47 +08:00
tianshujie 651d16675a * Finish task #58551. 2022-06-27 10:19:41 +08:00
tanghucheng 4d8da5eeb1 * Fix bug #24177. 2022-06-23 09:40:19 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
xieqiyu 535257a9a7 * Fix bug#14383. 2022-04-28 10:59:54 +08:00
holan20180123 f75815e4fb * Finish task #40305. 2021-07-16 16:58:36 +08:00
wangyidong 6a973517de * finish task #40306. 2021-07-16 13:43:54 +08:00
holan20180123 2e8884d86c * Fix bug #13585. 2021-07-13 13:51:21 +08:00
hufangzhou fcf1d669d7 * Revert the changed code of task #38644. 2021-06-05 18:14:44 +08:00
hufangzhou b0291eeba4 * Fix bug #38644. 2021-06-01 09:29:30 +08:00
hufangzhou cb624d49bd * Fix bug #12669. 2021-05-21 14:14:27 +08:00
hufangzhou c86827e39c * Finish task#38171,#38168. 2021-05-14 17:10:45 +08:00
hufangzhou 0d0d85c9ff * Finish task #38171. 2021-05-13 16:07:09 +08:00
qiyu-xie 06694e4911 * Finish task#38174. 2021-05-13 13:53:23 +08:00
Yagami b13b635102 * Fix error. 2021-04-21 09:36:09 +08:00
tianshujie98 b734b5edcc * Fix bug #11019. 2021-03-31 09:15:01 +08:00
Yagami 5cc07e20c1 * Fix lang file. 2021-03-11 16:46:18 +08:00
hufangzhou 876a0be2eb * Adjust the custom module. 2021-03-05 13:11:47 +08:00