Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
42,325 Commits 2 Branches 292 Tags
895f8136ecd94cd084842c0fb531ef1ca1045c0b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
王怡栋 895f8136ec Merge branch 'cyy_mr' into 'master' 
* Modify mr review log.

See merge request easycorp/zentaopms!4602
 2022-07-20 01:45:46 +00:00
王怡栋 c904507658 Merge branch 'sprint/master_zhouxudong_61110' into 'master' 
* Finish task #61110.

See merge request easycorp/zentaopms!4603
 2022-07-20 01:45:32 +00:00
王怡栋 1e14279144 Merge branch 'cyy_mr' into 'master' 
Cyy mr

See merge request easycorp/zentaopms!4601
 2022-07-20 01:16:22 +00:00
王怡栋 80c3b67ee1 Merge branch 'sprint/tianshujie_code' into 'master' 
Sprint/tianshujie code

See merge request easycorp/zentaopms!4600
 2022-07-20 01:15:46 +00:00
王怡栋 c3cd219d3c Merge branch 'sprint/217_liumengyi_25457' into 'master' 
* Fix bug #25457.

See merge request easycorp/zentaopms!4599
 2022-07-20 00:48:07 +00:00
王怡栋 9abacbd0c9 Merge branch 'sprint/master_zhouxudong_61110' into 'master' 
Sprint/master zhouxudong 61110

See merge request easycorp/zentaopms!4598
 2022-07-20 00:29:16 +00:00
王怡栋 3120ef2aa2 Merge branch 'zenops_38' into 'master' 
Zenops 38

See merge request easycorp/zentaopms!4597
 2022-07-20 00:28:11 +00:00
wangyidong 4601a6966d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-19 15:36:20 +08:00
wangyidong fbbbd58cbc * code for task #61200. 2022-07-19 15:36:03 +08:00
王怡栋 96d0f549da Merge branch 'sprint/217_liumengyi_61174' into 'master' 
* Finish task #61174.

See merge request easycorp/zentaopms!4595
 2022-07-19 07:33:30 +00:00
王怡栋 d93067ea8d Merge branch 'sprint/wangzemei/bug24273' into 'master' 
* Fix bug #24273

See merge request easycorp/zentaopms!4596
 2022-07-19 06:01:25 +00:00
wangyidong a61f6a9cc1 * code for task #61189. 2022-07-19 13:34:38 +08:00
wangyidong f8fbd29b08 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-19 13:10:42 +08:00
wangyidong 837c8f7ec2 * code for task #61188. 2022-07-19 13:10:26 +08:00
王怡栋 5a951491fe Merge branch 'sprint/217_zg' into 'master' 
* Finish task#61184,61183,61172

See merge request easycorp/zentaopms!4593
 2022-07-19 01:52:12 +00:00
王怡栋 201ce8c66a Merge branch 'sprint/217_tianshujie_61169' into 'master' 
Sprint/217 tianshujie 61169

See merge request easycorp/zentaopms!4594
 2022-07-19 01:47:04 +00:00
王怡栋 4a37653f63 Merge branch 'sprint/217_liumengyi_61176' into 'master' 
* Finish task #61176.

See merge request easycorp/zentaopms!4592
 2022-07-19 01:40:45 +00:00
王怡栋 ee7479b9d5 Merge branch 'sprint/master_zhoxudong_fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!4591
 2022-07-18 03:15:34 +00:00
王怡栋 ce27a627af Merge branch 'bugfix/liwenrui/clientdownload2' into 'master' 
* tune memory limit, client zips sometimes take more than 512M. needs refactor later.

See merge request easycorp/zentaopms!4588
 2022-07-18 00:28:37 +00:00
王怡栋 ec1f058ff8 Merge branch 'sprint/master_zhouxudong_24318' into 'master' 
* Fix bug #24318.

See merge request easycorp/zentaopms!4586
 2022-07-15 07:10:54 +00:00
王怡栋 6aadc5a77d Merge branch 'sprint/master_zhouxudong_24894' into 'master' 
* Fix bug #24894.

See merge request easycorp/zentaopms!4583
 2022-07-15 07:10:34 +00:00
