Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
41,123 Commits 2 Branches 292 Tags
da5b1d560c67e3d9232fd2a2abd99106706e120c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
王怡栋 da5b1d560c Merge branch 'fixbug' into 'master' 
* Fix bug #23354.

See merge request easycorp/zentaopms!4203
 2022-06-29 00:48:57 +00:00
王怡栋 1d0c857215 Merge branch 'sprint/208_liumengyi_24500' into 'master' 
* Fix bug #24500.

See merge request easycorp/zentaopms!4201
 2022-06-29 00:44:52 +00:00
王怡栋 dde3f2c087 Merge branch 'sprint/208_tianshujie_58560' into 'master' 
* Finish task #58560.

See merge request easycorp/zentaopms!4202
 2022-06-29 00:44:35 +00:00
王怡栋 62fc297642 Merge branch 'sprint/master_zhouxudong_24398' into 'master' 
* Fix bug $24398.

See merge request easycorp/zentaopms!4199
 2022-06-28 09:32:34 +00:00
王怡栋 e05ac602cc Merge branch 'master_xieqiyu_58567' into 'master' 
Master xieqiyu 58567

See merge request easycorp/zentaopms!4197
 2022-06-28 09:31:57 +00:00
王怡栋 11e681d2f7 Merge branch 'sprint/master_zhouxudong_58605' into 'master' 
* Finish task #58605.

See merge request easycorp/zentaopms!4198
 2022-06-28 09:04:34 +00:00
王怡栋 c6a0541e58 Merge branch 'sgm_action' into 'master' 
* Code for action details.

See merge request easycorp/zentaopms!4192
 2022-06-28 08:45:27 +00:00
王怡栋 0de19ab5d3 Merge branch 'sprint/208_liumengyi_fixbug' into 'master' 
* Fix bug #24464.

See merge request easycorp/zentaopms!4191
 2022-06-28 07:32:36 +00:00
wangyidong 4f5b6a6597 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-06-28 15:29:41 +08:00
wangyidong 549bd70626 * code for bug #24381. 2022-06-28 15:29:11 +08:00
王怡栋 f56e26f665 Merge branch 'sgm_action' into 'master' 
* Refactor action getDynamic.

See merge request easycorp/zentaopms!4190
 2022-06-28 07:06:50 +00:00
王怡栋 b3a27bb266 Merge branch 'sprint/master_zhouxudong_57860' into 'master' 
Sprint/master zhouxudong 57860

See merge request easycorp/zentaopms!4189
 2022-06-28 07:05:57 +00:00
王怡栋 afae79d45f Merge branch 'sgm_fixbug' into 'master' 
* Fix bug #24406.

See merge request easycorp/zentaopms!4188
 2022-06-28 06:31:17 +00:00
王怡栋 d642a4238b Merge branch 'sprint/208_tianshujie_58552' into 'master' 
Sprint/208 tianshujie 58552

See merge request easycorp/zentaopms!4187
 2022-06-28 06:30:45 +00:00
王怡栋 4d95909d6e Merge branch 'sprint/208_liumengyi_58558' into 'master' 
* Finish task #58558, #58559.

See merge request easycorp/zentaopms!4186
 2022-06-28 06:22:42 +00:00
王怡栋 708f4ed932 Merge branch 'spritn209_leiyong_adjust_css' into 'master' 
* Adjust CSS.

See merge request easycorp/zentaopms!4182
 2022-06-28 06:03:47 +00:00
王怡栋 f7ab50da63 Merge branch 'master_xieqiyu_58584' into 'master' 
* Finish task#58584.

See merge request easycorp/zentaopms!4183
 2022-06-28 05:48:34 +00:00
王怡栋 c0336de284 Merge branch 'sprint/209_hufangzhou_58569' into 'master' 
* Finish task #58569.

See merge request easycorp/zentaopms!4181
 2022-06-28 05:09:23 +00:00
wangyidong 9215c4f814 Merge branch 'sprint/208_liumengyi_58561' 2022-06-28 13:08:39 +08:00
王怡栋 956c806cf9 Merge branch 'master' into 'sprint/208_liumengyi_58561' 
# Conflicts:
#   db/update17.1.sql
 2022-06-28 05:08:18 +00:00
