Commit Graph
1842 Commits
Author SHA1 Message Date
王怡栋 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
hufangzhou f92716a360 * Fix bug #32397. 2023-02-23 02:30:17 +00: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 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
宋辰轩 5e5cfd3e64 * code for task 79627 2022-12-21 18:18:06 +08:00
wangyidong d28ea77f0d * code for task #80461. 2022-12-20 09:24:07 +08:00
孔令茂 4964f6b73a * Resolved feedbak #1472,privilege error in my work requirement. 2022-12-09 12:30:05 +00:00
wangyidong 240111bc70 * code task #79283. 2022-12-09 16:23:57 +08:00
wangyidong dd7dfa2dc1 * fix bug #30660. 2022-12-08 14:37:24 +08:00
wangyidong 9a1d82200b * fix bug #30667. 2022-12-08 14:32:51 +08:00
wangyidong 8a3d6c4dcd * fix bug #30665. 2022-12-08 13:43:13 +08:00
wangyidong 771dd4c8ed * code for task #78908,78918. 2022-12-07 17:42:41 +08:00
王怡栋 dc827982fe Merge branch 'master_bug_23961' into 'master'
* Fix bug #23961.

See merge request easycorp/zentaopms!6432
2022-12-01 07:57:10 +00:00
wangyidong 283b37b65e * adjust for task #77615,77616. 2022-12-01 10:26:12 +08:00
xieqiyu a640d56e39 * Fix bug#30105. 2022-11-24 13:37:35 +08:00
zenggang a37adad9f6 * Fix bug#25845 2022-11-24 03:09:19 +00:00
xieqiyu 3afc823177 * Fix bug#29716,#30056. 2022-11-23 15:34:30 +08:00
liuhong decfddd1d2 * Fix bug #23961. 2022-11-23 06:34:32 +00:00
王怡栋 4f78b87c4c Merge branch 'tanghucheng_fixbug' into 'master'
* Fix feedback #1526.

See merge request easycorp/zentaopms!6327
2022-11-23 05:39:56 +00:00
tanghucheng bb8013fe7e * Fix feedback #1526. 2022-11-23 13:35:50 +08:00
xieqiyu 37122bb5a8 * Fix bug#30056. 2022-11-23 09:34:21 +08:00
liugang 7c62eef9dc Merge branch 'master' into sprint/biz17 2022-11-21 13:08:59 +08:00
wangyuting ff6730dcbd * Fix bug #29942. 2022-11-18 03:01:40 +00:00
王怡栋 d63c39bc59 Merge branch 'master_xieqiyu_code' into 'master'
* Modify code of review.

See merge request easycorp/zentaopms!6174
2022-11-16 02:02:04 +00:00
王怡栋 5dcbebeaf1 Merge branch 'zentaopms261_wyd' into 'master'
Zentaopms261 wyd

See merge request easycorp/zentaopms!6178
2022-11-16 01:54:53 +00:00
王怡栋 14edb87de2 * fix bug #29675. 2022-11-16 09:38:55 +08:00
xieqiyu 28ef479910 * Modify code of review. 2022-11-15 17:16:30 +08:00
孙广明 093069f5eb Merge branch 'master_xieqiyu_75910' into 'master'
* Fix bug#29440.

See merge request easycorp/zentaopms!6148
2022-11-15 08:13:37 +00:00
王怡栋 4352117e4d * fix bug #29699. 2022-11-15 13:56:40 +08:00