王怡栋 393a7466a1 Merge branch 'master_xieqiyu_25038' into 'master' 
* Fix bug#25038.

See merge request easycorp/zentaopms!4580
 2022-07-15 07:10:20 +00:00
王怡栋 9fbcd9113c Merge branch 'sprint/215_liumengyi_25386' into 'master' 
* Fix bug #25386.

See merge request easycorp/zentaopms!4587
 2022-07-15 07:09:55 +00:00
王怡栋 849eafbe36 Merge branch 'sprint/master_zhouxudong_fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!4576
 2022-07-15 05:04:56 +00:00
王怡栋 21bc4a5a5f Merge branch 'bugfix/liwenrui/kanbanheader' into 'master' 
* fix toolbar position for zentaoclient.

See merge request easycorp/zentaopms!4574
 2022-07-15 03:23:51 +00:00
王怡栋 7e682c99c2 Merge branch 'sprint/xuanxuan_110' into 'master' 
Sprint/xuanxuan 110

See merge request easycorp/zentaopms!4563
 2022-07-15 03:17:39 +00:00
王怡栋 e399056cee Merge branch 'master_xieqiyu_25365' into 'master' 
* Fix bug#25365.

See merge request easycorp/zentaopms!4575
 2022-07-15 03:16:28 +00:00
王怡栋 16bd36bb4e Merge branch 'bugfix/liwenrui/clientdownload' into 'master' 
* fix oom on downloading client.

See merge request easycorp/zentaopms!4573
 2022-07-15 03:09:38 +00:00
王怡栋 27b4774795 Merge branch 'sprint/215_liumengyi_25336' into 'master' 
* Fix bug #25336 and fix bug #25325.

See merge request easycorp/zentaopms!4568
 2022-07-15 02:37:13 +00:00
王怡栋 b022b8b7f5 Merge branch 'master_xieqiyu_25084' into 'master' 
* Fix bug#25084.

See merge request easycorp/zentaopms!4567
 2022-07-15 02:36:35 +00:00
王怡栋 f900da76ce Merge branch 'sprint214_fix_bug' into 'master' 
* Processing product default value error.

See merge request easycorp/zentaopms!4569
 2022-07-15 02:36:10 +00:00
wangyidong 1fcfdf2972 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-15 10:06:00 +08:00
wangyidong c4af3c24b6 * fix bug #25346. 2022-07-15 10:05:43 +08:00
王怡栋 b24de96af9 Merge branch 'bugfix/liwenrui/doubleheader' into 'master' 
* fix double header covering main in zentaoclient.

See merge request easycorp/zentaopms!4561
 2022-07-15 00:55:38 +00:00
王怡栋 0c2e6ed0da Merge branch 'sprint/tianshujie_25186' into 'master' 
Sprint/tianshujie 25186

See merge request easycorp/zentaopms!4560
 2022-07-15 00:25:14 +00:00
王怡栋 fc378df8b6 Merge branch 'master_xieqiyu_25027' into 'master' 
* Fix bug#25027.

See merge request easycorp/zentaopms!4545
 2022-07-14 08:24:13 +00:00
王怡栋 f7e343780c Merge branch 'master_xieqiyu_25312' into 'master' 
* Fix bug#25312.

See merge request easycorp/zentaopms!4550
 2022-07-14 08:23:54 +00:00
王怡栋 c1a012bb91 Merge branch 'sprint/hufangzhou_25281' into 'master' 
* Fix bug #25281.

See merge request easycorp/zentaopms!4551
 2022-07-14 08:23:43 +00:00
王怡栋 b34769598c Merge branch 'sprint/215_liumengyi_25289' into 'master' 
* Fix bug #25289.

See merge request easycorp/zentaopms!4552
 2022-07-14 08:23:30 +00:00
王怡栋 d282c902de Merge branch 'liugang_fixbug' into 'master' 
* Fix bug of print kanban.

See merge request easycorp/zentaopms!4549
 2022-07-14 08:22:53 +00:00
王怡栋 7d2be74068 Merge branch 'sprint/tianshujie_25309' into 'master' 
* Fix bug #25309.