王怡栋 2875e33357 Merge branch 'sprint/208_liumengyi_58553' into 'master' 
* Finish task #58561.

See merge request easycorp/zentaopms!4179
 2022-06-28 03:52:02 +00:00
王怡栋 394216babf Merge branch 'master_xieqiyu_58603' into 'master' 
* Finish task#58603.

See merge request easycorp/zentaopms!4178
 2022-06-28 03:30:36 +00:00
王怡栋 a1bb9ddb11 Merge branch 'master_xieqiyu_58587' into 'master' 
Master xieqiyu 58587

See merge request easycorp/zentaopms!4176
 2022-06-28 03:30:09 +00:00
王怡栋 742d791e63 Merge branch 'sprint/master_zhouxudong_24410' into 'master' 
* Fix bug #24410.

See merge request easycorp/zentaopms!4173
 2022-06-28 03:28:51 +00:00
王怡栋 3782093a72 Merge branch 'master_xieqiyu_58592' into 'master' 
* Finish task#58592.

See merge request easycorp/zentaopms!4171
 2022-06-28 03:28:34 +00:00
王怡栋 1c45032e88 Merge branch 'sprint/208_tianshujie_58560' into 'master' 
* Finish task #58560.

See merge request easycorp/zentaopms!4174
 2022-06-28 03:28:15 +00:00
王怡栋 1c081420c9 Merge branch 'fixbug' into 'master' 
* Fix bug .

See merge request easycorp/zentaopms!4175
 2022-06-28 02:52:38 +00:00
王怡栋 ba2ad55733 Merge branch 'sprint/209_hufangzhou_58573' into 'master' 
* Finish task #58573.

See merge request easycorp/zentaopms!4170
 2022-06-28 01:52:23 +00:00
王怡栋 b64a75c569 Merge branch 'sgm_fixbug' into 'master' 
* Finish task #59081.

See merge request easycorp/zentaopms!4168
 2022-06-28 01:52:00 +00:00
王怡栋 2f837a3970 Merge branch 'sprint209_leiyong_task_58598' into 'master' 
Sprint209 leiyong task 58598

See merge request easycorp/zentaopms!4167
 2022-06-28 01:42:06 +00:00
王怡栋 e936b42283 Merge branch 'sgm_fixbug' into 'master' 
* Fix product order bug.

See merge request easycorp/zentaopms!4165
 2022-06-28 01:28:24 +00:00
王怡栋 2a940ec8ce Merge branch 'sprint/master_zhouxudong_58575' into 'master' 
Sprint/master zhouxudong 58575

See merge request easycorp/zentaopms!4162
 2022-06-28 01:26:48 +00:00
王怡栋 9734ebdb4e Merge branch 'master_xieqiyu_24304' into 'master' 
* Fix bug#24304.

See merge request easycorp/zentaopms!4164
 2022-06-28 01:18:58 +00:00
王怡栋 2a82c6a6a1 Merge branch 'sprint/master_zhouxudong_58576' into 'master' 
Sprint/master zhouxudong 58576

See merge request easycorp/zentaopms!4163
 2022-06-28 01:05:10 +00:00
王怡栋 47b496c2ad Merge branch 'sprint/workflow' into 'master' 
* Add approval field to zt_workflow.

See merge request easycorp/zentaopms!4161
 2022-06-28 00:47:03 +00:00
王怡栋 a1228db231 Merge branch 'fixbug' into 'master' 
* Fix bug for lite.

See merge request easycorp/zentaopms!4160
 2022-06-28 00:45:56 +00:00
王怡栋 d84d8cac4a Merge branch 'master_xieqiyu_58585' into 'master' 
* Finish task#58585.

See merge request easycorp/zentaopms!4159
 2022-06-28 00:26:01 +00:00
王怡栋 4f90ce5f08 Merge branch 'sprint/206_tianshujie_23955' into 'master' 
Sprint/206 tianshujie 23955

See merge request easycorp/zentaopms!4148
 2022-06-28 00:24:31 +00:00
王怡栋 ff3052113a Merge branch 'sprint/master_zhouxudong_fixbug' into 'master' 
* Fix bug #24368.

