 王怡栋
|
e5dc2e2f59
|
Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167
|
2021-10-18 10:20:31 +08:00 |
|
|
王怡栋
|
621eecf52c
|
* adjust for execution action list.
|
2021-10-18 10:18:40 +08:00 |
|
|
zhujinyong
|
abc5c4a302
|
* Fix code error.
|
2021-10-18 09:20:56 +08:00 |
|
|
zhujinyong
|
7ec9315a9b
|
Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167
|
2021-10-18 09:18:48 +08:00 |
|
|
zhujinyong
|
4fe24e06a5
|
+ Add test for api.
|
2021-10-18 09:18:19 +08:00 |
|
|
李玉春
|
1ee2b61d95
|
Merge branch 'sprint/167_xieqiyu_15457' into 'sprint/167'
* Fix bug#15457.
See merge request easycorp/zentaopms!78
|
2021-10-18 01:17:58 +00:00 |
|
|
王怡栋
|
72c92b6b0d
|
* fix error.
|
2021-10-18 09:06:48 +08:00 |
|
|
王怡栋
|
5e0ac98809
|
Merge branch 'sprint/167_wangyidong' into sprint/167
|
2021-10-18 08:53:30 +08:00 |
|
|
王怡栋
|
351b07352b
|
Merge branch '15.6' into sprint/167
|
2021-10-18 08:53:13 +08:00 |
|
|
王怡栋
|
68cd0eb2f9
|
Merge branch '15.6' into sprint/167_wangyidong
|
2021-10-18 08:44:13 +08:00 |
|
|
xieqiyu
|
3e8e0dbcce
|
* Fix bug#15457.
|
2021-10-16 15:32:13 +08:00 |
|
|
xieqiyu
|
21ad4ecf0a
|
* Code for bug#15543.Modify the consumed hours of the project in the block.
|
2021-10-16 08:27:28 +08:00 |
|
|
王怡栋
|
d4c32965e2
|
* adjust for zui.
|
2021-10-15 17:20:51 +08:00 |
|
|
朱金勇
|
2864a8301c
|
Merge branch 'sprint/167_sunhao/task43181' into 'sprint/167'
* Task #43181, bug #15371, fix nest toggle in program table not work when...
See merge request easycorp/zentaopms!77
|
2021-10-15 09:03:35 +00:00 |
|
|
Hao Sun
|
1fbf34f9bc
|
* Task #43181, bug #15371, fix nest toggle in program table not work when close program dialog first time.
|
2021-10-15 15:31:30 +08:00 |
|
|
xieqiyu
|
5cd2f5d2db
|
* Code for bug#15543.
|
2021-10-15 14:45:01 +08:00 |
|
|
李玉春
|
88323d34da
|
Merge branch 'sprint/167_hufangzhou_15544' into 'sprint/167'
* Fix bug #15544.
See merge request easycorp/zentaopms!76
|
2021-10-15 06:19:33 +00:00 |
|
|
孙广明
|
e6e578a798
|
Merge branch 'sprint/167_zenggang_15438' into 'sprint/167'
Sprint/167 zenggang 15438
See merge request easycorp/zentaopms!75
|
2021-10-15 06:18:16 +00:00 |
|
|
李玉春
|
d27aaff476
|
Merge branch 'sprint/167_tianshujie_15541' into 'sprint/167'
*Fix bug #15541.
See merge request easycorp/zentaopms!74
|
2021-10-15 06:17:55 +00:00 |
|
|
朱金勇
|
1ac68a832d
|
Merge branch 'sprint/167_sunhao/task43195' into 'sprint/167'
* Task #43195, fix project creating guide modal not show as expected sometimes.
See merge request easycorp/zentaopms!73
|
2021-10-15 06:17:06 +00:00 |
|
|
xieqiyu
|
5697ba482a
|
* Fix bug#15543.
|
2021-10-15 14:13:41 +08:00 |
|
|
hufangzhou
|
dc8317d122
|
* Fix bug #15544.
|
2021-10-15 14:11:42 +08:00 |
|
|
zenggang
|
4c800f938a
|
* Adjust code
|
2021-10-15 06:09:32 +00:00 |
|
|
tianshujie
|
ae5003bde1
|
* Fix bug #15541.
|
2021-10-15 13:57:42 +08:00 |
|
|
tianshujie
|
d9ffc89d5e
|
* Fix bug #15541.
|
2021-10-15 13:57:27 +08:00 |
|
|
朱金勇
|
733d12bab4
|
Merge branch 'sprint/167_sunhao/task43183' into 'sprint/167'
* Task #43183, bug #15163, make tutorial tooltip visible in small screen.
See merge request easycorp/zentaopms!72
|
2021-10-15 05:57:04 +00:00 |
|
|
王怡栋
|
3989c71b3f
|
* fix for large size session.
|
2021-10-15 13:38:05 +08:00 |
|
|
王怡栋
|
8ee2811723
|
Merge branch '15.6' into sprint/167
|
2021-10-15 13:11:52 +08:00 |
|
|
Hao Sun
|
d8327a0cdc
|
* Task #43195, fix project creating guide modal not show as expected sometimes.
|
2021-10-15 11:18:37 +08:00 |
|
|
Hao Sun
|
b12524d17b
|
* task #43183, bug #15163, make tutorial tooltip visible in small screen.
|
2021-10-15 10:35:52 +08:00 |
|
|
李玉春
|
fae6d95bfe
|
Merge branch 'sprint/167_tianshujie_43169' into 'sprint/167'
*Finish task #43169
See merge request easycorp/zentaopms!71
|
2021-10-15 01:32:39 +00:00 |
|
|
李玉春
|
83f19c2b65
|
Merge branch 'sprint/167_tianshujie_43190' into 'sprint/167'
* Finish task #43190.
See merge request easycorp/zentaopms!69
|
2021-10-15 01:31:16 +00:00 |
|
|
tianshujie
|
4d8095c106
|
* Finish task #43169.
|
2021-10-15 09:28:50 +08:00 |
|
|
朱金勇
|
e50c3c65d9
|
Merge branch 'sprint/167_zenggang_43179' into 'sprint/167'
* Finish task#43179
See merge request easycorp/zentaopms!49
|
2021-10-15 01:05:33 +00:00 |
|
|
xieqiyu
|
8e38b12360
|
* Code for bug#14879.
|
2021-10-15 08:06:44 +08:00 |
|
|
zenggang
|
cae0dba070
|
* Fix bug15438 for classic mode
|
2021-10-14 09:32:03 +00:00 |
|
|
tianshujie
|
943bb6be59
|
Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into 167
|
2021-10-14 17:16:34 +08:00 |
|
|
zhujinyong
|
22dab31b5f
|
Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167
|
2021-10-14 17:10:32 +08:00 |
|
|
zhujinyong
|
b3cfb77e0b
|
+ Add api test.
|
2021-10-14 17:10:11 +08:00 |
|
|
tianshujie
|
f0bd7efdef
|
* Finish task #43190.
|
2021-10-14 16:42:04 +08:00 |
|
|
tianshujie
|
1f7e26303a
|
* Adjust css.
|
2021-10-14 16:38:11 +08:00 |
|
|
王怡栋
|
03df63c20c
|
Merge branch '15.6' into sprint/167
|
2021-10-14 16:21:40 +08:00 |
|
|
xieqiyu
|
140f2f88c8
|
* Fix bug#15524.
|
2021-10-14 16:17:01 +08:00 |
|
|
hufangzhou
|
0541e5a87c
|
* Code for bug #15518.
|
2021-10-14 16:01:31 +08:00 |
|
|
王怡栋
|
a44472fb45
|
Merge branch '15.6' into sprint/167
|
2021-10-14 15:48:14 +08:00 |
|
|
hufangzhou
|
e6640c6f2c
|
Merge branch '15.6' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.6
|
2021-10-14 15:46:54 +08:00 |
|
|
hufangzhou
|
ac5781d88f
|
* Fix bug #15528.
|
2021-10-14 15:46:50 +08:00 |
|
|
xieqiyu
|
b7da8b63b3
|
* Code for bug#15513.
|
2021-10-14 15:32:37 +08:00 |
|
|
王怡栋
|
5861134df5
|
Merge branch 'sprint/sgm_fix_bug' into 'sprint/167'
* Fix story review bug.
See merge request easycorp/zentaopms!68
|
2021-10-14 07:15:48 +00:00 |
|
|
tianshujie
|
91f8db484c
|
* Fix bug #15511.
|
2021-10-14 15:09:20 +08:00 |
|