See merge request easycorp/zentaopms!4553
 2022-07-14 08:22:37 +00:00
王怡栋 f99fef0f94 Merge branch 'sprint/216_mayue_bug#24706' into 'master' 
* Fix bug #24706.

See merge request easycorp/zentaopms!4546
 2022-07-14 07:15:35 +00:00
王怡栋 d7c1fc83a5 Merge branch 'sprint/215_liumengyi_24795' into 'master' 
* Fix bug #24795.

See merge request easycorp/zentaopms!4544
 2022-07-14 05:57:51 +00:00
王怡栋 68c747655c Merge branch 'sprint/master_zhouxudong_25262' into 'master' 
* Fix bug #25262.

See merge request easycorp/zentaopms!4543
 2022-07-14 05:57:38 +00:00
王怡栋 85c209f5e6 Merge branch 'sprint/master_guofeilong_bug#23351' into 'master' 
Sprint/master guofeilong bug#23351

See merge request easycorp/zentaopms!4542
 2022-07-14 05:55:09 +00:00
王怡栋 a7bbc6c953 Merge branch 'sprint/master_zhouxudong_25105' into 'master' 
* Fix bug #25105.

See merge request easycorp/zentaopms!4529
 2022-07-14 05:04:49 +00:00
王怡栋 196ee9ff18 Merge branch 'master_xieqiyu_25094' into 'master' 
* Fix bug#25094.

See merge request easycorp/zentaopms!4530
 2022-07-14 05:03:50 +00:00
王怡栋 842a44f27c Merge branch 'sprint/215_liumengyi_fixbug' into 'master' 
* Fix bug for task #60476, and fix bug #25063, and fix bug #25230.

See merge request easycorp/zentaopms!4525
 2022-07-14 01:36:52 +00:00
王怡栋 7523d2bd35 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
* add standard sql

See merge request easycorp/zentaopms!4526
 2022-07-14 01:06:37 +00:00
王怡栋 bb9dbe5827 Merge branch 'master_xieqiyu_25198' into 'master' 
Master xieqiyu 25198

See merge request easycorp/zentaopms!4523
 2022-07-14 00:57:50 +00:00
王怡栋 5a6fabfa5e Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
* fix bug #25172

See merge request easycorp/zentaopms!4521
 2022-07-14 00:57:00 +00:00
王怡栋 559baff057 Merge branch 'sprint/215_liumengyi_23641' into 'master' 
* Fix bug #23641.

See merge request easycorp/zentaopms!4518
 2022-07-13 07:23:02 +00:00
王怡栋 677a224d84 Merge branch 'sprint/master_zhouxudong_fixbug' into 'master' 
* Fix bug about kanban actions.

See merge request easycorp/zentaopms!4520
 2022-07-13 07:22:35 +00:00
王怡栋 b1bceb2917 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4517
 2022-07-13 06:49:50 +00:00
王怡栋 5f062e08f9 Merge branch 'sprint/215_liumengyi_23641' into 'master' 
* Fix bug #23641.

See merge request easycorp/zentaopms!4516
 2022-07-13 06:48:13 +00:00
wangyidong 2bc0a7f4c1 * fix for upgrade. 2022-07-13 14:21:13 +08:00
王怡栋 70bd6eaa5e Merge branch 'sprint/master_zhouxudong_25163' into 'master' 
* Fix bug #25163 #25166 #25170.

See merge request easycorp/zentaopms!4513
 2022-07-13 05:53:10 +00:00
王怡栋 42629df5ab Merge branch 'sprint/215_liumengyi_fixbug' into 'master' 
* Optimize code.

See merge request easycorp/zentaopms!4511
 2022-07-13 05:43:07 +00:00
王怡栋 7f89cbb52e Merge branch 'sprint/tianshujie_issue' into 'master' 
Sprint/tianshujie issue

See merge request easycorp/zentaopms!4510
 2022-07-13 05:35:22 +00:00
王怡栋 68d1d9b1fb Merge branch 'sprint/215_liumengyi_lite' into 'master' 
* Finish task #60476.

See merge request easycorp/zentaopms!4509
 2022-07-13 05:35:08 +00:00