See merge request easycorp/zentaopms!4146
 2022-06-27 06:58:04 +00:00
王怡栋 ab8e6f16c3 Merge branch 'sprint/209_hufangzhou_58568' into 'master' 
* Code for task #58568.

See merge request easycorp/zentaopms!4152
 2022-06-27 06:57:05 +00:00
王怡栋 9cb398d47c Merge branch 'sprint/wangyuting_fixbug#23595' into 'master' 
* Fix bug #23595.

See merge request easycorp/zentaopms!4143
 2022-06-27 03:20:31 +00:00
王怡栋 ac517392f4 Merge branch 'sprint/208_tianshujie_58551' into 'master' 
Sprint/208 tianshujie 58551

See merge request easycorp/zentaopms!4145
 2022-06-27 03:19:31 +00:00
王怡栋 7e264db689 Merge branch 'sprint/206_tianshujie_langTools' into 'master' 
* Add tools to automatically generate German and French.

See merge request easycorp/zentaopms!4137
 2022-06-24 05:38:00 +00:00
wangyidong 08be7e66fc Merge branch 'fixbug' 2022-06-24 13:36:07 +08:00
王怡栋 fd82c8d2f1 Merge branch 'master' into 'fixbug' 
# Conflicts:
#   module/weekly/model.php
 2022-06-24 05:35:50 +00:00
王怡栋 fa084d0117 Merge branch 'sprint/205_hufangzhou_dynamic' into 'master' 
* Adjust the spacing of dynamic block and dynamic page.

See merge request easycorp/zentaopms!4139
 2022-06-24 05:34:59 +00:00
王怡栋 b57a5efddb Merge branch 'master_xieqiyu_57869' into 'master' 
* Finish task#57869.

See merge request easycorp/zentaopms!4135
 2022-06-24 05:01:28 +00:00
王怡栋 281c176681 Merge branch 'sgm_fixbug' into 'master' 
Sgm fixbug

See merge request easycorp/zentaopms!4133
 2022-06-24 03:12:17 +00:00
王怡栋 658f322367 Merge branch 'fixbug' into 'master' 
* Fix bug #24197.

See merge request easycorp/zentaopms!4131
 2022-06-24 03:11:16 +00:00
王怡栋 182130e2a1 Merge branch 'sprint/master_zhouxudong_57859' into 'master' 
* Finish task #57859.

See merge request easycorp/zentaopms!4132
 2022-06-24 03:10:53 +00:00
王怡栋 491c882d44 Merge branch 'sprint205_leiyong_bug_24036' into 'master' 
* Fix bug#24036.

See merge request easycorp/zentaopms!4129
 2022-06-24 02:24:28 +00:00
王怡栋 8ad9dea460 Merge branch 'sprint/xuan_106' into 'master' 
Sprint/xuan 106

See merge request easycorp/zentaopms!4126
 2022-06-24 01:35:58 +00:00
王怡栋 f2603f143d Merge branch 'spint/master_zhouxudong_57879' into 'master' 
* Finish task #57879.

See merge request easycorp/zentaopms!4125
 2022-06-24 01:30:35 +00:00
王怡栋 bbe4b01050 Merge branch 'sprint/206_tianshujie_23958' into 'master' 
* Fix bug #23958.

See merge request easycorp/zentaopms!4128
 2022-06-24 01:19:04 +00:00
王怡栋 f922e4c835 Merge branch 'sprint/206_liumengyi_fixbug' into 'master' 
* Fix bug #24246, #24214.

See merge request easycorp/zentaopms!4127
 2022-06-24 01:17:33 +00:00
王怡栋 0b0f026964 Merge branch 'fixbug' into 'master' 
* Fix code format.

See merge request easycorp/zentaopms!4123
 2022-06-24 00:44:51 +00:00
王怡栋 a4e2413206 Merge branch 'sprint205_leiyong_task_57876' into 'master' 
* Finish task#57876.

See merge request easycorp/zentaopms!4121
 2022-06-23 09:28:10 +00:00
王怡栋 399aca3bac Merge branch 'sprint/master_zhouxudong_24173' into 'master' 
* Fix bug #24173.

