Commit Graph

196 Commits

Author SHA1 Message Date
朱金勇
97d9e06807 * Fix bug#34391. 2023-04-19 08:05:12 +00:00
朱金勇
0dde8ad3ed Fix default value of db. 2023-04-10 09:19:01 +00:00
tianshujie
d30de7b7a2 * Code for task #89153. 2023-03-29 13:23:39 +08:00
wangxuepeng
7f45a3d34f * Fixed bug #87025. 2023-03-14 05:09:14 +00:00
Yagami
f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
孙广明
1ec9676309 Merge branch 'fixbug_liumengyi' into 'master'
* Fix bug 32578, and fix bug of set path.

See merge request easycorp/zentaopms!7118
2023-03-02 00:48:31 +00:00
liumengyi
72b0baa4cd * Fix bug #32578, and fix bug of set path. 2023-03-02 00:29:11 +00:00
王怡栋
b8b59cba27 Merge branch 'sprint/hufangzhou_bug_32476' into 'master'
* Fix bug #32476.

See merge request easycorp/zentaopms!7103
2023-03-01 10:15:15 +00:00
孙广明
db4662cfbc Merge branch 'cyy_bug' into 'master'
* Fix bug #32549.

See merge request easycorp/zentaopms!7109
2023-03-01 09:13:25 +00:00
tianshujie
fdc0e3fa41 * Code for fix bug #32567. 2023-03-01 15:56:55 +08:00
liumengyi
2bcf84cf2a * Fix bug #32540. 2023-03-01 06:40:51 +00:00
liumengyi
afd1f05159 * Fix bug #32423. 2023-03-01 06:03:02 +00:00
hufangzhou
200af8e045 * Fix bug #32476. 2023-03-01 03:16:04 +00:00
hufangzhou
e93bfa4498 * Fix bug #32518. 2023-03-01 00:55:15 +00:00
孙广明
54c3641625 Merge branch 'fixbug_liumengyi' into 'master'
* Optimize code, fix bug 32456 32457 32463 32464 32477 32480.

See merge request easycorp/zentaopms!7086
2023-02-28 07:15:20 +00:00
liumengyi
cbed975b74 * Fix bug #32477, and fix bug of change parent stage. 2023-02-28 05:44:39 +00:00
zhujinyong
39822c34a6 * Fix bug: orderBy is not defined. 2023-02-28 13:07:35 +08:00
liumengyi
bcaa92b137 * Fix bug #32477. 2023-02-28 03:18:39 +00:00
liumengyi
226f798470 * Finish task #85631. 2023-02-27 08:08:07 +00:00
liumengyi
599150da94 * Fix bug #32442. 2023-02-27 06:58:37 +00:00
hufangzhou
64bb25430b * Add the programplan unit testcase. 2023-02-25 03:19:49 +00:00
tianshujie
af76befb02 * Resolve issue #756. 2023-02-22 15:15:34 +08:00
Yagami
dc9eb5a1a4 * Finish task #85048. 2023-02-21 08:59:26 +08:00
王怡栋
c004967af9 Merge branch 'sprint/290_liumengyi_32244' into 'master'
* Fix bug #32244, #32245, #32249, #32251,  #32255, #32179, @32167.

See merge request easycorp/zentaopms!6989
2023-02-20 01:16:52 +00:00
hufangzhou
aaeeb9372d * Code for task #84583. 2023-02-19 09:17:49 +00:00
hufangzhou
75b5b2562c * Finish task #84583. 2023-02-18 16:04:53 +00:00
liumengyi
0ad1aba2ee * Fix bug #32255. 2023-02-18 08:38:13 +00:00
liumengyi
b1f57ce0da * Fix bug #32244, #32245. 2023-02-17 07:50:45 +00:00
liumengyi
93a890663c * Fix bug of task #84584. 2023-02-16 07:01:13 +00:00
liumengyi
7501362a58 * Finish task #84591. 2023-02-16 06:34:10 +00:00
liumengyi
9be6fa2fd2 * Finish task #84584. 2023-02-16 05:28:39 +00:00
tianshujie
484f34396c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 08:59:00 +08:00
hufangzhou
f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
tianshujie
1e0346d696 Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_sortable 2023-02-14 13:32:06 +08:00
tianshujie
836ce16b03 * Code for finish task #84575. 2023-02-14 13:29:36 +08:00
liumengyi
7ea51e54b5 * Finish task #84584. 2023-02-14 13:13:46 +08:00
hufangzhou
56c2cdcb21 * Finish task #83954. 2023-02-14 02:46:34 +00:00
liumengyi
005c91c8a4 * Finish task #84599. 2023-02-13 16:51:25 +08:00
tianshujie
ec0078c708 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-13 14:03:58 +08:00
hufangzhou
17bbda6505 * Format the code. 2023-02-10 06:09:44 +00:00
hufangzhou
35bd85a243 * Modifying the access control of the parent phase does not synchronize the child phase's. 2023-02-10 05:41:06 +00:00
zhujinyong
c3822c43c3 * Finish task #83943. 2023-02-09 12:22:54 +08:00
zhujinyong
8c0f3cce83 * Show all children of program plans. 2023-02-09 11:24:11 +08:00
daitingting
1a8d5a70e7 * Fix bug #30843. 2023-02-09 01:35:19 +00:00
hufangzhou
b0d4622093 * If parent stage's attribute is mix, sub-stage's attribute doesn't need to sync parent's. 2023-02-08 16:35:05 +08:00
hufangzhou
8c9ce0238f * Filter out itself and it's children. 2023-02-08 15:43:25 +08:00
hufangzhou
3986779df3 * Finish task #83956. 2023-02-08 15:04:18 +08:00
liumengyi
84970085ec * Finish task #83942. 2023-02-08 14:14:08 +08:00
hufangzhou
a5a0316602 * Don't change attribute when parent stage's attribute change to mix. 2023-02-08 14:07:32 +08:00
hufangzhou
9916a95dc2 * Code for task #83956. 2023-02-08 03:31:42 +00:00