 孙广明
|
7a92f78f16
|
Merge branch 'importExport' into 'master'
* Fix bug for gantt menu.
See merge request easycorp/zentaopms!4973
|
2022-08-15 07:48:14 +00:00 |
|
|
孙广明
|
2251eb7aef
|
Merge branch 'sprint/hufangzhou_26445' into 'master'
* Fix bug #26445.
See merge request easycorp/zentaopms!4971
|
2022-08-15 07:38:24 +00:00 |
|
|
孙广明
|
ffe9bb9815
|
Merge branch 'importExport' into 'master'
* Sort execution and project gantt menu .
See merge request easycorp/zentaopms!4970
|
2022-08-15 07:00:25 +00:00 |
|
|
孙广明
|
e0b470a476
|
Update gantt.html.php
|
2022-08-15 07:00:13 +00:00 |
|
|
孙广明
|
0fa03e96c7
|
Merge branch 'sprint/scx_api' into 'master'
* Modify product po rd qd createdby to user objectType.
See merge request easycorp/zentaopms!4961
|
2022-08-15 00:22:09 +00:00 |
|
|
孙广明
|
d2ad7b237d
|
Merge branch 'lyk_26364' into 'master'
* Fix bug #26364
See merge request easycorp/zentaopms!4955
|
2022-08-12 09:18:25 +00:00 |
|
|
孙广明
|
4815cb7f5e
|
Merge branch 'sprint/unitteest_liumengyi_caselib' into 'master'
* Modify unit test of caselib.
See merge request easycorp/zentaopms!4959
|
2022-08-12 09:18:11 +00:00 |
|
|
孙广明
|
e1b4cb821a
|
Merge branch 'sprint/224_liumengyi_26325' into 'master'
* Fix bug #26358.
See merge request easycorp/zentaopms!4952
|
2022-08-12 08:52:29 +00:00 |
|
|
孙广明
|
d7de15ae41
|
Merge branch 'sprint/224_liumengyi_26325' into 'master'
* Fix bug #26379.
See merge request easycorp/zentaopms!4951
|
2022-08-12 07:46:08 +00:00 |
|
|
孙广明
|
77b27f5eb3
|
Merge branch 'lyk_fixbug' into 'master'
* Fix bug of the view of admin in lite
See merge request easycorp/zentaopms!4929
|
2022-08-12 00:14:12 +00:00 |
|
|
sunguangming
|
a978f21f69
|
* Fix file unit case.
|
2022-08-11 13:31:51 +08:00 |
|
|
sunguangming
|
17c5bdca14
|
* Add unit case for file.
|
2022-08-11 13:21:50 +08:00 |
|
|
孙广明
|
22b0ba7314
|
Merge branch 'sprint/224_hufangzhou_newVersion' into 'master'
* Add the new version.
See merge request easycorp/zentaopms!4920
|
2022-08-11 02:56:57 +00:00 |
|
|
孙广明
|
d4df3b975d
|
Merge branch 'lyk_fixbug' into 'master'
* Fix bug of xiangmu
See merge request easycorp/zentaopms!4906
|
2022-08-11 00:18:46 +00:00 |
|
|
孙广明
|
164eb78662
|
Merge branch 'sprint/max41_mayue_bug#26252' into 'master'
* Fix bug #26252.
See merge request easycorp/zentaopms!4900
|
2022-08-10 07:28:12 +00:00 |
|
|
孙广明
|
990a137fb0
|
Merge branch 'sprint/max41_mayue_task#63796' into 'master'
* Finish task #63796.
See merge request easycorp/zentaopms!4895
|
2022-08-10 06:37:45 +00:00 |
|
|
孙广明
|
5a54c74436
|
Merge branch 'lyk_26065' into 'master'
* Fix bug #26065
See merge request easycorp/zentaopms!4893
|
2022-08-10 05:57:53 +00:00 |
|
|
孙广明
|
26fe219145
|
Merge branch 'lyk_25249' into 'master'
* Fix bug #25249
See merge request easycorp/zentaopms!4884
|
2022-08-10 05:57:30 +00:00 |
|
|
孙广明
|
6ba3fb01ea
|
Merge branch 'sprint/224_liumengyi_63694' into 'master'
* Finish task #63694.
See merge request easycorp/zentaopms!4868
|
2022-08-09 08:53:40 +00:00 |
|
|
sunguangming
|
5e2135766a
|
* Finish task #64212.
|
2022-08-09 15:16:14 +08:00 |
|
|
孙广明
|
e3eeddfbc0
|
Merge branch 'lyk_25690' into 'master'
* Fix bug #25690
See merge request easycorp/zentaopms!4846
|
2022-08-08 08:59:32 +00:00 |
|
|
孙广明
|
fe0f69fc77
|
Merge branch 'lyk_64217' into 'master'
* Finish task #64217
See merge request easycorp/zentaopms!4844
|
2022-08-08 08:59:22 +00:00 |
|
|
孙广明
|
ef27964ad2
|
Merge branch 'lyk_25690' into 'master'
* Fix bug 25690.
See merge request easycorp/zentaopms!4841
|
2022-08-08 08:30:21 +00:00 |
|
|
孙广明
|
0e7fde7030
|
Merge branch 'lyk_fixbug_kanban' into 'master'
* Fix the view of kanbans' content
See merge request easycorp/zentaopms!4840
|
2022-08-08 05:30:04 +00:00 |
|
|
孙广明
|
716bdc49c0
|
Merge branch 'liyuchun_unittest' into 'master'
Liyuchun unittest
See merge request easycorp/zentaopms!4826
|
2022-08-08 02:34:50 +00:00 |
|
|
孙广明
|
03ffa85dba
|
Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #25176.
See merge request easycorp/zentaopms!4829
|
2022-08-08 02:34:19 +00:00 |
|
|
sunguangming
|
1e05476b43
|
* Code for kanban action.
|
2022-08-05 17:35:29 +08:00 |
|
|
孙广明
|
209ed28c5c
|
Merge branch 'sprint/221_liumengyi_login' into 'master'
* Fix bug for task #62949.
See merge request easycorp/zentaopms!4825
|
2022-08-05 07:05:46 +00:00 |
|
|
sunguangming
|
b065484875
|
* Code for kanban btn.
|
2022-08-05 14:29:56 +08:00 |
|
|
孙广明
|
c7c7d0a3af
|
Merge branch 'sprint/221_liumengyi_fixbug' into 'master'
* Fix bug #26033.
See merge request easycorp/zentaopms!4817
|
2022-08-05 05:16:04 +00:00 |
|
|
孙广明
|
d6f9849478
|
Merge branch 'zhouxin_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!4813
|
2022-08-05 05:15:09 +00:00 |
|
|
孙广明
|
9f323c631a
|
Merge branch 'lyk_26002_25249' into 'master'
Lyk 26002 25249
See merge request easycorp/zentaopms!4816
|
2022-08-05 03:34:42 +00:00 |
|
|
孙广明
|
7cc56886e3
|
Merge branch 'lyk_25876' into 'master'
* Fix bug 25876.
See merge request easycorp/zentaopms!4793
|
2022-08-05 02:32:36 +00:00 |
|
|
孙广明
|
c947c2434d
|
Merge branch 'zhouxin_fixbug' into 'master'
* Fix a bug.
See merge request easycorp/zentaopms!4808
|
2022-08-05 02:31:07 +00:00 |
|
|
sunguangming
|
6fd31be063
|
* Fix comment.
|
2022-08-04 11:04:59 +08:00 |
|
|
sunguangming
|
ab34dbce82
|
* Code for task #62734.
|
2022-08-04 11:01:57 +08:00 |
|
|
sunguangming
|
728834da26
|
* Finish task #62733.
|
2022-08-04 09:49:35 +08:00 |
|
|
sunguangming
|
9d1ce4c9d5
|
* Code for project export program name.
|
2022-08-04 08:39:15 +08:00 |
|
|
sunguangming
|
ffc90d43b0
|
* Code for my-block.
|
2022-08-02 14:13:37 +08:00 |
|
|
孙广明
|
9cffdad887
|
Merge branch 'sprint/220_liumengyi_25814' into 'master'
* Fix bug #25814.
See merge request easycorp/zentaopms!4703
|
2022-07-28 05:24:06 +00:00 |
|
|
sunguangming
|
019bf42e4d
|
* Fix bug #25814.
|
2022-07-28 13:10:11 +08:00 |
|
|
孙广明
|
5477a01f12
|
Merge branch 'fix_cfd_issue' into 'master'
* Fix cfd issue.
See merge request easycorp/zentaopms!4701
|
2022-07-28 03:03:09 +00:00 |
|
|
孙广明
|
ccf89f253d
|
Merge branch 'sprint/hufangzhou_25743' into 'master'
* Fix bug #25743.
See merge request easycorp/zentaopms!4692
|
2022-07-27 08:32:21 +00:00 |
|
|
孙广明
|
41e968cf34
|
Merge branch 'sprint/220_liumengyi_35409' into 'master'
* Finish task #62492, #62493, #62494.
See merge request easycorp/zentaopms!4691
|
2022-07-27 08:09:36 +00:00 |
|
|
孙广明
|
bf107fc06e
|
Merge branch 'sprint/220_liumengyi_35409' into 'master'
* Finish story #35409, #35408, #35407.
See merge request easycorp/zentaopms!4681
|
2022-07-27 07:04:41 +00:00 |
|
|
孙广明
|
69ee2ea498
|
Merge branch 'sprint/220_tianshujie_issue' into 'master'
Sprint/220 tianshujie issue
See merge request easycorp/zentaopms!4678
|
2022-07-27 05:43:42 +00:00 |
|
|
孙广明
|
ec9ff2d44d
|
Merge branch 'sprint/220_liumengyi_fixissue' into 'master'
* Fix issue #695, #696.
See merge request easycorp/zentaopms!4675
|
2022-07-27 05:43:20 +00:00 |
|
|
孙广明
|
2e3f503d95
|
Merge branch 'sprint/hufangzhou_compatibleMax' into 'master'
* Compatible with zentaomax.
See merge request easycorp/zentaopms!4677
|
2022-07-27 05:43:07 +00:00 |
|
|
孙广明
|
61babc61a5
|
Merge branch 'sprint/scx_userapi' into 'master'
* Add User api param.
See merge request easycorp/zentaopms!4645
|
2022-07-27 05:10:22 +00:00 |
|
|
孙广明
|
1ee14c99dc
|
Merge branch 'sprint/220_liumengyi_fixbug' into 'master'
* Fix bug for dynamic view.
See merge request easycorp/zentaopms!4672
|
2022-07-27 01:31:21 +00:00 |
|
|
孙广明
|
c17740b7c4
|
Merge branch 'sprint/220_liumengyi_25688' into 'master'
* Fix bug #25688.
See merge request easycorp/zentaopms!4658
|
2022-07-26 06:27:48 +00:00 |
|
|
孙广明
|
fd876ef22b
|
Merge branch 'sprint/220_tianshujie_62022' into 'master'
* Fix bug #25185.
See merge request easycorp/zentaopms!4656
|
2022-07-26 06:20:04 +00:00 |
|
|
孙广明
|
f95c3ee86f
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!4638
|
2022-07-22 05:42:16 +00:00 |
|
|
孙广明
|
8e39468c6a
|
Merge branch 'sprint/217_liumengyi_fixbug' into 'master'
* Fix bug #25554, #25558, #25559, #25570.
See merge request easycorp/zentaopms!4629
|
2022-07-21 09:41:20 +00:00 |
|
|
孙广明
|
59a81e4466
|
Merge branch 'sprint/217_liumengyi_24337' into 'master'
* Fix bug #24337.
See merge request easycorp/zentaopms!4622
|
2022-07-21 09:39:30 +00:00 |
|
|
孙广明
|
6650fd9bad
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!4630
|
2022-07-21 09:37:47 +00:00 |
|
|
孙广明
|
41c90492e6
|
Merge branch 'sprint/217_zg_bugs' into 'master'
* Fix sprint217 bugs.
See merge request easycorp/zentaopms!4623
|
2022-07-21 06:06:03 +00:00 |
|
|
孙广明
|
165dc24575
|
Merge branch 'sprint/217_liumengyi_25079' into 'master'
* Fix bug #25079.
See merge request easycorp/zentaopms!4619
|
2022-07-21 01:51:23 +00:00 |
|
|
孙广明
|
efc04f20e3
|
Merge branch 'sprint/215_liumengyi_25399' into 'master'
* Fix bug #25399.
See merge request easycorp/zentaopms!4589
|
2022-07-18 00:53:33 +00:00 |
|
|
孙广明
|
54200f9c3b
|
Merge branch 'sprint/tianshujie_25400' into 'master'
* Fix bug #25400.
See merge request easycorp/zentaopms!4590
|
2022-07-18 00:53:23 +00:00 |
|
|
孙广明
|
3041238bf6
|
Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #25251.
See merge request easycorp/zentaopms!4585
|
2022-07-17 07:23:08 +00:00 |
|
|
孙广明
|
2a50a5dc72
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #25321.
See merge request easycorp/zentaopms!4584
|
2022-07-15 06:40:49 +00:00 |
|
|
孙广明
|
cb01084a13
|
Merge branch 'sprint/215_liumengyi_25230' into 'master'
* Fix bug #25230, #25200,#24929.
See merge request easycorp/zentaopms!4579
|
2022-07-15 06:17:32 +00:00 |
|
|
孙广明
|
900e2342a2
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!4582
|
2022-07-15 06:16:50 +00:00 |
|
|
孙广明
|
b6aed3606b
|
Merge branch 'liyuchun_fixbug' into 'zenops_38'
Liyuchun fixbug
See merge request easycorp/zentaopms!4578
|
2022-07-15 06:06:18 +00:00 |
|
|
孙广明
|
824c6f5aee
|
Merge branch 'sprint/216_mayue_fixbug' into 'master'
* Fix bug .
See merge request easycorp/zentaopms!4577
|
2022-07-15 05:14:06 +00:00 |
|
|
孙广明
|
ba6798198f
|
Merge branch 'sprint216_zg_gaijin' into 'master'
* Remove productplan die
See merge request easycorp/zentaopms!4572
|
2022-07-15 03:15:09 +00:00 |
|
|
孙广明
|
aedab5c784
|
Merge branch 'sprint/216_mayue_bug#25358' into 'master'
* Fix bug #25358.
See merge request easycorp/zentaopms!4571
|
2022-07-15 03:14:57 +00:00 |
|
|
孙广明
|
bcf080f6b7
|
Merge branch 'liyuchun_fixbug' into 'master'
Liyuchun fixbug
See merge request easycorp/zentaopms!4570
|
2022-07-15 03:14:43 +00:00 |
|
|
孙广明
|
c468dd6c63
|
Merge branch 'zg_bugs' into 'master'
* Fix batchadd user ajax error
See merge request easycorp/zentaopms!4566
|
2022-07-15 03:13:52 +00:00 |
|
|
孙广明
|
52281f12c3
|
Merge branch 'liyuchun_fixbug' into 'master'
Liyuchun fixbug
See merge request easycorp/zentaopms!4562
|
2022-07-15 01:22:58 +00:00 |
|
|
孙广明
|
4617c3a040
|
Merge branch 'fixbug_25202' into 'master'
fixbug_25202
See merge request easycorp/zentaopms!4564
|
2022-07-15 01:22:47 +00:00 |
|
|
孙广明
|
ef79ca207a
|
Merge branch 'sprint214_fix_bug' into 'master'
* Fix the product default value error.
See merge request easycorp/zentaopms!4565
|
2022-07-15 01:22:30 +00:00 |
|
|
孙广明
|
6b19ed146d
|
Merge branch 'sprint/tianshujie_25268' into 'master'
Sprint/tianshujie 25268
See merge request easycorp/zentaopms!4547
|
2022-07-14 07:24:17 +00:00 |
|
|
孙广明
|
851f07bcda
|
Merge branch 'fixbug_25177' into 'master'
fixbug_25177
See merge request easycorp/zentaopms!4539
|
2022-07-14 05:03:30 +00:00 |
|
|
孙广明
|
8a9ae0c7f0
|
Merge branch 'sprint/216_mayue_bug#24706' into 'master'
* Fix bug #24706.
See merge request easycorp/zentaopms!4540
|
2022-07-14 03:30:03 +00:00 |
|
|
孙广明
|
3ff0f710b7
|
Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Fix bug for task #60476.
See merge request easycorp/zentaopms!4532
|
2022-07-14 02:39:38 +00:00 |
|
|
孙广明
|
4cdb77e983
|
Merge branch 'sprint/tianshujie_25205' into 'master'
* Fix bug #25205.
See merge request easycorp/zentaopms!4536
|
2022-07-14 02:39:28 +00:00 |
|
|
孙广明
|
f2a76aad04
|
Merge branch 'sprint216_25241' into 'master'
* Fix bug#25241
See merge request easycorp/zentaopms!4534
|
2022-07-14 02:35:09 +00:00 |
|
|
孙广明
|
b73de23549
|
Merge branch 'sprint/216_mayue_bug#24930' into 'master'
* Fix bug #24930.
See merge request easycorp/zentaopms!4535
|
2022-07-14 02:34:52 +00:00 |
|
|
孙广明
|
a415cea027
|
Merge branch 'sprint/216_mayue_bug#25191#25087' into 'master'
* Fix bug #25191#25087.
See merge request easycorp/zentaopms!4533
|
2022-07-14 02:21:34 +00:00 |
|
|
孙广明
|
52c9717727
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!4531
|
2022-07-14 02:06:13 +00:00 |
|
|
孙广明
|
6a4d372473
|
Merge branch 'sprint216_zg_bug' into 'master'
* Fix bug#25222,25232
See merge request easycorp/zentaopms!4527
|
2022-07-14 01:46:53 +00:00 |
|
|
孙广明
|
1978dbd4b8
|
Merge branch 'fixbug_25216' into 'master'
Fixbug 25216
See merge request easycorp/zentaopms!4528
|
2022-07-14 01:46:40 +00:00 |
|
|
孙广明
|
fe8f028590
|
Merge branch 'fixbug_25174' into 'master'
fixbug_25174
See merge request easycorp/zentaopms!4519
|
2022-07-14 01:45:08 +00:00 |
|
|
孙广明
|
d41303c7e2
|
Merge branch 'fixbug_dynamic' into 'master'
fixbug_dynamic
See merge request easycorp/zentaopms!4515
|
2022-07-14 01:44:53 +00:00 |
|
|
孙广明
|
1444773e4d
|
Merge branch 'sprint/mastr_zhouxudong_code' into 'master'
* Code optimization.
See merge request easycorp/zentaopms!4522
|
2022-07-14 01:44:40 +00:00 |
|
|
孙广明
|
10b3d140d2
|
Merge branch 'fixConflict_24687' into 'master'
fixConflict_24687
See merge request easycorp/zentaopms!4512
|
2022-07-13 05:45:00 +00:00 |
|
|
孙广明
|
61125b78b5
|
Merge branch 'sprint/216_mayue_bug24404' into 'master'
Sprint/216 mayue bug24404
See merge request easycorp/zentaopms!4507
|
2022-07-13 05:29:18 +00:00 |
|
|
孙广明
|
d8e313669e
|
Merge branch 'sprint/211_sunjun_60474' into 'master'
Sprint/211 sunjun 60474
See merge request easycorp/zentaopms!4503
|
2022-07-13 05:10:46 +00:00 |
|
|
孙广明
|
58a5567ada
|
Merge branch 'sprint_60477' into 'master'
Sprint 60477
See merge request easycorp/zentaopms!4492
|
2022-07-13 02:17:41 +00:00 |
|
|
孙广明
|
1e873272b3
|
Merge branch 'sprint/216_mayue_bug24404' into 'master'
* Fix bug #24404.
See merge request easycorp/zentaopms!4476
|
2022-07-13 02:17:12 +00:00 |
|
|
孙广明
|
3e03fa9082
|
Merge branch 'sprint/216_mayue_bug#24930' into 'master'
* Fix bug #24930.
See merge request easycorp/zentaopms!4494
|
2022-07-13 02:16:46 +00:00 |
|
|
孙广明
|
f322c472f5
|
Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Fix bug for task #60476.
See merge request easycorp/zentaopms!4491
|
2022-07-13 01:29:02 +00:00 |
|
|
孙广明
|
425a6f8aa5
|
Merge branch 'liyuchun_60452' into 'zenops_38'
* Finish task #60453.
See merge request easycorp/zentaopms!4474
|
2022-07-12 09:24:39 +00:00 |
|
|
孙广明
|
398a5f47f7
|
Merge branch 'sprint216_60640' into 'master'
* Code for task#60640
See merge request easycorp/zentaopms!4477
|
2022-07-12 07:17:01 +00:00 |
|
|
孙广明
|
507eb73497
|
Merge branch 'sprint/216_mayue_bug#25081' into 'master'
* Fix bug #25081.
See merge request easycorp/zentaopms!4473
|
2022-07-12 06:28:56 +00:00 |
|
|
孙广明
|
d7afa0268b
|
Merge branch 'sprint/216_mayue_bug24404' into 'master'
* Fix bug #24404.
See merge request easycorp/zentaopms!4467
|
2022-07-12 02:50:36 +00:00 |
|
|
孙广明
|
1f0652faa8
|
Merge branch 'sprint216_zg_60640' into 'master'
* Finish task#60640
See merge request easycorp/zentaopms!4466
|
2022-07-12 02:34:49 +00:00 |
|
|
孙广明
|
107060744e
|
Merge branch 'sprint/216_mayue_task#60639' into 'master'
* Finish task #60639.
See merge request easycorp/zentaopms!4463
|
2022-07-12 00:54:34 +00:00 |
|