See merge request easycorp/zentaopms!4117
 2022-06-23 09:27:46 +00:00
王怡栋 176239c74d Merge branch 'master_xieqiyu_57850' into 'master' 
* Code for task#57850.

See merge request easycorp/zentaopms!4122
 2022-06-23 09:27:32 +00:00
王怡栋 19c0ff84f9 Merge branch 'fixbug' into 'master' 
* Code for install max.

See merge request easycorp/zentaopms!4120
 2022-06-23 09:13:18 +00:00
王怡栋 5017af6eb0 Merge branch 'sprint/206_liumengyi_24166' into 'master' 
* Fix bug #24166.

See merge request easycorp/zentaopms!4116
 2022-06-23 08:18:27 +00:00
王怡栋 d0d850c39f Merge branch 'sprint/206_tianshujie_23398' into 'master' 
* Fix bug #23398.

See merge request easycorp/zentaopms!4113
 2022-06-23 08:17:57 +00:00
王怡栋 ac21bc6527 Merge branch 'spint/master_zhouxudong_57879' into 'master' 
* Finish task #57879.

See merge request easycorp/zentaopms!4115
 2022-06-23 08:16:31 +00:00
王怡栋 6ad47c62ca Merge branch 'sprint/master_zhouxudong_24176' into 'master' 
* Fix bug #24176.

See merge request easycorp/zentaopms!4114
 2022-06-23 08:16:07 +00:00
王怡栋 f23d4b8abd Merge branch 'sprint/206_tianshujie_58288' into 'master' 
Sprint/206 tianshujie 58288

See merge request easycorp/zentaopms!4109
 2022-06-23 07:08:36 +00:00
王怡栋 db2f97dd7f Merge branch 'master_xieqiyu_57850' into 'master' 
* Code for task#57850.

See merge request easycorp/zentaopms!4105
 2022-06-23 06:55:30 +00:00
王怡栋 edd4df3924 Merge branch 'sprint/206_liumengyi_24206' into 'master' 
* Fix bug #24206.

See merge request easycorp/zentaopms!4104
 2022-06-23 06:55:12 +00:00
王怡栋 13461cddb9 Merge branch 'fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!4106
 2022-06-23 06:54:45 +00:00
wangyidong 439f555e45 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-06-23 14:23:43 +08:00
wangyidong 31f53a6953 Merge branch 'sgm_upgrade' 2022-06-23 14:22:15 +08:00
王怡栋 88427c47a9 Merge branch 'sgm_details' into 'master' 
* Code for code error.

See merge request easycorp/zentaopms!4102
 2022-06-23 06:20:57 +00:00
王怡栋 6c6e76f136 Merge branch 'sprint/206_liumengyi_24179' into 'master' 
* Fix bug #24179.

See merge request easycorp/zentaopms!4100
 2022-06-23 05:49:34 +00:00
王怡栋 85cbbc79bd Merge branch 'sprint/206_liumengyi_fixissue' into 'master' 
* Fix issue #682, #683.

See merge request easycorp/zentaopms!4098
 2022-06-23 05:49:02 +00:00
王怡栋 6b99fe2afe Merge branch 'sprint/206_liumengyi_fixbug' into 'master' 
* Fix bug for doc search flipping.

See merge request easycorp/zentaopms!4095
 2022-06-23 05:48:09 +00:00
wangyidong 26a4381109 Merge branch 'sgm_prjadmin' 2022-06-23 13:01:04 +08:00
王怡栋 748f1ffedf Merge branch 'master' into 'sgm_prjadmin' 
# Conflicts:
#   db/update17.1.sql
 2022-06-23 05:00:48 +00:00
wangyidong e77cf47434 Merge branch 'sgm_kanbanwip' 2022-06-23 11:24:07 +08:00
王怡栋 e6f8af9c13 Merge branch 'master' into 'sgm_kanbanwip' 
# Conflicts:
#   db/update17.1.sql
 2022-06-23 03:23:53 +00:00
王怡栋 b5bcb3c90b Merge branch 'sprint/206_liumengyi_fixbug' into 'master' 
Sprint/206 liumengyi fixbug

See merge request easycorp/zentaopms!4093
 2022-06-23 01:54:14 +00:00
