 zhujinyong
|
e71094decc
|
* Fix code style.
|
2022-05-19 15:56:19 +08:00 |
|
|
zhujinyong
|
abc5364d45
|
Merge branch 'sprint/189_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint_189
|
2022-05-19 15:53:09 +08:00 |
|
|
zhujinyong
|
6f46cbfb0c
|
* Add approval sql.
|
2022-05-19 15:52:41 +08:00 |
|
|
李玉春
|
1ada06c384
|
Merge branch 'sprint/189_liumengyi_fixbug' into 'sprint/189_package'
* Fix bug #22689.
See merge request easycorp/zentaopms!3521
|
2022-05-19 07:44:36 +00:00 |
|
|
liumengyi
|
47ec417f16
|
* Fix bug #22689.
|
2022-05-19 15:39:10 +08:00 |
|
|
wangyidong
|
8c4931f287
|
* hold files.
|
2022-05-19 13:49:07 +08:00 |
|
|
王怡栋
|
557304ec0b
|
Merge branch 'sprint/189_hufangzhou_updatemax' into 'sprint/189_package'
* Add the upgrade program of max.
See merge request easycorp/zentaopms!3510
|
2022-05-19 05:34:50 +00:00 |
|
|
wangyidong
|
f289e08b9d
|
* use buildOperateMenu method for build and projectrelease module.
|
2022-05-19 13:34:02 +08:00 |
|
|
hufangzhou
|
c1186efeda
|
* Add the upgrade program of max.
|
2022-05-19 13:07:30 +08:00 |
|
|
王怡栋
|
8e0d809caa
|
Merge branch 'sprint/daitingting_189_package' into 'sprint/189_package'
* Add relations params for buildActionMenu.
See merge request easycorp/zentaopms!3486
|
2022-05-19 00:58:05 +00:00 |
|
|
王怡栋
|
1390db9b95
|
Merge branch 'sprint/189_hufangzhou_22637' into 'sprint/189_package'
* Fix bug #22637.
See merge request easycorp/zentaopms!3492
|
2022-05-19 00:56:19 +00:00 |
|
|
hufangzhou
|
82c4eba324
|
* Fix bug #22637.
|
2022-05-18 16:36:34 +08:00 |
|
|
daitingting
|
cd6698cc9b
|
* Add relations params for buildActionMenu.
|
2022-05-18 07:38:45 +00:00 |
|
|
wangyidong
|
13202156b3
|
* fix bug #22631.
|
2022-05-18 15:18:40 +08:00 |
|
|
王怡栋
|
0f6e2aca05
|
Merge branch 'sprint/189_hufangzhou_changelog' into 'sprint/189_package'
* Add the changelog.
See merge request easycorp/zentaopms!3482
|
2022-05-18 06:19:50 +00:00 |
|
|
hufangzhou
|
bf2756a2e2
|
* Add the changelog.
|
2022-05-18 14:18:23 +08:00 |
|
|
王怡栋
|
276d1b2197
|
Merge branch 'sprint/189_package_lanzongjun' into 'sprint/189_package'
* fix bug #22570
See merge request easycorp/zentaopms!3477
|
2022-05-18 05:35:22 +00:00 |
|
|
lanzongjun
|
867152e2bc
|
* fix bug #22570
|
2022-05-18 13:33:54 +08:00 |
|
|
lanzongjun
|
ece8976470
|
* fix bug #22570
|
2022-05-18 13:20:43 +08:00 |
|
|
wangyidong
|
cceff98fd5
|
* Add id for post data.
|
2022-05-18 10:47:23 +08:00 |
|
|
王怡栋
|
94f34f045f
|
Merge branch 'sprint/189_wangyuting_fixbug#22573' into 'sprint/189_package'
* Fix bug #22573.
See merge request easycorp/zentaopms!3464
|
2022-05-18 01:51:43 +00:00 |
|
|
wangyuting2
|
04041e6fb5
|
* Fix bug #22572.
|
2022-05-18 09:41:15 +08:00 |
|
|
wangyuting2
|
af47d16938
|
* Fix bug #22573.
|
2022-05-18 09:27:14 +08:00 |
|
|
孙广明
|
d6a88be36e
|
Merge branch 'cherry-pick-67052054' into 'sprint/189_package'
Merge branch 'sprint/wangyuting_fixbug_22520' into 'master'
See merge request easycorp/zentaopms!3457
|
2022-05-18 00:47:35 +00:00 |
|
|
王怡栋
|
5278958100
|
Merge branch 'sprint/189_package_lanzongjun' into 'sprint/189_package'
* fix bug #22570
See merge request easycorp/zentaopms!3459
|
2022-05-18 00:43:53 +00:00 |
|
|
lanzongjun
|
6e0e9d2348
|
* fix bug #22570
|
2022-05-18 08:43:08 +08:00 |
|
|
王怡栋
|
54fb1db3e5
|
Merge branch 'sprint/daitingting_buildFlow' into 'sprint/189_package'
* Build flow menu.
See merge request easycorp/zentaopms!3460
|
2022-05-18 00:36:17 +00:00 |
|
|
daitingting
|
244f061700
|
* Build flow menu.
|
2022-05-17 09:14:29 +00:00 |
|
|
lanzongjun
|
54db8e3f91
|
Merge branch 'sprint/189_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/189_package
|
2022-05-17 17:13:30 +08:00 |
|
|
lanzongjun
|
10eebbd136
|
* fix bug #22570
|
2022-05-17 17:13:17 +08:00 |
|
|
wangyidong
|
415d9ed538
|
* adjust for merge master code.
|
2022-05-17 17:12:12 +08:00 |
|
|
王怡栋
|
59ad893467
|
Merge branch 'sprint/189_wangyuting_fixbug' into 'sprint/189_package'
* Fix buildOperateMenu bug.
See merge request easycorp/zentaopms!3456
|
2022-05-17 09:00:20 +00:00 |
|
|
wangyuting2
|
f5638d6481
|
* Fix buildOperateMenu bug.
|
2022-05-17 16:56:25 +08:00 |
|
|
王怡栋
|
ebd8840dbb
|
Merge branch 'sprint/wangyuting_fixbug_22520' into 'master'
* Fix bug #22520
See merge request easycorp/zentaopms!3435
(cherry picked from commit 670520548f)
faf8ee28 * Fix bug #22520
|
2022-05-17 08:49:15 +00:00 |
|
|
王怡栋
|
9ca1be70c7
|
Merge branch '189_tanghucheng_fixbug' into 'sprint/189_package'
* Fix bug.
See merge request easycorp/zentaopms!3442
|
2022-05-17 07:28:08 +00:00 |
|
|
tanghucheng
|
d3dc4ebe43
|
* Fix bug.
|
2022-05-17 06:00:26 +00:00 |
|
|
wangyidong
|
f9b06ea3f9
|
* adjust for workflow field name.
|
2022-05-17 13:50:20 +08:00 |
|
|
wangyidong
|
b86fb91604
|
* adjust for storyClosedReason field.
|
2022-05-17 10:53:43 +08:00 |
|
|
王怡栋
|
166ef2e441
|
Merge branch '189package_xieqiyu_22496' into 'sprint/189_package'
* Fix bug#22496.
See merge request easycorp/zentaopms!3430
|
2022-05-16 09:24:58 +00:00 |
|
|
xieqiyu
|
12844f3dc8
|
* Fix bug#22496.
|
2022-05-16 16:39:10 +08:00 |
|
|
wangyidong
|
759ace3700
|
* code for task #54026.
|
2022-05-16 16:36:04 +08:00 |
|
|
wangyidong
|
f1702375c1
|
* adjust for action position field.
|
2022-05-16 15:29:25 +08:00 |
|
|
wangyidong
|
7e80b5a6f7
|
Merge branch 'devplat16_wangyidong_54037' into sprint/189_package
|
2022-05-16 15:24:21 +08:00 |
|
|
王怡栋
|
cdd560f7ba
|
Merge branch 'sprint/189_package' into 'devplat16_wangyidong_54037'
# Conflicts:
# db/update16.5.sql
|
2022-05-16 07:23:27 +00:00 |
|
|
wangyidong
|
e51b5309d1
|
* fix bug for api.
|
2022-05-16 14:17:36 +08:00 |
|
|
王怡栋
|
77308c7fc1
|
Merge branch 'sprint/189_hufangzhou_sso' into 'master'
* Fix an error of sso.
See merge request easycorp/zentaopms!3419
|
2022-05-16 05:57:59 +00:00 |
|
|
王怡栋
|
0d87358352
|
Merge branch 'sprint/189_hufangzhou_22250' into 'master'
* Fix bug #22250.
See merge request easycorp/zentaopms!3420
|
2022-05-16 05:57:41 +00:00 |
|
|
王怡栋
|
91829138c4
|
Merge branch 'sprint/master_zhouxudong_22523' into 'master'
* Fix bug #22523.
See merge request easycorp/zentaopms!3421
|
2022-05-16 05:56:10 +00:00 |
|
|
zhouxudong
|
9e4d86d6d8
|
* FIx bug #22523.
|
2022-05-16 05:54:54 +00:00 |
|
|
zhouxudong
|
89a150e856
|
* Fix bug #22523.
|
2022-05-16 05:48:54 +00:00 |
|