Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
37,706 Commits 2 Branches 292 Tags
284af0ded110b6ba0a82cf470dd2ffc99e198efc
Commit Graph
461 Commits
Author SHA1 Message Date
zhouxin 5f11d21fbf * Fix bug #21783. 2022-04-15 03:19:06 +00:00
xieqiyu 5468912f57 * Fix bug#21382. 2022-04-14 15:22:54 +08:00
zenggang 6908956c24 * Fix bug#17082,17990 2022-04-14 06:28:31 +00:00
xieqiyu 22b629b707 * Fix bug#21382. 2022-04-13 13:15:08 +08:00
孙广明 3718a90a21 Merge branch 'master_xieqiyu_21383' into 'master' 
* Fix bug#21383.

See merge request easycorp/zentaopms!2713
 2022-04-02 02:19:05 +00:00
王怡栋 4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
xieqiyu 638d4bd8b8 * Fix bug#21383. 2022-04-01 14:40:38 +08:00
tianshujie 0e3779ca1b * Fix Kanban related issues. 2022-03-30 10:45:01 +08:00
孙广明 04d9e62697 Merge branch 'fixbugs_zhouxin_16707' into 'master' 
* Fix bug #16707.

See merge request easycorp/zentaopms!2602
 2022-03-29 06:01:15 +00:00
zhouxin 376de6d824 * Fix bug #16707. 2022-03-29 04:28:39 +00:00
zhouxin 603ae3bfdc * Fix bug #16707. 2022-03-29 03:14:50 +00:00
tianshujie a3c6f30f55 * Fix bug #21028,21030. 2022-03-29 09:57:50 +08:00
caoyanyi 3883bc56dc * Adjust code. 2022-03-28 16:44:07 +08:00
caoyanyi d178200fb9 * Fix bug #11655 and add repo create check. 2022-03-28 16:39:58 +08:00
Zongjun Lan b80761648b * fix bug classic vision 2022-03-25 09:36:56 +08:00
caoyanyi 0961139ea4 * Fix bug #18017. 2022-03-23 09:14:27 +08:00
Wenrui LI 90ab73d1f7 * use correct id for input errors on batch create, task #51316, bug #20963. 2022-03-22 09:02:40 +08:00
liyuchun 0187fb80c7 Merge branch 'devops24' 2022-03-22 08:28:32 +08:00
zenggang dae974455f * Adjust code 2022-03-18 01:02:35 +00:00
zenggang 414ec1b308 * Finish task#50667,50675 2022-03-17 09:05:02 +00:00
Zongjun Lan ad622ccb02 * fix bug #t 2022-03-17 15:58:35 +08:00
zhujinyong 7f32ac7f61 * Fix error when updating. 2022-03-13 22:30:40 +08:00
tianshujie af5a97ad40 * Fix bug #20591. 2022-03-11 08:34:54 +08:00
孙广明 97859c945b Merge branch 'master' into 'sprint/master_tanghucheng_fixbug' 
# Conflicts:
#   module/user/js/batchcreate.js
#   module/user/view/batchcreate.html.php
 2022-03-10 08:07:31 +00:00
tanghucheng 31588aacc7 * Adjust for batchcreate user. 2022-03-10 15:23:40 +08:00
tanghucheng 76fd14c845 * Adjust for create user. 2022-03-10 12:09:33 +08:00
王怡栋 01f6eb4cc3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-10 10:36:40 +08:00
王怡栋 53c2dd44fb * fix bug #20113. 2022-03-10 10:31:10 +08:00
tanghucheng 07f2f81d43 * Fix bug #20432. 2022-03-09 10:55:55 +08:00
tianshujie d616ef30c0 * Fix bug #20284. 2022-03-07 13:54:53 +08:00
王怡栋 3a6dc5a72c * code for task #48840. 2022-03-07 11:32:12 +08:00
tianshujie 162b015ae5 * Modify the code. 2022-03-04 14:09:12 +08:00
tianshujie 5b5213c761 * Fix bug #20301. 2022-03-04 13:21:09 +08:00
tianshujie 75ba14eb95 * Fix bug #20298. 2022-03-03 17:05:35 +08:00
孙广明 b33cb32e4b Merge branch 'sprint/master_tanghucheng_fixbug' into 'master' 
* Fix priv and classic mode.

See merge request easycorp/zentaopms!2031
 2022-03-02 03:05:06 +00:00
tianshujie 391d9cc18b * Fix bug #20090. 2022-03-02 10:02:27 +08:00
tanghucheng 87aa943546 * Fix bug for classic. 2022-03-02 09:04:20 +08:00
tanghucheng ccc11c4e4b * Hide preference and tutorial. 2022-02-28 15:18:57 +08:00
liumengyi e0814cd74b * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:15:08 +08:00
zhujinyong 408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
王怡栋 3082abe478 * adjust for set vision. 2022-02-18 08:36:54 +08:00
王怡栋 3ebcfb1ddc * fix bug #19693. 2022-02-17 11:06:28 +08:00
zhujinyong d02ddc138c Merge branch 'lite' into sprint/185 2022-02-17 10:20:50 +08:00
zhujinyong 5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
王怡栋 98c6d7b2b1 * code for task #48840. 2022-02-15 09:42:47 +08:00
liyuchun 0d16a79b63 * Fix bug #19323. 2022-02-15 08:22:25 +08:00
Wenrui LI 2702a886da * query group by vision when authorizing user. 2022-01-21 10:18:05 +08:00
liumengyi 79813a2166 * Modify judgment. 2022-01-17 18:53:45 +08:00
liumengyi c11615933a * Fix bug #18625. 2022-01-17 18:51:50 +08:00
liumengyi 47e7cd7f10 * Fix bug #18625. 2022-01-17 18:46:58 +08:00