wangyidong 067a594067 Merge branch 'sprint/206_liumengyi_58288' 2022-06-23 09:47:00 +08:00
王怡栋 77d1ab4daf Merge branch 'master' into 'sprint/206_liumengyi_58288' 
# Conflicts:
#   db/update17.1.sql
 2022-06-23 01:46:35 +00:00
王怡栋 735bc3dc09 Merge branch 'fixbug' into 'master' 
* Fix bug #24177.

See merge request easycorp/zentaopms!4092
 2022-06-23 01:42:57 +00:00
王怡栋 022110478d Merge branch 'sprint/master_zhouxudong_fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!4091
 2022-06-23 01:37:05 +00:00
王怡栋 6fd3c28a23 Merge branch 'sprint205_leiyong_task_57878' into 'master' 
Sprint205 leiyong task 57878

See merge request easycorp/zentaopms!4074
 2022-06-23 00:41:00 +00:00
王怡栋 4dab93ee3b Merge branch 'sprint/master_zhouxudong_57864' into 'master' 
* Finish task #57864.

See merge request easycorp/zentaopms!4082
 2022-06-23 00:40:27 +00:00
王怡栋 f72b89a56e Merge branch 'sprint/master_zhouxudong_57848' into 'master' 
Sprint/master zhouxudong 57848

See merge request easycorp/zentaopms!4085
 2022-06-23 00:39:59 +00:00
王怡栋 c69384617a Merge branch 'master_xieqiyu_57850' into 'master' 
* Code for task#57850.

See merge request easycorp/zentaopms!4083
 2022-06-23 00:39:25 +00:00
王怡栋 d00f32f34f Merge branch 'master_xieqiyu_57875' into 'master' 
* Finish task#57875.

See merge request easycorp/zentaopms!4084
 2022-06-23 00:37:37 +00:00
王怡栋 9d264f0514 Merge branch 'master_xieqiyu_57851' into 'master' 
* Finish task#57851.

See merge request easycorp/zentaopms!4072
 2022-06-22 09:22:22 +00:00
wangyidong 2a948b5de6 Merge branch 'sprint/205' 2022-06-22 17:21:32 +08:00
王怡栋 9ffdc942c2 Merge branch 'master' into 'sprint/205' 
# Conflicts:
#   module/execution/lang/en.php
#   module/execution/lang/zh-cn.php
 2022-06-22 09:21:12 +00:00
王怡栋 c070183b29 Merge branch 'sprint/205_hufangzhou_24151' into 'master' 
* Fix bug #24151.

See merge request easycorp/zentaopms!4075
 2022-06-22 08:53:20 +00:00
王怡栋 3b6ecf50ef Merge branch 'sprint/206_tianshujie_57898' into 'master' 
* Fix bug #23930.

See merge request easycorp/zentaopms!4071
 2022-06-22 08:18:35 +00:00
王怡栋 7f7188a6c2 Merge branch 'fixbug' into 'master' 
* Fix bug #24078.

See merge request easycorp/zentaopms!4070
 2022-06-22 08:18:14 +00:00
王怡栋 b802c0a8fd Merge branch 'sprint/206_tianshujie_lang' into 'master' 
* Added German and French.

See merge request easycorp/zentaopms!4068
 2022-06-22 07:32:36 +00:00
wangyidong a762d70878 Merge branch 'sprint/206' 2022-06-22 15:26:33 +08:00
王怡栋 03c76b1565 Merge branch 'master' into 'sprint/206' 
# Conflicts:
#   db/update17.1.sql
 2022-06-22 07:26:11 +00:00
王怡栋 68f18a695d Merge branch 'sprint/205_hufangzhou_57883' into 'master' 
* Finish task #57883.

See merge request easycorp/zentaopms!4055
 2022-06-22 05:31:58 +00:00
wangyidong 1e7ec30f10 * fix bug for build url in PATH_INFO. 2022-06-22 11:45:26 +08:00
王怡栋 0e847b9645 Merge branch 'sprint/206_liumengyi_58063' into 'sprint/206' 
Sprint/206 liumengyi 58063

See merge request easycorp/zentaopms!4053
 2022-06-22 02:39:17 +00:00