Commit Graph
1867 Commits
Author SHA1 Message Date
wangyidong d3149400b0 * fix bug #32095. 2023-03-17 15:57:51 +08:00
wangyidong 7dc5533817 * fix bug #33002. 2023-03-17 08:48:22 +08:00
tianshujie 07e2128147 * Modify program language. 2023-03-15 11:02:06 +08:00
tianshujie bc7855e7e3 * Add skip stash page. 2023-03-14 13:50:17 +08:00
caoyanyi db1ae60517 * Adjust code. 2023-03-13 15:23:49 +08:00
guofeilong 7375d26d90 * Code for bug #32714 . 2023-03-13 14:18:55 +08:00
caoyanyi d3955d187a * Modify language for project to variable. 2023-03-06 15:29:53 +08:00
tianshujie 69b58d1646 * Add logical judgment. 2023-03-06 10:45:39 +08:00
tianshujie c6cd9a6077 * Code for finish task 84527. 2023-03-03 13:01:50 +08:00
tianshujie 3886a5f25b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-02 08:27:28 +08:00
王怡栋 036f823ff0 Merge branch 'dev/gfl_bug#32448' into 'master'
* Code for bug #32448.

See merge request easycorp/zentaopms!7116
2023-03-01 10:27:40 +00:00
guofeilong 4ad274cf1b * Code for bug #32448. 2023-03-01 17:12:53 +08:00
Yagami 48020c2b5d * Fix bug #32459. 2023-03-01 17:04:39 +08:00
tianshujie cf4c9931e2 * Code for finish task #84527. 2023-02-27 15:29:02 +08:00
tianshujie aaac6a6d0e * The tag output problem was rectified. 2023-02-27 13:42:15 +08:00
caoyanyi 2f3aae9281 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-23 16:05:42 +08:00
caoyanyi 0d847aaccc * Modify lite language. 2023-02-23 10:51:07 +08:00
hufangzhou f92716a360 * Fix bug #32397. 2023-02-23 02:30:17 +00:00
caoyanyi 59527ae349 Merge branch '289_language' of https://gitlab.zcorp.cc/easycorp/zentaopms into 289_language 2023-02-23 10:13:11 +08:00
caoyanyi 22faecf1a4 * Remove unused language. 2023-02-23 10:12:50 +08:00
tianshujie 9358865db4 * Modify the filter label for the feedback and ticket list. 2023-02-23 10:12:48 +08:00
caoyanyi 10da3ef802 * Modify language defined. 2023-02-23 09:32:56 +08:00
caoyanyi 37ee577a4f * Add language. 2023-02-23 09:00:42 +08:00
caoyanyi 305453880d * Modify my module language. 2023-02-22 17:19:34 +08:00
caoyanyi f3e7a7f451 * Update language. 2023-02-22 11:22:02 +08:00
caoyanyi e9b4bb067e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-22 11:17:41 +08:00
王怡栋 1303aabfdc Merge branch 'bugfix/myWorkApi' into 'master'
+ Resolved feedback #2016, the api my work task response error.

See merge request easycorp/zentaopms!6778
2023-02-22 02:53:14 +00:00
tianshujie 4ee0aabe5f Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into 289_featureBar 2023-02-21 14:14:27 +08:00
guofeilong 35569ad22c * Code refactors in module todo lang. 2023-02-21 10:03:34 +08:00
guofeilong b51cb2325f * Code for module tido lang refactors . 2023-02-21 09:26:31 +08:00
tianshujie d6266bc607 * Code for finish task #85047. 2023-02-20 14:47:10 +08:00
tianshujie 484f34396c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 08:59:00 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
tianshujie ec0078c708 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-13 14:03:58 +08:00
Yagami c2724b9f57 Merge branch 'zentaopms_281' 2023-02-08 15:31:13 +08:00
guofeilong b5df472639 * Code for css in preference.html.php . 2023-02-03 16:27:52 +08:00
hufangzhou 73df98376a * Finish task #83205, and fix bug of task #83206. 2023-01-31 10:35:06 +08:00
xieqiyu 1a12607799 * Fix bug#25663. 2023-01-19 11:47:54 +08:00
孔令茂 3b415a49ec + Resolved feedback #2016, the api my work task response error. 2023-01-17 15:25:59 +08:00
zhouxin 79e71b2d41 * Fix bug #31668. 2023-01-16 14:38:54 +08:00
liuhong a2342f7eca * Add project for auditplan #40669. 2023-01-09 03:06:41 +00:00
caoyanyi 4a75eb6ee2 * Adjust code. 2023-01-04 15:14:41 +08:00
caoyanyi 64f2c5f0be * Fix bug #31430. 2023-01-04 15:11:15 +08:00
hufangzhou b5859c7dc3 * Add the new version. 2023-01-03 13:56:27 +08:00
tianshujie e11298c33b * code for task #40827 2022-12-30 17:32:05 +08:00
tianshujie 41dd1a0280 * code for task #40827 2022-12-30 16:47:15 +08:00
田淑杰 866b4086e8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272 2022-12-29 15:22:13 +08:00
tianshujie 2ed3974bc6 * code for bug #81093 2022-12-29 15:14:34 +08:00
liugang 8100689bb2 Merge branch 'sprint/biz17' 2022-12-26 08:50:31 +08:00
tianshujie a3bccd0eff * code for task 79627 2022-12-21 19:44:02 +08:00