tianshujie
|
587ff87934
|
* Fix bug #29843.
|
2023-03-09 13:25:06 +08:00 |
|
caoyanyi
|
e409352d47
|
* Code for bug #28726.
|
2023-03-08 17:09:27 +08:00 |
|
caoyanyi
|
d3955d187a
|
* Modify language for project to variable.
|
2023-03-06 15:29:53 +08:00 |
|
Yagami
|
f95691948a
|
Merge branch 'zentaopms_294'
|
2023-03-06 08:37:11 +08: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
|
046187237e
|
* Code for fix bug #32561.
|
2023-03-01 16:35:24 +08:00 |
|
liumengyi
|
aac54b6978
|
* Fix bug #32157.
|
2023-03-01 07:12:48 +00:00 |
|
liumengyi
|
1b6f5422ec
|
* Finish task #85640.
|
2023-03-01 02:04:33 +00:00 |
|
liumengyi
|
a1c9148a6b
|
* Finish task #85640.
|
2023-03-01 02:03:03 +00:00 |
|
liumengyi
|
1c3131e402
|
* Fix bug #32494.
|
2023-02-28 08:41:30 +00:00 |
|
liumengyi
|
36e9f275c9
|
* Fix bug #32183.
|
2023-02-23 02:47:31 +00:00 |
|
liuhong
|
f5056eb802
|
* Adjust code for feedback #2274.
|
2023-02-21 09:50:19 +00:00 |
|
tianshujie
|
5aee651454
|
* Code for finish task #84575.
|
2023-02-18 18:39:07 +08: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
|
ec0078c708
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-13 14:03:58 +08:00 |
|
wangyidong
|
c724e74778
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-13 09:46:59 +08:00 |
|
wangyidong
|
11653a8914
|
* fix bug.
|
2023-02-13 09:45:43 +08:00 |
|
liumengyi
|
d71abe0f43
|
* Fix bug #32043.
|
2023-02-10 16:25:49 +08:00 |
|
wangyidong
|
de07d90b19
|
* fix bug #32016.
|
2023-02-10 11:22:34 +08:00 |
|
zhujinyong
|
5b4fe30491
|
* Filter stages.
|
2023-02-07 11:29:05 +08:00 |
|
zhujinyong
|
26c0c5e9dc
|
* Finish task #83938.
|
2023-02-07 11:06:24 +08:00 |
|
孙广明
|
eb7dce8e88
|
* Fix code style.
|
2022-12-29 15:21:59 +08:00 |
|
孙广明
|
c893ac76d8
|
Merge branch 'master_liuhong_30907' into 'master'
Master liuhong 30907
See merge request easycorp/zentaopms!6567
|
2022-12-15 08:20:12 +00:00 |
|
liuhong
|
cc631b6e4f
|
* Adjust code #30907.
|
2022-12-15 08:15:03 +00:00 |
|
liuhong
|
a08eff199f
|
* Fix bug #30907.
|
2022-12-15 08:12:15 +00:00 |
|
lanzongjun
|
a8551febe5
|
* Fix Bug #30909
|
2022-12-15 15:54:33 +08:00 |
|
lanzongjun
|
b4dd6cb307
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun
|
2022-12-15 13:54:20 +08:00 |
|
孙广明
|
7e7ec61d7e
|
Merge branch 'master_liuhong_30845' into 'master'
* Fix bug #30845.
See merge request easycorp/zentaopms!6552
|
2022-12-15 05:28:23 +00:00 |
|
lanzongjun
|
057bfe77e2
|
* Finish Task #79453
|
2022-12-15 10:55:08 +08:00 |
|
liuhong
|
0dc5fbdb33
|
* Fix bug #30845.
|
2022-12-15 02:17:42 +00:00 |
|
wangyidong
|
6391ddfe1e
|
* adjust style.
|
2022-12-15 10:11:25 +08:00 |
|
孙广明
|
8d8696b1e4
|
Merge branch 'master_xieqiyu_79662' into 'master'
* Code for task#79662.
See merge request easycorp/zentaopms!6548
|
2022-12-14 06:14:08 +00:00 |
|
xieqiyu
|
fc17dfc949
|
* Code for task#79662.
|
2022-12-14 14:10:49 +08:00 |
|
hufangzhou
|
6cef691b39
|
* Add the new version.
|
2022-12-14 05:28:51 +00:00 |
|
wangyidong
|
856eb4d410
|
* adjust for style.
|
2022-12-14 11:33:00 +08:00 |
|
wangyidong
|
8dc609e4a0
|
* code task #79859,79858,79857,79856,79855,79854.
|
2022-12-13 14:15:39 +08:00 |
|
wangyidong
|
d64a93ea2b
|
* code task #79282.
|
2022-12-09 17:13:06 +08:00 |
|
孙广明
|
2fdb547f3e
|
Merge branch 'master' into 'master_271_78665'
# Conflicts:
# module/build/control.php
|
2022-12-09 08:58:55 +00:00 |
|
孙广明
|
a7d7ec312a
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30616
See merge request easycorp/zentaopms!6522
|
2022-12-09 08:55:12 +00:00 |
|
wangyidong
|
81d3403a20
|
* code for task #79279.
|
2022-12-09 16:54:17 +08:00 |
|
lanzongjun
|
e6301a8ec3
|
* Fix Bug #30616
|
2022-12-09 16:03:32 +08:00 |
|
lanzongjun
|
9158f6f79f
|
* Fix Bug #30616
|
2022-12-09 15:38:54 +08:00 |
|
liuhong
|
94b3f9bfd5
|
* resolve conflict task #78665
|
2022-12-09 07:21:08 +00:00 |
|
lanzongjun
|
dd2160fde3
|
* Finish Bug #30662
|
2022-12-09 11:53:58 +08:00 |
|
liuhong
|
dd13c3d947
|
* Adjust code task #78665.
|
2022-12-08 15:57:27 +00:00 |
|
liuhong
|
14d9f3a5eb
|
* Ajdust code Task #78665.
|
2022-12-08 15:54:45 +00:00 |
|
liuhong
|
11ca786545
|
* Fix stories and bug when no associate.
|
2022-12-08 15:35:48 +00:00 |
|
liuhong
|
207c5c7117
|
* Adjust code task #78665.
|
2022-12-08 14:40:21 +00:00 |
|
lanzongjun
|
c73d589b54
|
* Finish Bug #30664
|
2022-12-08 16:28:38 +08:00 |
|