Commit Graph
816 Commits
Author SHA1 Message Date
hufangzhou 6d03387d4b * Add the new version. 2021-11-22 16:48:28 +08:00
zhouxin b98f417d97 Delete a blank line. 2021-11-19 15:32:45 +08:00
zhouxin 02c028365b Modified language. 2021-11-19 15:27:52 +08:00
王怡栋 fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
李玉春 3870f6f9e4 Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170'
Finis task #44486,44487,44488.

See merge request easycorp/zentaopms!495
2021-11-18 06:30:03 +00:00
xieqiyu 7d15430ab1 * Modify the review code. 2021-11-18 10:39:46 +08:00
xieqiyu 84340fa6f2 * Code for task#44497. 2021-11-17 22:57:30 +08:00
zhouxin b7e3fe9003 Finis task #44486,44487,44488. 2021-11-17 15:49:24 +08:00
王怡栋 d68ce78a66 * code for task #44325. 2021-11-16 14:40:42 +08:00
zhujinyong 37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
xieqiyu 089238bd79 * Modify review questions. 2021-11-10 12:26:55 +08:00
王怡栋 87d1d09997 * adjust for get dropmenu by api. 2021-11-10 11:34:16 +08:00
hufangzhou 9fa76f6912 * Modify the action of main branch. 2021-11-10 09:49:29 +08:00
hufangzhou 9f77cc6fb6 * Finish task #43898. 2021-11-09 17:16:30 +08:00
王怡栋 9d0023b969 * code for task #43761. 2021-11-09 16:31:28 +08:00
xieqiyu e53d644169 * Fix bug#16058. 2021-11-08 19:13:09 +08:00
qiyu-xie f22b3ea149 * Code for task#43902. 2021-11-07 18:12:57 +08:00
qiyu-xie 8f902ccf2d * Code fot task#44028. 2021-11-07 13:44:24 +08:00
王怡栋 3cdf3b3395 Merge branch 'sprint/167_wangyidong_api' into sprint/app10 2021-11-01 15:35:49 +08:00
王怡栋 43ac494106 * fix bug for loophole. 2021-10-25 08:42:13 +08:00
hufangzhou e3fc0a1bf5 * Adjust the lang file. 2021-10-19 21:00:11 +08:00
李玉春 724588ee19 Merge branch 'sprint/167_tianshujie_15638' into 'sprint/167'
* Fix bug #15638.

See merge request easycorp/zentaopms!115
2021-10-19 12:40:58 +00:00
tianshujie 0b7c4c5f1c * Fix bug #15638. 2021-10-19 20:18:42 +08:00
hufangzhou 24795122b8 * Check the api module for package. 2021-10-19 20:12:57 +08:00
tianshujie adef615386 * Fix bug #15638. 2021-10-19 19:41:05 +08:00
朱金勇 cf2f61ddb3 Merge branch 'sprint/167_xiawenlong' into 'sprint/167'
Sprint/167 xiawenlong

See merge request easycorp/zentaopms!109
2021-10-19 10:18:18 +00:00
xiawenlong a184ef1ce3 fix code style. 2021-10-19 18:15:24 +08:00
xiawenlong e872c187cf fix group en language. 2021-10-19 18:09:48 +08:00
xiawenlong 2f28bb8c85 fix all level 1 and 3 bugs. 2021-10-19 17:49:39 +08:00
zhujinyong 3653106d27 + Add action name of api. 2021-10-19 17:14:30 +08:00
hufangzhou c4824ba3d7 * Check the code for upgrade. 2021-10-18 13:11:07 +08:00
tianshujie ab662e5cf4 * Fix bug #15511. 2021-10-14 13:31:08 +08:00
tianshujie 04fce5278b * Fix bug #15500. 2021-10-14 09:37:41 +08:00
hufangzhou bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
王怡栋 96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
tianshujie 33ec8312e3 * Finish task #42867. 2021-10-08 13:50:25 +08:00
tianshujie 4f977efaeb * Finish task #42854. 2021-09-28 13:14:32 +08:00
王怡栋 9211504ebb * fix bug #15357. 2021-09-26 15:16:28 +08:00
hufangzhou 8bbf7475f8 * Fix bug #14231. 2021-09-22 09:02:31 +08:00
tianshujie 00619a268f * Fix dynamic error. 2021-09-16 09:04:36 +08:00
王怡栋 b70381885a * add new version and upgrade. 2021-09-14 11:36:00 +08:00
dingguodong 4a4afa23d9 * Rename function for display action(JIHU). 2021-09-10 08:53:13 +08:00
liyuchun fa2e8cd1b0 * Fix bug #15004. 2021-09-09 14:43:41 +08:00
dingguodong e9002f78c2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-08 16:33:36 +08:00
dingguodong 47b838ddb5 * Merge code from ext to this branch for API(JIHU). 2021-09-08 16:33:05 +08:00
王怡栋 9751d83ea1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-08 16:02:36 +08:00
liyuchun a03a74fd5b * Fix bug #15004. 2021-09-08 16:01:41 +08:00
王怡栋 71e494840a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-08 16:01:39 +08:00
王怡栋 d2403a6b8e * add new version and upgrade. 2021-09-08 16:00:42 +08:00
liyuchun 21b5e77382 * Fix bug #15004. 2021-09-08 15:52:00 +08:00