Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
48,955 Commits 2 Branches 292 Tags
d023bcb50672a4be322262bbf75c19f4e49b3844
Commit Graph
884 Commits
Author SHA1 Message Date
lanzongjun 43b667ba2b * Finish Bug #30700 2022-12-08 16:16:16 +08:00
lanzongjun 47284dc742 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-08 14:45:33 +08:00
lanzongjun e6989dc17c * Finish Bug #30687 2022-12-08 14:32:27 +08:00
xieqiyu ec6f263bd3 * Code for task#78661. 2022-12-07 21:42:59 +08:00
xieqiyu ae62bdff75 * Code for task#78661. 2022-12-07 14:19:36 +08:00
lanzongjun a835220fe1 resolve conflict master 2022-12-02 10:28:31 +08:00
liumengyi a6c8171286 * Fix bug #30278. 2022-12-01 10:33:59 +08:00
孙广明 6356683483 Merge branch 'master' into 256 2022-11-28 13:36:48 +08:00
Yagami 427d5947c5 * Fix bug #29443. 2022-11-18 14:41:25 +08:00
孙广明 3aedd173f8 Merge branch 'master_xieqiyu_29808' into 'master' 
* Fix bug#29808.

See merge request easycorp/zentaopms!6165
 2022-11-15 07:57:42 +00:00
xieqiyu 85c8e84c79 * Fix bug#29808. 2022-11-15 15:56:34 +08:00
mayue 127139f803 * Fix bug #29757. 2022-11-15 11:13:03 +08:00
mayue 404f47a361 * Fix bug #27342. 2022-11-09 09:37:05 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
liumengyi 98ceb83f84 * Fix bug #29227. 2022-11-03 14:37:41 +08:00
lanzongjun c525d43c1f fix ajax needCreate param 2022-11-03 09:29:50 +08:00
lanzongjun 67737d25c2 * task #74142 2022-11-01 09:58:04 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
tanghucheng 645072d3ae * Fix bug #28711. 2022-10-24 14:44:12 +08:00
tanghucheng 4ad1ac2435 * Code for bug #28684. 2022-10-24 14:27:58 +08:00
tanghucheng 4bb1f27573 * Fix bug #28711. 2022-10-20 17:06:00 +08:00
tanghucheng c0a9e98cd1 * Fix bug #28684,28680. 2022-10-19 15:42:46 +08:00
tanghucheng 14f82baf7e * Fix bug #28639. 2022-10-19 13:57:00 +08:00
tanghucheng 30bf3b8d3d * Add language for tree. 2022-10-19 11:25:31 +08:00
tanghucheng 7959557283 * Fix bug #28647. 2022-10-19 11:05:35 +08:00
tanghucheng 484cffa1a1 * Add ticket module. 2022-10-19 09:33:26 +08:00
Yagami 6788ef5793 * Finish task #72671. 2022-10-19 09:23:59 +08:00
tanghucheng 9ea2d135b3 * Fix bug #28624. 2022-10-18 17:29:34 +08:00
tanghucheng 6ed33f54dc * Adjust modify comments. 2022-10-18 15:31:42 +08:00
tanghucheng ccd017af47 * Finish task #72201,72130,72129. 2022-10-18 15:04:35 +08:00
tanghucheng e32b0bf2ff * Code for feedback module. 2022-10-17 16:55:25 +08:00
tanghucheng 36a8194f4c * Remove merge feedback module for tree and upgrade. 2022-10-17 09:05:08 +08:00
tanghucheng 2d0901b36c * Add top menu for feedback. 2022-10-15 08:52:40 +08:00
wangyidong 91ae21caec Merge branch 'master' into sprint/feedback_module 2022-10-11 09:33:25 +08:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
liuruogu 3b2e99b297 * Fix bug #27784. 2022-09-22 07:17:12 +00:00
liuruogu 82287b37b4 * Fix bug #27784. 2022-09-22 07:16:15 +00:00
liuruogu ac32bd0261 * Fix bug #27751. 2022-09-22 05:07:51 +00:00
liugang 11f0ca4453 * Optimize the method getPairs of the product module. 2022-09-21 11:10:34 +08:00
liuruogu dfb413dbb8 * Finish task #69600. 2022-09-20 09:02:23 +00:00
hufangzhou d64d98cb16 * Fixed an issue where submodules could not be obtained. 2022-09-20 13:40:13 +08:00
liuruogu f21dd89912 * Fix bug #27500. 2022-09-20 05:35:30 +00:00
liuruogu 8d22d737ea * Fix bug #27502. 2022-09-19 06:10:21 +00:00
liuruogu 39b1e8ae45 * Finish task #69016. 2022-09-15 07:08:49 +00:00
lanzongjun e0bb42fac5 resolve conflict 2022-09-08 11:18:09 +08:00
lanzongjun 036fe4aeb8 Merge branch 'sprint/feedback_module' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/feedback_module 2022-09-08 10:15:22 +08:00
lanzongjun adde17f712 * fix bug #27317 2022-09-08 10:15:13 +08:00
zenggang 7c2244c088 * Code for task#67792 2022-09-08 00:46:20 +00:00
mayue 087c85c04f * Ajust lang. 2022-09-07 14:49:25 +08:00
lanzongjun a9151f8429 * sync product 2022-09-07 09:11:12 +08:00