王怡栋
|
3438722a8c
|
Merge branch 'master' into 'zentaopms_289'
# Conflicts:
# db/update18.2.sql
|
2023-03-06 03:26:34 +00:00 |
|
Yagami
|
f95691948a
|
Merge branch 'zentaopms_294'
|
2023-03-06 08:37:11 +08:00 |
|
tianshujie
|
4d400723ce
|
* Modify more select display method.
|
2023-03-03 15:54:33 +08:00 |
|
liumengyi
|
7851944450
|
* Finish task #85640.
|
2023-03-03 03:19:04 +00:00 |
|
caoyanyi
|
86c6968243
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-03-03 08:48:41 +08:00 |
|
Yagami
|
fda9efd09c
|
* Remove request stages in bug batch-create page.
|
2023-03-02 16:05:35 +08:00 |
|
caoyanyi
|
e7c8ceed8d
|
* Modify dynamic language.
|
2023-02-23 10:10:11 +08:00 |
|
caoyanyi
|
6caaf4c316
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-23 08:32:25 +08:00 |
|
tianshujie
|
af76befb02
|
* Resolve issue #756.
|
2023-02-22 15:15:34 +08:00 |
|
caoyanyi
|
7df9719cf3
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-22 08:24:22 +08:00 |
|
zhujinyong
|
39b2773e77
|
* Fix bug #32332.
|
2023-02-21 15:55:33 +08:00 |
|
wangyidong
|
546cc63fb2
|
* code for task #84544.
|
2023-02-21 10:46:32 +08:00 |
|
caoyanyi
|
653c393eb1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-21 09:01:07 +08:00 |
|
wangyidong
|
a38a99e7b7
|
Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-21 08:49:36 +08:00 |
|
tianshujie
|
5aee651454
|
* Code for finish task #84575.
|
2023-02-18 18:39:07 +08:00 |
|
wangyidong
|
2b75166e7c
|
* fix bug #32030.
|
2023-02-17 14:12:04 +08:00 |
|
tianshujie
|
be00a4a8ae
|
* Code for finish task #84580.
|
2023-02-16 09:29:05 +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 |
|
Yagami
|
c2724b9f57
|
Merge branch 'zentaopms_281'
|
2023-02-08 15:31:13 +08:00 |
|
zhujinyong
|
5b4fe30491
|
* Filter stages.
|
2023-02-07 11:29:05 +08:00 |
|
zhujinyong
|
61d36f2fcb
|
* Finish task #83939, #83935.
|
2023-02-07 10:32:13 +08:00 |
|
xieqiyu
|
3c8d8e27a6
|
* Code for bug#28704.
|
2023-02-03 14:34:16 +08:00 |
|
wangyidong
|
b4598b8738
|
* fix bug #31725.
|
2023-01-29 17:18:40 +08:00 |
|
zenggang
|
c29d86fda5
|
* Fix bug#31595
|
2023-01-29 01:21:53 +00:00 |
|
mayue
|
a074537835
|
* Resolve feedback #1941.
|
2023-01-10 13:07:38 +08:00 |
|
xieqiyu
|
5a2b75d24f
|
* Finish task#81780.
|
2023-01-03 10:59:35 +08:00 |
|
孙广明
|
137953e0ae
|
Merge branch 'zentaopms_277'
|
2022-12-30 08:45:34 +08:00 |
|
xieqiyu
|
2664a0c85e
|
* Finish task#81190.
|
2022-12-27 13:49:08 +08:00 |
|
宋辰轩
|
c211acfadc
|
* Fix bug for story finished percent.
|
2022-12-26 16:30:17 +08:00 |
|
宋辰轩
|
0ae429c5ad
|
* Finish story 41069,41070.
|
2022-12-26 15:10:10 +08:00 |
|
wangyidong
|
58efe7b011
|
* code task #80458,80463.
|
2022-12-20 11:31:15 +08:00 |
|
wangyidong
|
c093724f9d
|
* fix bug #80463.
|
2022-12-20 09:24:06 +08:00 |
|
孙广明
|
a118120919
|
* Add title.
|
2022-12-14 14:27:38 +08:00 |
|
孙广明
|
507ac90e83
|
* Finish task #79441.
|
2022-12-14 14:21:51 +08:00 |
|
孙广明
|
05f7ad5035
|
* Finish task #79442.
|
2022-12-14 13:10:06 +08:00 |
|
lanzongjun
|
0a492b61fa
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun
|
2022-12-13 09:08:08 +08:00 |
|
lanzongjun
|
6da0c6ea01
|
* Finish Task #79670
|
2022-12-13 09:06:53 +08:00 |
|
lanzongjun
|
d2cb9938b5
|
* Finish Task #79670
|
2022-12-12 17:34:43 +08:00 |
|
zenggang
|
ee78bb255b
|
* Resolve feedback#1692
|
2022-12-12 02:53:26 +00:00 |
|
孙广明
|
8fa7675188
|
Merge branch 'master' into 'master_xieqiyu_78690'
# Conflicts:
# module/productplan/model.php
|
2022-12-09 08:58:14 +00:00 |
|
xieqiyu
|
7405efe5c7
|
* Code for task#78690.
|
2022-12-09 15:39:55 +08:00 |
|
lanzongjun
|
980b2998ad
|
* Fix Bug #78688
|
2022-12-09 13:58:10 +08:00 |
|
孙广明
|
31ef3e0260
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Bug #30480
See merge request easycorp/zentaopms!6498
|
2022-12-08 06:05:50 +00:00 |
|
Yagami
|
fd0b180d71
|
* Finish task #78676.
|
2022-12-08 13:15:48 +08:00 |
|
lanzongjun
|
d6f9976aae
|
* Finish Bug #30480
|
2022-12-08 11:06:04 +08:00 |
|
lanzongjun
|
5f3444278b
|
* Finish Task #78688
|
2022-12-07 14:22:27 +08:00 |
|
Yagami
|
ac2a798661
|
* Finish task #78689.
|
2022-12-05 14:16:02 +08:00 |
|
lanzongjun
|
a835220fe1
|
resolve conflict master
|
2022-12-02 10:28:31 +08:00 |
|