Commit Graph

345 Commits

Author SHA1 Message Date
tanghucheng
d3dc4ebe43 * Fix bug. 2022-05-17 06:00:26 +00:00
wangyuting2
3380222afc * Fix build action menu bug. 2022-05-11 16:11:34 +08: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
d577d57a33 * Add id for checking unique field. 2022-05-09 17:02:23 +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
lanzongjun
beb2ec67de * fix bug #17626 2022-04-25 17:11:13 +08:00
tianshujie
ce869a399b * Fix bug #12474. 2022-04-08 13:53:05 +08:00
孙华伟
0031cb63c0 更新module/testsuite/view/view.html.php 2022-03-18 06:40:36 +00:00
孙华伟
6cf386e236 *Fix bug#16686. 2022-03-18 14:09:14 +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
408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
zhengrunyu
0805d25735 * Finish task 49283. 2022-02-21 10:47:27 +08:00
zhengrunyu
22f29fd8d4 *Fix bug 49283 2022-02-18 10:40:09 +08:00
xieqiyu
5c4609d302 * Modify review problem. 2021-12-31 15:43:27 +08:00
hufangzhou
ebcc470de1 * Fix bug #17276. 2021-12-08 17:52:19 +08:00
mayue
cf91884c25 * Fix bug #16631. 2021-11-30 13:56:49 +08:00
hufangzhou
a42131daee * Finish task #45006. 2021-11-29 14:17:05 +08:00
hufangzhou
dcb0891ebc * Finish task #45023. 2021-11-29 14:04:38 +08:00
xieqiyu
0c633c71d6 * Fix a bug:There is an error on the suite use case page. 2021-11-24 10:22:12 +08:00
zhujinyong
37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
孙广明
5812a1e510 Merge branch 'sprint/170_tianshujie_43903' into 'sprint/170'
* Finish task  #43903

See merge request easycorp/zentaopms!319
2021-11-05 03:22:17 +00:00
tianshujie
6cb70ab01d * Finish task #43903. 2021-11-05 08:59:55 +08:00
root
30c118cd9a * Fix bug #15691 2021-11-03 15:06:36 +08:00
root
8fb62009f4 * Fix bug #15691. 2021-11-03 14:45:14 +08:00
hufangzhou
bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
liyuchun
9b5a28392b * Finish task #42854. 2021-09-28 12:31:59 +08:00
liyuchun
48254bab16 * Code for task #41764. 2021-09-14 15:02:34 +08:00
tianshujie
e60c95725e * Modify the test module to return the link problem. 2021-08-30 13:23:07 +08:00
tianshujie
75faca9e87 * Revert commit. 2021-08-27 16:21:43 +08:00
tianshujie
b97e80568e * Modify the testsuite return link problem. 2021-08-27 15:42:03 +08:00
zhujinyong
1677574443 * return before $this->send. 2021-07-16 09:40:41 +08:00
holan20180123
51af4491d9 * Return id when create object by API. 2021-05-12 17:33:59 +08:00
qiyu-xie
42f5badbc8 * Fix bug#12185. 2021-04-16 15:34:55 +08:00
leiyong
a59fff9b57 * Fix bug#12070. 2021-04-16 06:44:43 +00:00
tianshujie98
7a86299868 * Fix testsuite problem. 2021-04-13 10:16:30 +08:00
leiyong
14dd2012cc * Finish task#37299. 2021-04-09 06:01:18 +03:00
wangyidong
0dc863da3a * change for set cookie secure. 2021-04-07 17:44:25 +08:00
wangyidong
ddf27f277d * fix bug #10996. 2021-03-31 10:38:52 +08:00
hufangzhou
d8f20c23f5 * Fix bug #11095. 2021-03-30 10:51:38 +08:00
leiyong
b5d0a6508c * Finish task#36357. 2021-03-25 18:47:03 +08:00
leiyong
17180656c7 * Finish task#36357. 2021-03-25 18:00:10 +08:00
holan20180123
447ea11570 * Adjust session. 2021-03-24 14:37:36 +08:00
zhujinyong
6bc4afa8dc Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-23 08:48:11 +08:00
zhujinyong
2ee7594858 * Fix menu. 2021-03-23 08:45:02 +08:00
leiyong
ea086296b0 * Adjsut QA menu. 2021-03-22 23:53:00 +08:00
zhujinyong
82428349ad * Rename session->PRJ to session->project. 2021-03-22 12:03:10 +08:00
zhujinyong
a6eff425ca * Adjust menu logic. 2021-03-21 12:15:55 +08:00
Yagami
3755648673 * Fix qa menu. 2021-03-19 11:20:35 +08:00