 wangyidong
|
f55aec696c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-10 14:54:02 +08:00 |
|
|
wangyidong
|
6db44273d2
|
Merge branch 'sprint224_zg_tasks'
|
2022-08-10 14:51:59 +08: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 |
|
|
mayue
|
8f39557d0b
|
* Optimize code.
|
2022-08-10 14:37:17 +08:00 |
|
|
mayue
|
7a3f67b1e0
|
* Finish task #63796.
|
2022-08-10 14:32:29 +08:00 |
|
|
王怡栋
|
48c40b633f
|
Merge branch 'sprint/devplat_31' into 'master'
* Fix bug #26173.
See merge request easycorp/zentaopms!4891
|
2022-08-10 06:02:48 +00:00 |
|
|
liuruogu
|
64a77e3075
|
* Fix bug #26173.
|
2022-08-10 06:01:37 +00:00 |
|
|
zenggang
|
858b383916
|
* Adjust code
|
2022-08-10 05:58:04 +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 |
|
|
王怡栋
|
338f149887
|
Merge branch 'sprint/224_liumengyi_25319' into 'master'
* Fix bug #25319.
See merge request easycorp/zentaopms!4892
|
2022-08-10 05:53:44 +00:00 |
|
|
王怡栋
|
99fa671ce8
|
Merge branch 'tanghucheng_task' into 'master'
* Code for port.
See merge request easycorp/zentaopms!4889
|
2022-08-10 05:52:29 +00:00 |
|
|
王怡栋
|
87889f1498
|
Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug of edit execution can change closedDate.
See merge request easycorp/zentaopms!4887
|
2022-08-10 05:51:01 +00:00 |
|
|
王怡栋
|
53c42e37c5
|
Merge branch 'sprint/224_liumengyi_26109' into 'master'
* Fix bug #26109.
See merge request easycorp/zentaopms!4885
|
2022-08-10 05:50:28 +00:00 |
|
|
liumengyi
|
880f39ddf0
|
* Fix bug #25319.
|
2022-08-10 13:48:25 +08:00 |
|
|
liuyongkai
|
e14424eba3
|
* Fix bug #26065
|
2022-08-10 05:46:55 +00:00 |
|
|
wangyidong
|
4f980fd52e
|
Merge branch 'sprint/224_dongli_bug63669'
|
2022-08-10 13:46:36 +08:00 |
|
|
王怡栋
|
026739dc18
|
Merge branch 'master' into 'sprint/224_dongli_bug63669'
# Conflicts:
# module/my/css/task.css
|
2022-08-10 05:46:12 +00:00 |
|
|
liumengyi
|
d80080b67b
|
* Fix bug #25319.
|
2022-08-10 13:39:35 +08:00 |
|
|
tanghucheng
|
824b9219d9
|
* Code for gantt.
|
2022-08-10 13:34:57 +08:00 |
|
|
tanghucheng
|
3317e70203
|
* Code for port.
|
2022-08-10 13:20:37 +08:00 |
|
|
liuyongkai
|
0da420f283
|
* Fix bug #26065
|
2022-08-10 05:20:19 +00:00 |
|
|
liuruogu
|
e05e56ee70
|
* Fix bug #26173.
|
2022-08-10 05:16:15 +00:00 |
|
|
zenggang
|
7ed3db1651
|
* Adjust code
|
2022-08-10 05:12:23 +00:00 |
|
|
王怡栋
|
2a2abfe9f0
|
Merge branch 'sprint/224_tianshujie_bug' into 'master'
Sprint/224 tianshujie bug
See merge request easycorp/zentaopms!4890
|
2022-08-10 05:06:59 +00:00 |
|
|
tanghucheng
|
b1544eb12e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tanghucheng_task
|
2022-08-10 12:46:22 +08:00 |
|
|
tanghucheng
|
52cad31920
|
* Code for port.
|
2022-08-10 12:37:14 +08:00 |
|
|
zenggang
|
b05e056843
|
* Adjust code
|
2022-08-10 04:21:18 +00:00 |
|
|
dongli
|
dacb68a745
|
* Fix bug #63669.
|
2022-08-10 03:35:16 +00:00 |
|
|
xieqiyu
|
72f038d379
|
* Fix bug of edit execution can change closedDate.
|
2022-08-10 11:20:05 +08:00 |
|
|
zenggang
|
dcacaa5cea
|
* Adjust code
|
2022-08-10 03:09:50 +00:00 |
|
|
王怡栋
|
6045f06f48
|
Merge branch 'sprint/ZUI_guofeilong_fix_bug_in_c-name' into 'master'
* Fix css bug in td.c-title
See merge request easycorp/zentaopms!4883
|
2022-08-10 03:09:30 +00:00 |
|
|
liumengyi
|
986ff8cb6c
|
* Fix bug #26109.
|
2022-08-10 11:09:20 +08:00 |
|
|
guofeilong
|
f7c76765c6
|
* Fix css bug in td.c-title
|
2022-08-10 03:04:13 +00:00 |
|
|
liuyongkai
|
fa4d37f1a2
|
* Fix bug #25249
|
2022-08-10 03:01:48 +00:00 |
|
|
王怡栋
|
b690d95d2a
|
Merge branch 'sprint/224_liumengyi_63891' into 'master'
* Finish task #63891.
See merge request easycorp/zentaopms!4879
|
2022-08-10 02:49:44 +00:00 |
|
|
tianshujie
|
7a1851e7ef
|
* Fix bug #26195.
|
2022-08-10 10:33:02 +08:00 |
|
|
王怡栋
|
cc2c2b2a54
|
Merge branch 'master_liuhong_63771' into 'master'
*Finish task #63771.
See merge request easycorp/zentaopms!4881
|
2022-08-10 02:20:29 +00:00 |
|
|
liuhong
|
e1f9bc1e14
|
*Finish task #63771.
|
2022-08-10 02:18:01 +00:00 |
|
|
tianshujie
|
6d662334f9
|
* Fix bug #26167.
|
2022-08-10 10:16:23 +08:00 |
|
|
liumengyi
|
0ee1e4a63b
|
* Finish task #63891.
|
2022-08-10 09:55:02 +08:00 |
|
|
wangyidong
|
9959006f46
|
* change upgrade for change engine.
|
2022-08-10 09:43:40 +08:00 |
|
|
zenggang
|
b62d5315ff
|
* Adjust code
|
2022-08-10 01:35:59 +00:00 |
|
|
王怡栋
|
c3376a2116
|
Merge branch 'master_liuhong_63783' into 'master'
Master liuhong 63783
See merge request easycorp/zentaopms!4876
|
2022-08-10 01:33:40 +00:00 |
|
|
王怡栋
|
03deac02c8
|
Merge branch 'master_liuhong_63782' into 'master'
*Finish task #63782.
See merge request easycorp/zentaopms!4874
|
2022-08-10 01:32:29 +00:00 |
|
|
王怡栋
|
d51846a966
|
Merge branch 'importExport' into 'master'
* Code for port.
See merge request easycorp/zentaopms!4875
|
2022-08-10 01:32:04 +00:00 |
|
|
王怡栋
|
896f7d2fb1
|
Merge branch 'master_liuhong_63775' into 'master'
*Finish task #63775
See merge request easycorp/zentaopms!4873
|
2022-08-10 01:31:10 +00:00 |
|
|
王怡栋
|
210e4a4d81
|
Merge branch 'tanghucheng_task' into 'master'
* Finish task #63793.
See merge request easycorp/zentaopms!4870
|
2022-08-10 01:30:32 +00:00 |
|
|
王怡栋
|
b31a44f1a4
|
Merge branch 'sprint/224_tianshujie' into 'master'
Sprint/224 tianshujie
See merge request easycorp/zentaopms!4878
|
2022-08-10 01:30:17 +00:00 |
|
|
王怡栋
|
bedec71945
|
Merge branch 'master_liuhong_63776' into 'master'
*Finish task #63776
See merge request easycorp/zentaopms!4872
|
2022-08-10 01:29:59 +00:00 |
|