 liugang
|
042a9a97c3
|
* Display the project type on the edit page of the project module.
|
2022-09-15 13:05:14 +08:00 |
|
|
刘刚
|
5459e21d2e
|
Merge branch 'sprint/239_liugang_fixbug' into 'zentaopms_239'
* Fix bug of upgrade the exist projects.
See merge request easycorp/zentaopms!5337
|
2022-09-15 01:32:51 +00:00 |
|
|
liugang
|
3b97ed9213
|
* Fix bug of upgrade the exist projects.
|
2022-09-15 09:30:46 +08:00 |
|
|
刘刚
|
ec6d342fb5
|
Merge branch 'sprint/239_liuruogu_task69012' into 'zentaopms_239'
* Do task #69012.
See merge request easycorp/zentaopms!5336
|
2022-09-15 00:52:55 +00:00 |
|
|
liuruogu
|
939602ade2
|
* Do task #69012.
|
2022-09-15 00:48:26 +00:00 |
|
|
刘刚
|
46db1983ad
|
Merge branch 'zentaopms_239_tanghucheng_69000' into 'zentaopms_239'
* Finish task #69001.
See merge request easycorp/zentaopms!5329
|
2022-09-14 09:42:28 +00:00 |
|
|
tanghucheng
|
710b11ff0c
|
* Finish task #69001.
|
2022-09-14 17:16:53 +08:00 |
|
|
刘刚
|
c19e0c7428
|
Merge branch 'sprint/239_liuruogu_task69012' into 'zentaopms_239'
* Finish task #69012.
See merge request easycorp/zentaopms!5327
|
2022-09-14 09:05:44 +00:00 |
|
|
liuruogu
|
7d02ac1f96
|
* Finish task #69012.
|
2022-09-14 08:59:36 +00:00 |
|
|
liuruogu
|
d1fbc1068b
|
* Finish task #69012.
|
2022-09-14 08:51:17 +00:00 |
|
|
刘刚
|
ef75b463b4
|
Merge branch 'sprint/239_liugang_68996' into 'zentaopms_239'
* Finish task #68996.
See merge request easycorp/zentaopms!5326
|
2022-09-14 08:41:39 +00:00 |
|
|
liuruogu
|
41fad5460c
|
* Finish task #69012.
|
2022-09-14 08:41:29 +00:00 |
|
|
liugang
|
6d750abaf0
|
* Finish task #68996.
|
2022-09-14 16:37:27 +08:00 |
|
|
liuruogu
|
d6c8e4d1d9
|
* Finish task #69012.
|
2022-09-14 08:37:20 +00:00 |
|
|
刘刚
|
975d5c13cf
|
Merge branch 'zentaopms_239_tanghucheng_69000' into 'zentaopms_239'
* Finish task #69000.
See merge request easycorp/zentaopms!5325
|
2022-09-14 08:19:55 +00:00 |
|
|
tanghucheng
|
8045b87d5d
|
* Finish task #69000.
|
2022-09-14 16:11:51 +08:00 |
|
|
刘刚
|
c8a1ccac36
|
Merge branch 'sprint/239_liugang_68998' into 'zentaopms_239'
* Finish task #68998.
See merge request easycorp/zentaopms!5324
|
2022-09-14 08:04:18 +00:00 |
|
|
liugang
|
e9ce915eec
|
* Finish task #68998.
|
2022-09-14 16:01:26 +08:00 |
|
|
刘刚
|
7165c60562
|
Merge branch 'sprint/239_liugang_68999' into 'zentaopms_239'
Sprint/239 liugang 68999
See merge request easycorp/zentaopms!5322
|
2022-09-14 06:57:50 +00:00 |
|
|
liugang
|
e885261255
|
* Don't display the shadow products when create a project, see task #68999.
|
2022-09-14 14:52:45 +08:00 |
|
|
liugang
|
e3c1cd99c8
|
* The project hasn't product don't related with the normal products.
|
2022-09-14 14:43:01 +08:00 |
|
|
liugang
|
b45b3e3661
|
* Finish task #68999.
|
2022-09-14 14:07:00 +08:00 |
|
|
liugang
|
4a7986fa00
|
* Add lang items of the hasProduct field of project.
|
2022-09-14 10:57:51 +08:00 |
|
|
liugang
|
fd873696f5
|
* Add lang items for the shadow field.
|
2022-09-14 10:40:40 +08:00 |
|
|
刘刚
|
2fd1b37549
|
Merge branch 'sprint/239_liugang_database' into 'zentaopms_239'
* Add sql to update 17.6.1.
See merge request easycorp/zentaopms!5314
|
2022-09-14 00:53:02 +00:00 |
|
|
liugang
|
5f17eee996
|
* Add sql to update 17.6.1.
|
2022-09-14 08:48:41 +08:00 |
|
|
wangyidong
|
2ba29dd574
|
* adjust for effort when restart task.
|
2022-09-13 13:04:01 +08:00 |
|
|
孙广明
|
11a2cee3ed
|
Merge branch 'revert-32119ec2' into 'master'
Revert "* Add task effort report."
See merge request easycorp/zentaopms!5308
|
2022-09-13 03:29:36 +00:00 |
|
|
孙广明
|
648efad24f
|
Revert "* Add task effort report."
This reverts commit 32119ec28d
|
2022-09-13 03:29:20 +00:00 |
|
|
孙广明
|
32119ec28d
|
* Add task effort report.
|
2022-09-13 11:25:31 +08:00 |
|
|
wangyidong
|
070d0404b6
|
* fix bug for activate multi mode task.
|
2022-09-13 11:21:22 +08:00 |
|
|
wangyidong
|
f743da3ddc
|
* fix bug.
|
2022-09-13 11:04:04 +08:00 |
|
|
孙广明
|
65b1d28408
|
* Code for recordestimate view.
|
2022-09-13 10:55:29 +08:00 |
|
|
wangyidong
|
d88700a2e7
|
* adjust for notice manage task team.
|
2022-09-13 10:35:56 +08:00 |
|
|
王怡栋
|
f89811bc86
|
Merge branch 'sprint/237_liumengyi_27450' into 'master'
* Fix bug #27450.
See merge request easycorp/zentaopms!5304
|
2022-09-09 08:37:28 +00:00 |
|
|
王怡栋
|
f78fdce043
|
Merge branch 'sprint/tianshujie_bug' into 'master'
Sprint/tianshujie bug
See merge request easycorp/zentaopms!5305
|
2022-09-09 08:37:15 +00:00 |
|
|
tianshujie
|
226029f1e5
|
* Fix bug #27451.
|
2022-09-09 16:34:08 +08:00 |
|
|
李玉春
|
a18ef37303
|
Merge branch 'testta_ly' into 'master'
Testta ly
See merge request easycorp/zentaopms!5303
|
2022-09-09 08:25:42 +00:00 |
|
|
liyang
|
cbfe513c5b
|
* Add methods comment.
|
2022-09-09 16:23:28 +08:00 |
|
|
李玉春
|
8e69bd23d7
|
Merge branch 'cyy_api' into 'master'
* Fix bug #27158.
See merge request easycorp/zentaopms!5297
|
2022-09-09 08:15:19 +00:00 |
|
|
liumengyi
|
46a7c7f409
|
* Fix bug #27450.
|
2022-09-09 16:14:16 +08:00 |
|
|
wangyidong
|
0881e39c54
|
* adjust for multi task.
|
2022-09-09 16:14:08 +08:00 |
|
|
liyang
|
3251d92f47
|
* Fix config of unittest.
|
2022-09-09 16:10:46 +08:00 |
|
|
tianshujie
|
b5630098eb
|
* Fix bug #27449.
|
2022-09-09 16:10:34 +08:00 |
|
|
liyang
|
4e10ea8fe6
|
* Fix code format.
|
2022-09-09 16:05:02 +08:00 |
|
|
tianshujie
|
03f858361d
|
* Fix bug #27448.
|
2022-09-09 15:57:58 +08:00 |
|
|
liyang
|
d1fe734dc6
|
+ Add create api test.
|
2022-09-09 15:54:59 +08:00 |
|
|
liyang
|
e59f8d97e4
|
* Fix api test.
|
2022-09-09 15:53:45 +08:00 |
|
|
wangyidong
|
4bd3d07e34
|
Merge branch 'sprint/237_liumengyi_fixbug'
|
2022-09-09 15:19:04 +08:00 |
|
|
王怡栋
|
b1c87862f2
|
Merge branch 'master' into 'sprint/237_liumengyi_fixbug'
# Conflicts:
# module/doc/css/createbasicinfo.css
|
2022-09-09 07:18:21 +00:00 |
|