Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
42,208 Commits 2 Branches 292 Tags
837c8f7ec2fbbbfbdf4c2aba43ad9b5a5d885ef2
Commit Graph
168 Commits
Author SHA1 Message Date
孙广明 52c9717727 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4531
 2022-07-14 02:06:13 +00:00
tianshujie 1e0aff765a * Fix bug #25208. 2022-07-14 08:17:00 +08:00
sunjun eb07793262 fixbug_25174 2022-07-13 06:57:48 +00:00
liumengyi 424653ac7f * Fix bug #24896. 2022-07-13 11:23:50 +08:00
lanzongjun 31109d6519 * fix task #60100 2022-07-07 16:36:24 +08:00
lanzongjun 76b79da0c1 * fix bug #23996 2022-06-30 15:20:38 +08:00
lanzongjun f73072e6de * fix bug #23729 2022-06-30 15:07:31 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
hufangzhou 27ec156f88 * Add the new version. 2022-05-26 09:52:33 +08:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
lanzongjun 867152e2bc * fix bug #22570 2022-05-18 13:33:54 +08:00
lanzongjun ece8976470 * fix bug #22570 2022-05-18 13:20:43 +08:00
liumengyi 5bdc188491 * Code format for bug #22585. 2022-05-18 10:12:42 +08:00
liumengyi b4a34e2ed6 * Fix bug #22585. 2022-05-18 10:10:06 +08:00
lanzongjun 10eebbd136 * fix bug #22570 2022-05-17 17:13:17 +08:00
tanghucheng d3dc4ebe43 * Fix bug. 2022-05-17 06:00:26 +00:00
tianshujie f328086daf * Fix bug #22490. 2022-05-16 13:43:08 +08:00
wangyuting2 3380222afc * Fix build action menu bug. 2022-05-11 16:11:34 +08:00
tanghucheng f3f0dd5647 * Code for task #53591. 2022-05-11 03:16:41 +00:00
王怡栋 d9d331c38e Merge branch 'master' into 'sprint/wangyuting_workflow' 
# Conflicts:
#   framework/control.class.php
 2022-05-10 08:46:32 +00:00
wangyuting2 fe3c882c5e * Adjust buildin workflow menu. 2022-05-10 16:32:04 +08:00
daitingting a71cf1d280 Merge branch 'branch/workflow' of https://gitlab.zcorp.cc/easycorp/zentaopms into branch/workflow 2022-05-10 01:44:47 +00:00
daitingting d577d57a33 * Add id for checking unique field. 2022-05-09 17:02:23 +08:00
wangyuting2 a607161591 * Finish task #53549. 2022-05-09 17:00:41 +08:00
daitingting e30acad1f2 * Add id for checking unique field. 2022-05-09 07:56:17 +00:00
daitingting 96e460c47d * Finish task #53549. 2022-05-09 06:41:35 +00:00
tianshujie dc8d65045b * Fix bug #21210. 2022-04-08 11:14:13 +08:00
caoyanyi a6a56ea4fe * Fix bug #17175. 2022-04-08 09:18:27 +08:00
孙华伟 3eb12785f1 *Fix bug#18381. 2022-04-06 13:37:19 +08:00
tianshujie 9071214c7f * Fix bug #19834. 2022-02-28 11:23:52 +08:00
李玉春 9405f7bf71 Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283' 
# Conflicts:
#   db/update16.4.sql
#   module/user/view/story.html.php
 2022-02-23 01:33:37 +00:00
zhujinyong b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00
zhengrunyu 0805d25735 * Finish task 49283. 2022-02-21 10:47:27 +08:00
tianshujie cb14ef28d5 * Fix bug #18175. 2022-01-29 15:51:21 +08:00
zhouxudong edf96f4485 *Fix bug #18037. 2022-01-11 15:52:59 +08:00
tianshujie 0176c8689a * Fix bug #47309. 2022-01-11 08:47:17 +08:00
xieqiyu 5c4609d302 * Modify review problem. 2021-12-31 15:43:27 +08:00
tianshujie bb635e3c48 * Modify the code format of caselib js file. 2021-12-06 11:36:33 +08:00
tianshujie 78af43d78c * Fix bug #17115. 2021-12-06 11:26:27 +08:00
mayue 8c6e0fabfb * Modify code #16987. 2021-12-02 09:44:12 +08:00
mayue 07f8a820b0 * Code format #16987. 2021-12-02 09:28:02 +08:00
mayue 63d4d3dad8 * Fix bug #16987. 2021-12-02 09:20:37 +08:00
mayue eec94fd383 * Fix bug #16936. 2021-12-01 17:14:43 +08:00
zhujinyong 37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
xieqiyu 92462e266a * Code for bug#15518. 2021-10-14 14:47:32 +08:00
zenggang c6b7f25fa3 * Adjust code style. 2021-09-18 14:08:31 +08:00
zenggang 4380f4d4b0 * Fix bug#14580 2021-09-18 11:01:08 +08:00
liyuchun f81ac5db58 * Code for task #41764. 2021-08-26 16:27:53 +08:00