 曹延义
|
3ce6ca1f4f
|
Merge branch 'master' into sprint/247
|
2022-10-19 15:21:14 +08:00 |
|
|
孙广明
|
af6634eaad
|
Merge branch 'biz13_mayue_bug#28666' into 'master'
* Fix bug #28666.
See merge request easycorp/zentaopms!5809
|
2022-10-19 07:17:43 +00:00 |
|
|
孙广明
|
7746006ecf
|
Merge branch 'sprint/hufangzhou_sql' into 'master'
* Adjust the type of fields.
See merge request easycorp/zentaopms!5808
|
2022-10-19 07:17:29 +00:00 |
|
|
mayue
|
1221260f0b
|
* Fix bug #28666.
|
2022-10-19 15:13:16 +08:00 |
|
|
hufangzhou
|
ee0a444bde
|
* Adjust the type of fields.
|
2022-10-19 06:48:45 +00:00 |
|
|
王怡栋
|
171ad26855
|
Merge branch 'master_feedback_1133' into 'master'
* Adjust the code format.
See merge request easycorp/zentaopms!5805
|
2022-10-19 06:21:49 +00:00 |
|
|
liuhong
|
a7765cfae8
|
* Adjust the code format.
|
2022-10-19 06:13:35 +00:00 |
|
|
王怡栋
|
cb645f4d50
|
Merge branch 'tanghucheng_feedback_module' into 'master'
* Fix bug #28639.
See merge request easycorp/zentaopms!5801
|
2022-10-19 06:11:24 +00:00 |
|
|
王怡栋
|
5b4be9a502
|
Merge branch 'sprint/hufangzhou_langItem' into 'master'
* Added empty row for alignment.
See merge request easycorp/zentaopms!5802
|
2022-10-19 06:10:49 +00:00 |
|
|
hufangzhou
|
10c07b964f
|
* Added empty row for alignment.
|
2022-10-19 06:06:26 +00:00 |
|
|
tanghucheng
|
14f82baf7e
|
* Fix bug #28639.
|
2022-10-19 13:57:00 +08:00 |
|
|
王怡栋
|
37671824c5
|
Merge branch 'sprint/hufangzhou_newVersion' into 'master'
* Add the new version.
See merge request easycorp/zentaopms!5798
|
2022-10-19 05:49:17 +00:00 |
|
|
hufangzhou
|
d3f7df5518
|
* Add the new version.
|
2022-10-19 05:41:40 +00:00 |
|
|
王怡栋
|
cdb458bb9f
|
Merge branch 'master_feedback_1133' into 'master'
*Fix feedback #1133 for waterfall project choose stagefilteri with Related pages.
See merge request easycorp/zentaopms!5796
|
2022-10-19 05:29:12 +00:00 |
|
|
王怡栋
|
7497d48e95
|
Merge branch 'tanghucheng_feedback_module' into 'master'
* Fix bug #28647.
See merge request easycorp/zentaopms!5793
|
2022-10-19 05:18:05 +00:00 |
|
|
李玉春
|
a18bb50ef9
|
Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
* Fixed maintenance task team style issues.
See merge request easycorp/zentaopms!5795
|
2022-10-19 05:13:36 +00:00 |
|
|
liuhong
|
db48df1bb5
|
*Fix feedback #1133 for waterfall project choose stagefilteri with Related pages.
|
2022-10-19 05:09:01 +00:00 |
|
|
李玉春
|
ce25b34848
|
Merge branch 'sprint/247_fix_wangzemei' into 'master'
* fix 28395 28640 28406
See merge request easycorp/zentaopms!5794
|
2022-10-19 05:02:08 +00:00 |
|
|
tianshujie
|
056358363d
|
* Fixed maintenance task team style issues.
|
2022-10-19 11:56:03 +08:00 |
|
|
tanghucheng
|
30bf3b8d3d
|
* Add language for tree.
|
2022-10-19 11:25:31 +08:00 |
|
|
wangzemei
|
68f702d9ef
|
* fix 28395 28640 28406
|
2022-10-19 11:07:04 +08:00 |
|
|
tanghucheng
|
7959557283
|
* Fix bug #28647.
|
2022-10-19 11:05:35 +08:00 |
|
|
wangyidong
|
07699b5ea4
|
Merge branch 'tanghucheng_feedback_module'
|
2022-10-19 09:36:42 +08:00 |
|
|
王怡栋
|
e093a27d20
|
Merge branch 'master' into 'tanghucheng_feedback_module'
# Conflicts:
# db/update17.6.2.sql
|
2022-10-19 01:36:16 +00:00 |
|
|
tanghucheng
|
484cffa1a1
|
* Add ticket module.
|
2022-10-19 09:33:26 +08:00 |
|
|
李玉春
|
ada905ca46
|
Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
* Fix bug #28573.
See merge request easycorp/zentaopms!5787
|
2022-10-19 01:14:12 +00:00 |
|
|
wangyidong
|
7f0199715c
|
Merge branch 'sprint/zentaobiz14_feedback_lanzongjun'
|
2022-10-19 08:30:14 +08:00 |
|
|
王怡栋
|
6e9fd55261
|
Merge branch 'master' into 'sprint/zentaobiz14_feedback_lanzongjun'
# Conflicts:
# db/update17.6.2.sql
|
2022-10-19 00:29:18 +00:00 |
|
|
lanzongjun
|
c452bd3595
|
task #72131
|
2022-10-19 08:27:20 +08:00 |
|
|
王怡栋
|
dfe8483aea
|
Merge branch 'tanghucheng_feedback_module' into 'master'
* Fix bug #28624.
See merge request easycorp/zentaopms!5786
|
2022-10-19 00:26:33 +00:00 |
|
|
tianshujie
|
80ee6fb2b1
|
* Fix bug #28573.
|
2022-10-19 08:25:02 +08:00 |
|
|
tanghucheng
|
9ea2d135b3
|
* Fix bug #28624.
|
2022-10-18 17:29:34 +08:00 |
|
|
lanzongjun
|
7469bebf0a
|
task #72131
|
2022-10-18 16:53:10 +08:00 |
|
|
孙广明
|
412c1a68fe
|
Merge branch 'zentaobiz_zhouxin_ticket' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!5784
|
2022-10-18 07:56:51 +00:00 |
|
|
王怡栋
|
9264c95e92
|
Merge branch 'master_feedback_1133' into 'master'
*Finish feedback #1133.
See merge request easycorp/zentaopms!5780
|
2022-10-18 07:37:04 +00:00 |
|
|
王怡栋
|
609b495662
|
Merge branch 'tanghucheng_feedback_module' into 'master'
* Finish task #72201,72130,72129.
See merge request easycorp/zentaopms!5783
|
2022-10-18 07:35:05 +00:00 |
|
|
zhouxin
|
efbbc8a15e
|
* Fix bug.
|
2022-10-18 15:34:05 +08:00 |
|
|
tanghucheng
|
6c063505d6
|
Merge branch 'master' into tanghucheng_feedback_module
|
2022-10-18 15:33:45 +08:00 |
|
|
tanghucheng
|
6ed33f54dc
|
* Adjust modify comments.
|
2022-10-18 15:31:42 +08:00 |
|
|
李玉春
|
15dd3816e2
|
Merge branch 'master_72367' into 'master'
* task #72367, fix modal style.
See merge request easycorp/zentaopms!5778
|
2022-10-18 07:11:47 +00:00 |
|
|
李玉春
|
3f1c694f2e
|
Merge branch 'sprint/247_tianshujie_72348' into 'sprint/247'
Sprint/247 tianshujie 72348
See merge request easycorp/zentaopms!5782
|
2022-10-18 07:09:58 +00:00 |
|
|
tanghucheng
|
ccd017af47
|
* Finish task #72201,72130,72129.
|
2022-10-18 15:04:35 +08:00 |
|
|
tianshujie
|
8bbf77788a
|
* Finish task #72348.
|
2022-10-18 14:34:29 +08:00 |
|
|
liuhong
|
d7bb46cda5
|
*Finish feedback #1133.
|
2022-10-18 05:46:27 +00:00 |
|
|
李玉春
|
a3104fec30
|
Merge branch 'sprint/247_wzm_72349' into 'master'
Sprint/247 wzm 72349
See merge request easycorp/zentaopms!5774
|
2022-10-18 05:11:01 +00:00 |
|
|
wangzemei
|
9eb84fcc4e
|
* modify format
|
2022-10-18 13:06:15 +08:00 |
|
|
孙广明
|
df46b27efa
|
Merge branch 'sprint/scx_modifyapi' into 'master'
* Taskrecordestimate get function return empty stdclass if task have not estimate.
See merge request easycorp/zentaopms!5775
|
2022-10-18 03:17:51 +00:00 |
|
|
dingyongliang
|
7b24f667aa
|
* task #72367, fix modal style.
|
2022-10-18 02:53:44 +00:00 |
|
|
王怡栋
|
2ca0f0cf0c
|
Merge branch 'sprint/247' into 'master'
Sprint/247
See merge request easycorp/zentaopms!5757
|
2022-10-18 02:01:53 +00:00 |
|
|
王怡栋
|
c46e0d5c7b
|
Merge branch 'sprint/cdq_codereview' into 'master'
* code review
See merge request easycorp/zentaopms!5773
|
2022-10-18 01:58:03 +00:00 |
|