tianshujie
|
5e2ac749af
|
* Fix bug #32233.
|
2023-02-16 16:17:48 +08:00 |
|
liumengyi
|
93a890663c
|
* Fix bug of task #84584.
|
2023-02-16 07:01:13 +00:00 |
|
tianshujie
|
a2435c006a
|
* Code for finish task #84575.
|
2023-02-16 14:58:36 +08: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 |
|
liumengyi
|
af5fbbab18
|
* Fix bug of task #84584.
|
2023-02-15 08:17:12 +00:00 |
|
孙广明
|
b6f4477420
|
Merge branch 'tsj_sortable' into 'zentaopms_284'
Tsj sortable
See merge request easycorp/zentaopms!6945
|
2023-02-15 00:21:22 +00:00 |
|
hufangzhou
|
0b89cd77d5
|
* Fix bug of task #83954.
|
2023-02-14 08:49:53 +00: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
|
00d8f85005
|
* Finish task #84584.
|
2023-02-14 13:21:33 +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 |
|
liumengyi
|
1aaefb79d3
|
* Fix bug of merge code.
|
2023-02-13 16:43:02 +08:00 |
|
liumengyi
|
f9daa6072b
|
* Fix bug of merge code.
|
2023-02-13 16:35:51 +08:00 |
|
tianshujie
|
a097e0ca52
|
* Merge master.
|
2023-02-13 14:33:35 +08:00 |
|
tianshujie
|
4f2ca7d709
|
* Merge master.
|
2023-02-13 14:27:49 +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
|
aa48048939
|
* Modify the default value of acl when create sub-stage.
|
2023-02-10 08:16:45 +00: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 |
|
hufangzhou
|
6f10625f57
|
* Fix bug.
|
2023-02-09 15:15:44 +08: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 |
|
王怡栋
|
9331b9856a
|
Merge branch 'master' into 'zentaopms_wangyuting'
# Conflicts:
# module/programplan/view/gantt.html.php
|
2023-02-08 08:30:14 +00:00 |
|
wangyuting2
|
ab16894c06
|
* Optimize page css.
|
2023-02-08 16:17:16 +08:00 |
|
xieqiyu
|
e00862dd0c
|
* Code for bug#29159.
|
2023-02-08 16:16:33 +08:00 |
|
wangyuting2
|
afaa89f8fd
|
* Fix bug #27242.
|
2023-02-08 16:03:35 +08:00 |
|
hufangzhou
|
8c9ce0238f
|
* Filter out itself and it's children.
|
2023-02-08 15:43:25 +08:00 |
|
Yagami
|
c2724b9f57
|
Merge branch 'zentaopms_281'
|
2023-02-08 15:31:13 +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 |
|
zhujinyong
|
d23966be45
|
* Format milestones.
|
2023-02-08 09:26:24 +08:00 |
|
xieqiyu
|
975b755c54
|
* Code for bug#31949.
|
2023-02-08 08:48:09 +08:00 |
|
xieqiyu
|
bfe1a0ef5e
|
* Code for bug#31949.
|
2023-02-08 08:37:38 +08:00 |
|
hufangzhou
|
f96ff40f65
|
* Finish task #83945.
|
2023-02-07 08:38:42 +00:00 |
|
liumengyi
|
ed7d5cc4dd
|
* Finish task #83942.
|
2023-02-07 10:17:09 +08:00 |
|
hufangzhou
|
42144fb719
|
* Fix bug for task #83945, #83955.
|
2023-02-07 02:07:56 +00:00 |
|
hufangzhou
|
9137ed1b83
|
* Add the ajax request when change parent stage for task #83955.
|
2023-02-07 01:08:03 +00:00 |
|
hufangzhou
|
652595112f
|
* Finish task #83955.
|
2023-02-06 08:59:34 +00:00 |
|
liumengyi
|
742e7c28f5
|
* Finish task #83944.
|
2023-02-06 15:25:40 +08:00 |
|
wangyuting2
|
f77ad21c48
|
* Fix bug #25538.
|
2023-02-03 13:59:59 +08:00 |
|
hufangzhou
|
3d4ae057f3
|
* Fix bug for bug #30770.
|
2023-02-02 01:08:42 +00:00 |
|