 wangyidong
|
b36704de4a
|
Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240
|
2022-09-16 15:01:10 +08:00 |
|
|
wangyidong
|
633266d9e5
|
* fix bug #27012.
|
2022-09-16 14:58:54 +08:00 |
|
|
王怡栋
|
51774085f2
|
Merge branch 'sprint/zentaopms240_wangyuting' into 'sprint/zentaopms240'
* Fix noMergedSprints data bug.
See merge request easycorp/zentaopms!5376
|
2022-09-16 06:33:05 +00:00 |
|
|
王怡栋
|
d8ca080504
|
Merge branch 'sprint/zentaopms240_daitingting_optimize' into 'sprint/zentaopms240'
* Optimize codes.
See merge request easycorp/zentaopms!5377
|
2022-09-16 06:29:42 +00:00 |
|
|
daitingting
|
4964be7b3b
|
* Optimize codes.
|
2022-09-16 06:21:58 +00:00 |
|
|
王怡栋
|
ac06f7eaa3
|
Merge branch 'sprint/daitingting_task_69253' into 'sprint/zentaopms240'
* Adjust language.
See merge request easycorp/zentaopms!5366
|
2022-09-16 06:21:07 +00:00 |
|
|
wangyuting2
|
fc48995990
|
* Fix noMergedSprints data bug.
|
2022-09-16 06:10:54 +00:00 |
|
|
daitingting
|
c44bc35ec6
|
* Adjust language.
|
2022-09-16 02:38:51 +00:00 |
|
|
王怡栋
|
a877bfca1a
|
Merge branch 'sprint/daitingting_task_69245' into 'sprint/zentaopms240'
* Finish task #69245.
See merge request easycorp/zentaopms!5363
|
2022-09-16 02:28:53 +00:00 |
|
|
daitingting
|
e8481ba4a2
|
* Finish task #69245.
|
2022-09-16 02:02:50 +00:00 |
|
|
wangyuting2
|
9e9dea5ae5
|
Merge branch 'sprint/zentaopms240_#task69256' into sprint/zentaopms240
|
2022-09-16 01:34:51 +00:00 |
|
|
wangyuting2
|
3d54c6ea82
|
* Finish task #69256.
|
2022-09-16 01:25:47 +00:00 |
|
|
daitingting
|
fe13c4de38
|
* Doing task #69253.
|
2022-09-16 01:02:13 +00:00 |
|
|
王怡栋
|
d11da740d2
|
Merge branch 'sprint/zentaopms240_#task69256' into 'sprint/zentaopms240'
* Add selectmergemode page.
See merge request easycorp/zentaopms!5341
|
2022-09-15 03:25:04 +00:00 |
|
|
wangyuting2
|
74a5adef7d
|
* Optimize code.
|
2022-09-15 03:22:36 +00:00 |
|
|
wangyuting2
|
392aa32c00
|
* Add selectmergemode page.
|
2022-09-15 03:11:09 +00:00 |
|
|
王怡栋
|
4a3dae1ebc
|
Merge branch 'fixbug' into 'master'
* Fix bug for bug export.
See merge request easycorp/zentaopms!5320
|
2022-09-14 06:46:24 +00:00 |
|
|
tanghucheng
|
714dffe615
|
* Fix bug for bug export.
|
2022-09-14 14:42:44 +08:00 |
|
|
wangyidong
|
8db145922d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-09-14 13:40:05 +08:00 |
|
|
wangyidong
|
2b75baa004
|
* fix bug #27472.
|
2022-09-14 13:39:40 +08:00 |
|
|
胡方舟
|
a5b3f9ba64
|
Merge branch 'sprint/tianshujie_bug' into 'master'
* Fix the problem that Kanban cannot be loaded.
See merge request easycorp/zentaopms!5319
|
2022-09-14 05:02:31 +00:00 |
|
|
tianshujie
|
9e84862b3f
|
* Fix the problem that Kanban cannot be loaded.
|
2022-09-14 11:49:02 +08:00 |
|
|
sunguangming
|
3b8b7d2681
|
* Add lang 'my' to task.
|
2022-09-14 08:57:53 +08:00 |
|
|
wangyidong
|
383bee843a
|
* adjust for delete effort logic.
|
2022-09-13 17:22:13 +08:00 |
|
|
wangyidong
|
0e46ac4a91
|
* fix bug #27468.
|
2022-09-13 16:36:32 +08:00 |
|
|
李玉春
|
94ef3611c7
|
Merge branch 'dht_unittest' into 'master'
Add api control.
See merge request easycorp/zentaopms!5312
|
2022-09-13 08:31:56 +00:00 |
|
|
denghongtao
|
1de133a79b
|
* Fix notes.
|
2022-09-13 08:28:16 +00:00 |
|
|
denghongtao
|
f2dc224448
|
* Fix controlapi.
|
2022-09-13 08:17:55 +00:00 |
|
|
denghongtao
|
ad5663c09d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into dht_unittest
|
2022-09-13 07:32:53 +00:00 |
|
|
denghongtao
|
d9e152b444
|
Add api control.
|
2022-09-13 07:31:36 +00:00 |
|
|
wangyidong
|
ee148d3a0e
|
* fix bug #27447.
|
2022-09-13 15:29:55 +08:00 |
|
|
wangyidong
|
036dd79243
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-09-13 13:58:54 +08:00 |
|
|
wangyidong
|
3dc0abf2d1
|
* adjust for check effort consumed.
|
2022-09-13 13:58:13 +08:00 |
|
|
王怡栋
|
13166c511a
|
Merge branch 'sprint/lanzongjun_testunit' into 'master'
* add feedback test data
See merge request easycorp/zentaopms!5307
|
2022-09-13 05:48:36 +00:00 |
|
|
王怡栋
|
84b130e617
|
Merge branch 'master_xieqiyu_27445' into 'master'
* Fix bug#27445.
See merge request easycorp/zentaopms!5306
|
2022-09-13 05:48:16 +00:00 |
|
|
王怡栋
|
9b8f83adaf
|
Merge branch 'sprint/daitingting_bug_27272' into 'master'
* Fix bug #27272.
See merge request easycorp/zentaopms!5310
|
2022-09-13 05:45:50 +00:00 |
|
|
wangyidong
|
09694f3751
|
* adjust for edit effort.
|
2022-09-13 13:37:13 +08:00 |
|
|
daitingting
|
164eaacf30
|
* Fix bug #27272.
|
2022-09-13 05:34:48 +00:00 |
|
|
wangyidong
|
0142653d2b
|
* adjust lang.
|
2022-09-13 13:21:14 +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 |
|
|
lanzongjun
|
9868aee96b
|
* add feedback data
|
2022-09-09 17:00:44 +08:00 |
|
|
xieqiyu
|
638586bea2
|
* Fix bug#27445.
|
2022-09-09 16:44:09 +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 |
|