王怡栋 e286a450fb Merge branch 'sprint/215_liumengyi_24491' into 'master' 
* Fix bug #24491.

See merge request easycorp/zentaopms!4504
 2022-07-13 05:33:00 +00:00
王怡栋 ac29fee89d Merge branch 'sprint/214_hufangzhou_package' into 'master' 
* Add the new version.

See merge request easycorp/zentaopms!4508
 2022-07-13 05:32:31 +00:00
王怡栋 ec135f3c40 Merge branch 'sprint/215_liumengyi_24896' into 'master' 
* Fix bug #24896.

See merge request easycorp/zentaopms!4501
 2022-07-13 03:29:41 +00:00
王怡栋 a769590829 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4502
 2022-07-13 03:29:11 +00:00
王怡栋 aa81fd6741 Merge branch 'sprint214_leiyong_fix_bug' into 'master' 
* Adjust Modified Fields.

See merge request easycorp/zentaopms!4499
 2022-07-13 03:12:56 +00:00
王怡栋 30e7879a41 Merge branch 'sprint/215_liumengyi_fixbug' into 'master' 
* Optimize code.

See merge request easycorp/zentaopms!4493
 2022-07-13 03:12:44 +00:00
王怡栋 43b7ecd869 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
* fix task #60360

See merge request easycorp/zentaopms!4500
 2022-07-13 03:12:28 +00:00
王怡栋 975c7cfb3d Merge branch 'master_xieqiyu_25145' into 'master' 
* Fix bug#25145.

See merge request easycorp/zentaopms!4498
 2022-07-13 02:26:05 +00:00
王怡栋 0ac2e857a4 Merge branch 'sprint214_leiyong_task_60384' into 'master' 
Sprint214 leiyong task 60384

See merge request easycorp/zentaopms!4495
 2022-07-13 02:25:36 +00:00
王怡栋 37e1fabe7b Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
* fix task #60360

See merge request easycorp/zentaopms!4496
 2022-07-13 02:24:24 +00:00
王怡栋 65e48dadb8 Merge branch 'sprint/master_zhouxudong_60393' into 'master' 
* Finish task #60393.

See merge request easycorp/zentaopms!4487
 2022-07-13 02:02:44 +00:00
王怡栋 8f0fa110e9 Merge branch 'sprint/215_liumengyi_fixbug' into 'master' 
* Fix bug for task #60395.

See merge request easycorp/zentaopms!4489
 2022-07-13 00:44:02 +00:00
王怡栋 ae2ea79849 Merge branch 'sprint/215_tianshujie_23119' into 'master' 
* Fix bug #23119.

See merge request easycorp/zentaopms!4490
 2022-07-13 00:42:59 +00:00
王怡栋 42cd9ccc98 Merge branch 'sprint/215_tianshujie_25128' into 'master' 
Sprint/215 tianshujie 25128

See merge request easycorp/zentaopms!4483
 2022-07-12 09:21:23 +00:00
王怡栋 c2c5b59856 Merge branch 'sprint/215_liumengyi_fixbug' into 'master' 
* Finish task #60478, and fix bug #24991.

See merge request easycorp/zentaopms!4486
 2022-07-12 09:20:57 +00:00
王怡栋 11f2eb8a0f Merge branch 'sprint/215_liumengyi_60476' into 'master' 
Sprint/215 liumengyi 60476

See merge request easycorp/zentaopms!4485
 2022-07-12 09:20:31 +00:00
王怡栋 53a977af20 Merge branch 'sprint/215_liumengyi_fixbug' into 'master' 
* Finish task #60491.

See merge request easycorp/zentaopms!4475
 2022-07-12 07:45:36 +00:00
王怡栋 d0c15d321f Merge branch 'sprint/master_zhouxudong_fixbug' into 'master' 
Sprint/master zhouxudong fixbug

See merge request easycorp/zentaopms!4472
 2022-07-12 07:41:56 +00:00
王怡栋 b2097b9b7c Merge branch 'sprint/215_tianshujie_60667' into 'master' 
* Fix bug #25070.

See merge request easycorp/zentaopms!4480
 2022-07-12 07:40:33 +00:00
