Commit Graph

250 Commits

Author SHA1 Message Date
孙广明
9f1847d55b * Code for code error. 2022-07-20 09:35:30 +08:00
mayue
090989e25e * Fix bug #24404. 2022-07-13 11:11:36 +08:00
mayue
f44d5659df * Fix bug #24404. 2022-07-12 15:00:11 +08:00
liumengyi
1681419642 * Fix bug for sort module. 2022-07-08 09:03:00 +08:00
liumengyi
bb9ce6dd49 * Fix bug #24920. 2022-07-07 16:58:27 +08:00
王怡栋
14b88ef75e Merge branch 'sprint/211_liumengyi_59469' into 'master'
* Finish task #59469.

See merge request easycorp/zentaopms!4372
2022-07-06 06:17:57 +00:00
liumengyi
100f1daf7e * Add annotation. 2022-07-06 14:10:37 +08:00
liumengyi
957d6f3249 * Fix bug of task #59469. 2022-07-06 11:11:45 +08:00
zhouxudong
bf19599c0e * Finish task #59525. 2022-07-06 02:15:33 +00:00
zhouxudong
ddecdf5cb8 * Finish task #59525. 2022-07-06 00:31:05 +00:00
liumengyi
2ab56b9f51 * Finish task #59469. 2022-07-05 20:38:07 +08:00
王怡栋
62f030b82d Merge branch 'sprint/zdoo18_wangyuting' into 'master'
* Fix bug #23438.

See merge request easycorp/zentaopms!3800
2022-06-08 09:12:48 +00:00
wangyidong
11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
wangyuting2
2d4f9f8644 * Add notes. 2022-06-08 17:03:52 +08:00
wangyuting2
ca92edbf95 * Fix bug #23438. 2022-06-08 17:01:08 +08:00
wangyuting2
463643ff83 * Fix bug. 2022-06-08 15:53:32 +08:00
wangyuting2
3fb390115c * Add processing of datasource viewType. 2022-06-08 14:23:42 +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
xieqiyu
39959d08e9 * Fix bug#54483. 2022-05-17 15:08:06 +08:00
朱金勇
4898f63820 Merge branch 'sprint/renying_Fixbug#21457' into 'master'
Sprint/renying fixbug#21457

See merge request easycorp/zentaopms!3051
2022-04-22 01:36:54 +00:00
renying
d02cb94ab6 Fixbug#21457 2022-04-21 10:41:24 +08:00
renying
b32081bab7 Fixbug#21457 2022-04-21 09:27:36 +08:00
孙华伟
a5d6663342 * Fix bug #20316. 2022-04-18 10:55:42 +08:00
孙华伟
37c8352c47 Update control.php 2022-04-14 00:39:40 +00:00
孙华伟
93beba2f03 *Fix bug#18295. 2022-04-14 08:32:47 +08:00
zhouxin
105874959c * Fix bug #21636. 2022-04-12 02:26:19 +00:00
mayue
4084429fe6 * Fix bug #20316. 2022-03-31 15:48:35 +08:00
zhouxin
bb47bfa04c * Fix bug #21333. 2022-03-31 06:02:31 +00:00
zhujinyong
e3ec91da2a + Add modules api. 2022-03-22 09:54:35 +08:00
zhujinyong
408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
孙广明
3d3d4130dd * Code for php8.0. 2021-12-29 16:59:54 +08:00
hufangzhou
b1bca8dac0 * Fix bug #17261. 2021-12-08 15:29:13 +08:00
李玉春
b1cd56f4b3 Merge branch 'sprint/174_hufangzhou_45079' into 'master'
Sprint/174 hufangzhou 45079

See merge request easycorp/zentaopms!715
2021-12-02 02:53:09 +00:00
hufangzhou
563979094c * Fix bug #16986. 2021-12-02 10:50:44 +08:00
hufangzhou
3c8e265ab7 * Fix bug #16986. 2021-12-02 10:04:14 +08:00
hufangzhou
36fa35d3d1 * Fix bug #15832. 2021-12-01 17:09:52 +08:00
hufangzhou
c04947228f * Finish task #44992, task #44991, task #44990. 2021-12-01 10:02:46 +08:00
xieqiyu
2fc250b9b2 * Code for task#45079. 2021-12-01 08:15:37 +08:00
hufangzhou
0965e74d0e * Finish task #45085. Fix bug #16792. 2021-11-29 13:19:55 +08:00
hufangzhou
0e67779504 * Modify the branch switcher in qa menu. 2021-11-25 14:53:22 +08:00
zhujinyong
e86878e5c6 * Fix tree of product and branch. 2021-11-25 14:49:15 +08:00
hufangzhou
e431847c58 * Add the branch switcher in tree browse page. 2021-11-25 12:22:56 +08:00
xieqiyu
e7578880a7 * Fix bug#16507. 2021-11-22 16:26:36 +08:00
zhengrunyu
293c0f12e2 *Finish task #16507. 2021-11-22 10:33:00 +08:00
zhengrunyu
43fab0b8d3 *Finish task #16507. 2021-11-22 10:27:12 +08:00
xieqiyu
84340fa6f2 * Code for task#44497. 2021-11-17 22:57:30 +08:00
thanatos
c0e6b93d3f fix bug 2021-09-26 13:33:22 +08:00
thanatos
0d116021db finish api doc. first commit 2021-09-16 16:10:49 +08:00
zhujinyong
664e290f97 * Rename openApp to tab. 2021-08-31 00:30:48 +08:00