 孙广明
|
ea2536005e
|
Merge branch 'sprint/186_tianshujie_fixbug' into 'master'
* Remove owt module when upgrading.
See merge request easycorp/zentaopms!2054
|
2022-03-03 02:09:14 +00:00 |
|
|
王怡栋
|
c4229f0d32
|
Merge branch 'sprint/186_hufangzhou_xuanxuan' into 'master'
* Change the owt to conference.
See merge request easycorp/zentaopms!2053
|
2022-03-03 01:56:52 +00:00 |
|
|
hufangzhou
|
4fcbccbaa8
|
* Change the owt to conference.
|
2022-03-03 09:53:14 +08:00 |
|
|
tianshujie
|
081cc7dd17
|
* Remove owt module when upgrading.
|
2022-03-03 09:00:55 +08:00 |
|
|
孙广明
|
526a933f47
|
Merge branch 'sprint/186_tianshujie_20245' into 'master'
* Fix bug #20247.
See merge request easycorp/zentaopms!2048
|
2022-03-02 07:16:55 +00:00 |
|
|
tianshujie
|
4f17795ffd
|
* Fix bug #20266.
|
2022-03-02 15:15:37 +08:00 |
|
|
tianshujie
|
0bb3371484
|
* Fix bug #20245.
|
2022-03-02 14:48:50 +08:00 |
|
|
tianshujie
|
a9f1fcabc2
|
* Fix bug #20247.
|
2022-03-02 14:30:41 +08:00 |
|
|
王怡栋
|
b6cd92a386
|
Merge branch 'sgm_fixbug' into 'master'
* Add upgrade logic.
See merge request easycorp/zentaopms!2047
|
2022-03-02 06:13:26 +00:00 |
|
|
孙广明
|
42624e0427
|
* Add upgrade logic.
|
2022-03-02 14:10:59 +08:00 |
|
|
liyuchun
|
adee975255
|
Merge branch 'sprint/sunhao/task49295'
|
2022-03-02 13:48:36 +08:00 |
|
|
孙广明
|
f01dc2a720
|
Merge branch 'sprint/186_hufangzhou_gantt' into 'master'
* Move the gantt extension file to common/view.
See merge request easycorp/zentaopms!2044
|
2022-03-02 05:32:48 +00:00 |
|
|
hufangzhou
|
59181566ff
|
* Move the gantt extension file to common/view.
|
2022-03-02 13:22:53 +08:00 |
|
|
孙广明
|
3ce145dc36
|
Merge branch 'sprint/186_liumengyi_20142' into 'master'
* Fix bug #20142.
See merge request easycorp/zentaopms!2043
|
2022-03-02 05:20:35 +00:00 |
|
|
liumengyi
|
f1835c9662
|
* Fix bug #20142.
|
2022-03-02 13:19:02 +08:00 |
|
|
王怡栋
|
83ce0b8052
|
Merge branch 'sgm_fixbug' into 'master'
* Fix bug #20238.
See merge request easycorp/zentaopms!2041
|
2022-03-02 03:19:32 +00:00 |
|
|
王怡栋
|
4e9409ed76
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-02 11:05:55 +08:00 |
|
|
王怡栋
|
0aa901eb64
|
* fix bug #19908.
|
2022-03-02 11:05:30 +08:00 |
|
|
孙广明
|
b33cb32e4b
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix priv and classic mode.
See merge request easycorp/zentaopms!2031
|
2022-03-02 03:05:06 +00:00 |
|
|
tanghucheng
|
a1dcf760a1
|
* Fix bug.
|
2022-03-02 10:54:50 +08:00 |
|
|
孙广明
|
c3c1351400
|
* Fix bug #20238.
|
2022-03-02 10:53:30 +08:00 |
|
|
王怡栋
|
ff80c70ad1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-02 10:35:00 +08:00 |
|
|
王怡栋
|
f71f500755
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-02 10:34:40 +08:00 |
|
|
孙广明
|
f7078f64b7
|
Merge branch 'sprint/186_liumengyi_20117' into 'master'
* Fix bug #20117.
See merge request easycorp/zentaopms!2040
|
2022-03-02 02:29:26 +00:00 |
|
|
liumengyi
|
fcc37d1ab0
|
* Fix code for productplan getPairs.
|
2022-03-02 10:28:22 +08:00 |
|
|
liumengyi
|
bf6d9c2e3a
|
* Fix bug #20117.
|
2022-03-02 10:15:38 +08:00 |
|
|
李玉春
|
227db2b158
|
Merge branch 'sprint/186_tianshujie_20228' into 'master'
Sprint/186 tianshujie 20228
See merge request easycorp/zentaopms!2039
|
2022-03-02 02:13:36 +00:00 |
|
|
王怡栋
|
76eea1f5d9
|
* adjust for global create.
|
2022-03-02 10:06:19 +08:00 |
|
|
tianshujie
|
391d9cc18b
|
* Fix bug #20090.
|
2022-03-02 10:02:27 +08:00 |
|
|
tanghucheng
|
8342661162
|
* Add batchCreateCard prvi for lite.
|
2022-03-02 10:01:45 +08:00 |
|
|
王怡栋
|
b7bcd483ab
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 20022
See merge request easycorp/zentaopms!2033
|
2022-03-02 01:58:48 +00:00 |
|
|
tianshujie
|
2ef598afcc
|
* Fix the problem of white screen after upgrade.
|
2022-03-02 09:35:34 +08:00 |
|
|
tianshujie
|
1dafa1e8dd
|
* Fix bug #20228.
|
2022-03-02 09:26:39 +08:00 |
|
|
李玉春
|
a28796c991
|
Merge branch 'sprint/sunhao/bug20115' into 'master'
* Bug #20115, fix contextmenu sub items not show in kanban.
See merge request easycorp/zentaopms!2038
|
2022-03-02 01:20:39 +00:00 |
|
|
李玉春
|
1af5cf8567
|
Merge branch 'sprint/sunhao/bug20214' into 'master'
* Bug #20214, fix card style on dragging in kanban.
See merge request easycorp/zentaopms!2037
|
2022-03-02 01:19:04 +00:00 |
|
|
Hao Sun
|
cc9790f774
|
* Bug #20115, fix contextmenu sub items not show in kanban.
|
2022-03-02 09:12:41 +08:00 |
|
|
tanghucheng
|
87aa943546
|
* Fix bug for classic.
|
2022-03-02 09:04:20 +08:00 |
|
|
Hao Sun
|
0c8171af7a
|
* Bug #20214, fix card style on dragging in kanban.
|
2022-03-02 08:57:26 +08:00 |
|
|
zhujinyong
|
04b9fd749d
|
* Fix switch vision.
|
2022-03-02 08:53:11 +08:00 |
|
|
朱金勇
|
56a040a2d7
|
Merge branch 'sprint/186_hufangzhou_makefile' into 'master'
* Adjust the makefile.
See merge request easycorp/zentaopms!2036
|
2022-03-02 00:40:12 +00:00 |
|
|
朱金勇
|
a59db7cd97
|
Merge branch 'sprint/sunhao/fix_refresh' into 'master'
* fix refresh with app param not work as expected.
See merge request easycorp/zentaopms!2034
|
2022-03-02 00:40:01 +00:00 |
|
|
朱金勇
|
1e576a8ad1
|
Merge branch 'sprint/sunhao/bug20185' into 'master'
* Bug #20185, fix request pending forever when playing video before.
See merge request easycorp/zentaopms!2035
|
2022-03-02 00:39:28 +00:00 |
|
|
孙广明
|
d8e9831088
|
Merge branch 'sprint/186_tianshujie_19786' into 'master'
Sprint/186 tianshujie 19786
See merge request easycorp/zentaopms!2032
|
2022-03-02 00:37:29 +00:00 |
|
|
hufangzhou
|
cac648f8c8
|
* Adjust the makefile.
|
2022-03-02 08:36:32 +08:00 |
|
|
tianshujie
|
30600fb7bb
|
* Fix bug #20200.
|
2022-03-01 20:37:20 +08:00 |
|
|
Hao Sun
|
875e6add75
|
* Add hook to app page before reload it.
|
2022-03-01 20:20:25 +08:00 |
|
|
tianshujie
|
cfb4b274a4
|
* Fix bug #20170.
|
2022-03-01 20:06:44 +08:00 |
|
|
Hao Sun
|
101a0cea37
|
* Bug #20185, fix request pending forever when playing video before.
|
2022-03-01 17:55:26 +08:00 |
|
|
Hao Sun
|
3d2d30363f
|
* fix refresh with app param not work as expected.
|
2022-03-01 17:49:47 +08:00 |
|
|
Zongjun Lan
|
f4970f502d
|
* fix bug 20023
|
2022-03-01 16:34:34 +08:00 |
|