Commit Graph
1819 Commits
Author SHA1 Message Date
hufangzhou 9ee981f782 * Fix bug for undefined variable. 2023-03-17 14:41:10 +08:00
wangxuepeng d52e26f52c # Fixed #bug23998. 2023-03-16 07:42:55 +00:00
tianshujie bc7855e7e3 * Add skip stash page. 2023-03-14 13:50:17 +08:00
tianshujie ee0919e61f * Modify language items for product common. 2023-03-07 13:37:17 +08:00
liumengyi 510d2e7644 * Fix bug #32353. 2023-02-23 01:23:17 +00:00
tianshujie 792f1c5a98 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-17 08:33:25 +08:00
tianshujie 2a388d06a7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-16 09:00:16 +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 f7805a0d47 * Fix bug #32143. 2023-02-15 09:52: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
liumengyi 035c2ff35f * Fix bug of task #83949. 2023-02-09 09:44:09 +08:00
liumengyi fddb2f1e64 * Finish task #83949. 2023-02-07 11:28:35 +08:00
liumengyi a413a2b809 * Finish task #83949. 2023-02-07 11:23:32 +08:00
liumengyi c6841126ba * Finish task #83950. 2023-02-07 11:18:29 +08:00
liuyongkai 3dfb278fc4 * Resolve ticket #2072. 2023-02-01 16:37:24 +08:00
liuyongkai 438fb830e5 * Resolve ticket #2072. 2023-02-01 16:32:48 +08:00
xieqiyu aeb0d8054d * Fix bug#30834. 2023-02-01 11:13:11 +08:00
tianshujie 5968e26cd9 * Fix bug #28027. 2023-01-29 17:02:06 +08:00
zhouxin 14f967733f * Fix bug for feedback 1807. 2022-12-22 06:31:58 +00:00
zhouxin e56ac56ca3 * Resolve feedback #1807. 2022-12-21 07:58:28 +00:00
王怡栋 ffe0b359e9 Merge branch 'sprint/feedback1752' into 'master'
Sprint/feedback1752

See merge request easycorp/zentaopms!6599
2022-12-20 02:43:23 +00:00
chaideqing b670a052de * Fix feedback1752. 2022-12-20 10:10:33 +08:00
zenggang 14dc7079d1 * Fix bug#30798 2022-12-19 08:17:56 +00:00
Yagami fa0b93874d * Code for markdown preview bug. 2022-12-12 16:55:33 +08:00
zenggang 82948abf2b * Fix bug#25845 2022-12-02 07:20:59 +00:00
zenggang b908e942a8 * Fix bug#29140 2022-11-29 06:35:11 +00:00
王怡栋 2a5333b298 * fix bug #15815. 2022-11-25 10:09:47 +08:00
wangjianhua d6b292ae14 Merge branch 'master' into master_oss_wangjianhua 2022-11-21 21:20:34 +08:00
王怡栋 d16ba0ba54 Merge branch 'zentaopms_263_bug#29949' into 'master'
* Fix bug #29949.

See merge request easycorp/zentaopms!6283
2022-11-21 08:53:55 +00:00
wangyuting f71d6abf17 * Fix bug #29949. 2022-11-21 06:41:06 +00:00
wangyuting 05a652d5fe * Fix bug #29950. 2022-11-21 06:08:46 +00:00
wangjianhua 121e072d85 Merge branch 'master' into master_oss_wangjianhua 2022-11-16 16:36:36 +08:00
chaideqing 3c4ee4bf5a * Fix feedback1441 another file. 2022-11-16 13:59:07 +08:00
chaideqing 197fcd24c3 * Fix feedback #1441. 2022-11-16 11:10:20 +08:00
xieqiyu fde21ff897 * Fix bug#29549,#29654. 2022-11-11 17:06:48 +08:00
wangzemei bd32b35659 * fix bug 29464 29473 2022-11-11 10:24:45 +08:00
wangjianhua cd5749835e * Add function setFielAndRealPaths to file model. 2022-11-09 23:28:37 +08:00
wangyidong b32f2af9b7 * code for task #75236. 2022-11-09 10:30:30 +08:00
孙广明 e9b3e073e7 Merge branch 'cyy_bug' into 'master'
* Code for bug #29366.

See merge request easycorp/zentaopms!6072
2022-11-08 03:05:06 +00:00
caoyanyi 828aa2ae64 * Adjust code. 2022-11-08 08:54:55 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
caoyanyi 2bd70bc4f3 * Code for bug #29366. 2022-11-07 17:22:03 +08:00
wangyuting2 0cefde5d28 * Optimize code for review code. 2022-11-04 06:35:21 +00:00
tianshujie 9363788155 * Fix bug #29280. 2022-11-04 11:31:32 +08:00
tianshujie cf7a678b9b * Fix bug #29280. 2022-11-04 11:25:06 +08:00
王怡栋 c534fb0065 Merge branch 'zentaopms_239_wyd' into 'zentaopms_239'
Zentaopms 239 wyd

See merge request easycorp/zentaopms!5980
2022-11-02 03:57:36 +00:00
wangyidong 99889da499 * code for task #74781. 2022-11-02 09:27:14 +08:00
wangyuting2 d54ca95ff6 * Finish task #73838 ~ #73844. 2022-11-02 01:15:40 +00:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00