Commit Graph

1681 Commits

Author SHA1 Message Date
hufangzhou
d876550d96 * Add the traditional Chinese language item. 2021-12-07 09:22:58 +08:00
孙广明
69304124b5 * Change for upgrade. 2021-12-06 10:58:52 +08:00
tanghucheng
579d98ada1 * Merge programplan into stage. 2021-12-03 09:39:37 +08:00
tanghucheng
613d171dde * Merge programplan into stage. 2021-12-03 09:20:08 +08:00
tanghucheng
686c40396b * Merge programplan into stage. 2021-12-03 09:11:43 +08:00
tanghucheng
0224791b5a * Fix waterfall menu. 2021-12-01 11:08:13 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
王怡栋
21e42772b2 * add lang for api. 2021-11-29 15:29:00 +08:00
王怡栋
74a41448dc * add lang for mobile api. 2021-11-23 09:35:16 +08:00
hufangzhou
6d03387d4b * Add the new version. 2021-11-22 16:48:28 +08:00
liumengyi
e477c580bf * Fix Bug #16505. 2021-11-22 10:28:18 +08:00
王怡栋
fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
liyuchun
412fbb2305 * Finish task #44370. 2021-11-16 16:25:00 +08:00
孙广明
5fbdcff3c2 * Add measurement menu. 2021-11-15 16:01:16 +08:00
孙广明
932d73fd12 * Fix menu. 2021-11-08 09:18:15 +08:00
王怡栋
5f9b3ed654 * adjust for lang for api. 2021-11-05 13:11:42 +08:00
孙广明
d420eba707 * Finish task #44005. 2021-11-05 11:24:19 +08:00
孙广明
5812a1e510 Merge branch 'sprint/170_tianshujie_43903' into 'sprint/170'
* Finish task  #43903

See merge request easycorp/zentaopms!319
2021-11-05 03:22:17 +00:00
tianshujie
0fa14065b2 * Modify the constant name of the branch trunk. 2021-11-05 11:20:22 +08:00
tianshujie
6cb70ab01d * Finish task #43903. 2021-11-05 08:59:55 +08:00
孙广明
f9978c4841 * Code for task #44005. 2021-11-04 17:07:37 +08:00
孙广明
75d547998c * Code for task #44005. 2021-11-04 16:55:37 +08:00
zhouxin
8fe8ad90af Finish task 43877. 2021-11-04 13:22:09 +08:00
王怡栋
3cdf3b3395 Merge branch 'sprint/167_wangyidong_api' into sprint/app10 2021-11-01 15:35:49 +08:00
liyuchun
7d31524581 * Fix bug #15861. 2021-11-01 13:45:43 +08:00
root
6db04fa88e bug_15467 2021-11-01 09:29:45 +08:00
xiawenlong
3dc8358434 Finish permissionOC 2021-10-29 10:09:07 +08:00
liyuchun
817178e93b * Add button of set WIP and column name. 2021-10-28 16:19:16 +08:00
李玉春
f9b40d2887 Merge branch 'sprint/168' into 'sprint/168_sgm_43393'
# Conflicts:
#   module/execution/js/kanban.js
2021-10-28 06:47:11 +00:00
孙广明
6c32c9a397 Merge branch 'sprint/tengfei_168_lang' into 'sprint/168'
Sprint/tengfei 168 lang

See merge request easycorp/zentaopms!192
2021-10-28 03:32:04 +00:00
孙广明
83f3079804 * Finish task #43393. 2021-10-28 11:01:50 +08:00
reneeteng
cf5682ef5b * Edit api lang and related files. 2021-10-28 10:11:52 +08:00
王怡栋
076f328914 * add lang for zentaoapp and adjust api. 2021-10-27 19:58:50 +08:00
liyuchun
d0b9dda4d7 * Finish task #43519,#43503. 2021-10-27 15:41:36 +08:00
tianshujie
f8447c9825 * Correct Kanban data. 2021-10-26 11:46:33 +08:00
tianshujie
3d22a50a00 * Create the single execution Kanban lane and Kanban column. 2021-10-25 14:13:44 +08:00
liyuchun
b32541f20f * Fix bug #15639. 2021-10-19 20:32:06 +08:00
zhujinyong
fc2e75eeb8 * Fix languages. 2021-10-19 15:59:07 +08:00
王怡栋
6ee64dffe7 Merge branch 'api_doc' into sprint/167 2021-10-19 11:36:19 +08:00
hufangzhou
c4824ba3d7 * Check the code for upgrade. 2021-10-18 13:11:07 +08:00
liyuchun
cfdce3652f * Finish task #43187. 2021-10-14 13:51:47 +08:00
thanatos
cb1613604f fix header action 2021-10-12 09:41:21 +08:00
zhujinyong
0c6c024bb1 * Fix menu vars. 2021-10-08 13:48:10 +08:00
zhujinyong
83d598745f * Finish task#43059. 2021-10-08 08:01:53 +08:00
thanatos
8a44a6dc95 fix bug 2021-09-17 13:25:40 +08:00
thanatos
0d116021db finish api doc. first commit 2021-09-16 16:10:49 +08:00
王怡栋
d2403a6b8e * add new version and upgrade. 2021-09-08 16:00:42 +08:00
Guan Xiying
cef4ce5e1c * Add $lang->mr to common module. 2021-09-08 13:57:19 +08:00
dingguodong
314c3c593e Merge branch 'jihuMR' 2021-09-07 20:47:10 +08:00
lichengjun
7ca5893ce2 * Cancel GitLab SYNC Settings. 2021-09-07 00:44:34 +00:00