王怡栋 8423bbb096 Merge branch 'sprint/215_tianshujie_60475' into 'master' 
Sprint/215 tianshujie 60475

See merge request easycorp/zentaopms!4479
 2022-07-12 07:39:54 +00:00
王怡栋 8bbc43b99c Merge branch 'sprint/master_zhouxudong_60393' into 'master' 
* Finish task #60393.

See merge request easycorp/zentaopms!4468
 2022-07-12 07:23:46 +00:00
王怡栋 58941466a6 Merge branch 'master_xieqiyu_fixKanbanBug' into 'master' 
* Fix bug of story and bug action in execution.

See merge request easycorp/zentaopms!4471
 2022-07-12 07:03:09 +00:00
王怡栋 1aa2f24efc Merge branch 'master_xieqiyu_fixbug' into 'master' 
* Fix bug of create project when select all branch.

See merge request easycorp/zentaopms!4470
 2022-07-12 07:00:55 +00:00
王怡栋 39d3d083ad Merge branch 'sprint/master_zhouxudong_60376' into 'master' 
* Finish task #60388.

See merge request easycorp/zentaopms!4469
 2022-07-12 06:57:01 +00:00
王怡栋 d47cde97d2 Merge branch 'master_xieqiyu_25030' into 'master' 
* Fix bug#25030.

See merge request easycorp/zentaopms!4464
 2022-07-12 05:31:04 +00:00
wangyidong 366f2ef207 Merge branch 'sprint/master_zhouxudong_60389' 2022-07-12 13:30:27 +08:00
王怡栋 a063544f5f Merge branch 'master' into 'sprint/master_zhouxudong_60389' 
# Conflicts:
#   module/file/view/buildform.html.php
#   module/file/view/viewfiles.html.php
 2022-07-12 05:30:11 +00:00
王怡栋 3ca4195444 Merge branch 'master_xieqiyu_25062' into 'master' 
* Fix bug#25062.

See merge request easycorp/zentaopms!4460
 2022-07-12 00:47:47 +00:00
王怡栋 af542ae500 Merge branch 'sprint/master_zhouxudong_60383' into 'master' 
* Finish task #60387 #60386 #60383.

See merge request easycorp/zentaopms!4459
 2022-07-12 00:47:35 +00:00
王怡栋 070b7b0b29 Merge branch 'sprint/ZUI_guofeilong_add_icon_customer' into 'master' 
* Add ZentaoIcon Customer

See merge request easycorp/zentaopms!4455
 2022-07-11 08:25:23 +00:00
wangyidong 6757d64f6e * fix field type. 2022-07-11 16:16:59 +08:00
王怡栋 7bc7fe0e54 Merge branch 'sprint/master_zhouxudong_60389' into 'master' 
Sprint/master zhouxudong 60389

See merge request easycorp/zentaopms!4451
 2022-07-11 07:56:48 +00:00
王怡栋 4c3d59333a Merge branch 'sprint/215_liumengyi_60395' into 'master' 
* Finish task #60395.

See merge request easycorp/zentaopms!4450
 2022-07-11 07:56:19 +00:00
王怡栋 e3439cedae Merge branch 'sprint/ZUI_guofeilong_add_icon_save' into 'master' 
* Add ZentaoIcon Save

See merge request easycorp/zentaopms!4454
 2022-07-11 07:54:51 +00:00
wangyidong 5446bcf1f4 Merge branch 'sprint/212_hufangzhou_59535' 2022-07-11 15:10:47 +08:00
王怡栋 e9809af13a Merge branch 'master' into 'sprint/212_hufangzhou_59535' 
# Conflicts:
#   www/js/my.full.js
 2022-07-11 07:10:23 +00:00
王怡栋 00b073ba18 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4447
 2022-07-11 02:36:02 +00:00
wangyidong 35c8543a74 * adjust for check account in set vision. 2022-07-11 10:08:40 +08:00
王怡栋 43cc464b54 Merge branch 'sprint/213_mayue_bug25031' into 'master' 
* Fix bug #25031.

See merge request easycorp/zentaopms!4446
 2022-07-11 02:08:13 +00:00
wangyidong 43c9570c98 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-08 17:36:59 +08:00