Commit Graph
439 Commits
Author SHA1 Message Date
王怡栋 03c76b1565 Merge branch 'master' into 'sprint/206'
# Conflicts:
#   db/update17.1.sql
2022-06-22 07:26:11 +00:00
mayue c3109321a6 * Fix bug #24049; 2022-06-22 15:04:28 +08:00
孙广明 1b562972e8 Merge branch 'sprint/206' into 'sprint_206_57892'
# Conflicts:
#   module/doc/model.php
2022-06-22 03:10:18 +00:00
liumengyi 38f48bd103 * Optimize code for task#57892. 2022-06-22 11:08:42 +08:00
liumengyi 5ce8133079 * Fix bug for task #57891 #57890 #57889 #57886 #57885 #57892 #57887. 2022-06-22 10:58:57 +08:00
mayue 0ae4dc0878 * Fix bug #23982. 2022-06-22 09:19:32 +08:00
liumengyi 8c229fa6bc * Finish task #58063. 2022-06-22 08:59:29 +08:00
sunjun eafcb352c6 * Finish task #57891 #57890 #57889 #57886 #57885 #57892 #57887 2022-06-21 05:17:09 +00:00
zenggang dff6937dc4 * Adjust code 2022-06-20 09:29:29 +00:00
zenggang 2564d2d60b * Finish task#57903 2022-06-20 09:27:56 +00:00
mayue 49db5d2b2e * Fix bug #23870#23868. 2022-06-17 14:12:47 +08:00
mayue 88c7c0222b * Optimize code. 2022-06-16 16:34:13 +08:00
mayue 179191fd7d * Fix bug #23183. 2022-06-16 16:15:13 +08:00
孙广明 f51b7998d5 * Code for bug #23508. 2022-06-13 10:21:28 +08:00
孙广明 91199908ce * Code for task #56547. 2022-06-09 08:57:56 +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
孙广明 61ad544156 Merge branch 'zentaopms_198' 2022-06-02 15:04:56 +08:00
孙广明 fba70b09d5 * Remove unused code. 2022-06-01 14:29:08 +08:00
孙广明 226ea6ef16 * Finish task #55844. 2022-06-01 14:25:59 +08:00
tianshujie 79d7990c21 * Fix bug #22994. 2022-05-26 16:00:47 +08:00
hufangzhou 79f28c9cb2 * Finish task #54985. 2022-05-24 16:02:05 +08:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
xieqiyu cd1c1e1b63 * Finish task#54477. 2022-05-20 10:52:30 +08:00
hufangzhou 82c4eba324 * Fix bug #22637. 2022-05-18 16:36:34 +08:00
tianshujie b715ecd177 * Finish task #53655. 2022-05-11 11:13:41 +08:00
hufangzhou 0424801e4e * Fix bug #15654. 2022-04-27 10:48:28 +08:00
zenggang 9e1f09d37a * Fix bug#21982,21983 2022-04-26 03:25:12 +00:00
hufangzhou 18293e3e0d * Fix bug #15656. 2022-04-13 11:19:20 +08:00
hufangzhou 87a515c803 * Fix the bug of doc lib related actions don't show. 2022-04-06 09:53:13 +08:00
hufangzhou 4eeaa81691 * Rename the method name. 2022-04-02 16:05:19 +08:00
hufangzhou 8cd3b4eb9f * Packaging method. 2022-04-02 15:58:22 +08:00
hufangzhou c155d3aa96 * Fix bug #17362. 2022-04-02 15:05:39 +08:00
hufangzhou 9ff0537cda * Fix bug #17362. 2022-04-02 14:57:33 +08:00
hufangzhou cd6b98f084 * Fix bug of child stage. 2022-03-31 14:12:12 +08:00
hufangzhou df4c62e876 * Fix bug #18696. 2022-03-29 13:47:11 +08:00
zenggang 1357480ac6 * Finish task#51109,51108,51128 2022-03-23 07:54:03 +00:00
Zongjun Lan e8b085129b * Fix bug #19903 2022-02-24 11:19:38 +08:00
zhujinyong b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00
朱金勇 d39aa0ecbb Merge branch 'zentao_client_fix' into 'master'
Zentao client fix

See merge request easycorp/zentaopms!1460
2022-01-18 02:33:01 +00:00
chaideqing 250d944b73 * fix bug #18039,task #47399, show html page when in client create bug/story/task/doc/todo 2022-01-17 14:40:39 +08:00
mayue be717d3937 * Optimize code. 2022-01-17 14:18:39 +08:00
mayue 7e3e42edaa * Optimize code format. 2022-01-07 09:19:26 +08:00
mayue 91ff44d32e * Optimize code. 2022-01-07 09:14:27 +08:00
mayue f151953a49 * Optimize code. 2022-01-06 15:55:49 +08:00
孙广明 c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
zhujinyong ff9ceaccad * Check auth. 2022-01-05 09:05:32 +08:00
李玉春 d7a9f2fd67 Merge branch 'sprint/180_mayue_46526' into 'sprint/180'
* Finish task #46526.

See merge request easycorp/zentaopms!1249
2022-01-04 07:32:59 +00:00
mayue 1d28df0e30 * Optimize code. 2022-01-04 15:27:07 +08:00
mayue 0cd9411371 * Finish task #46526. 2022-01-04 10:28:53 +08:00