 lanzongjun
|
f47ab8a359
|
* finish task #62889
|
2022-08-02 17:18:24 +08:00 |
|
|
lanzongjun
|
245aaf0b14
|
add dhtmlx
|
2022-08-02 17:14:33 +08:00 |
|
|
lanzongjun
|
5f5d893546
|
add plugins
|
2022-08-02 08:33:50 +08:00 |
|
|
lanzongjun
|
3351911caa
|
delete gantt ext
|
2022-07-28 14:47:26 +08:00 |
|
|
lanzongjun
|
f661dd7678
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/gantt_upgrade
|
2022-07-28 14:07:17 +08:00 |
|
|
王怡栋
|
4397257ae2
|
Merge branch 'sprint/master_zhouxudong_25819' into 'master'
* Fix bug #25819.
See merge request easycorp/zentaopms!4704
|
2022-07-28 05:57:55 +00:00 |
|
|
王怡栋
|
5ec5c071f3
|
Merge branch 'sprint/220_tianshujie_fixbug' into 'master'
Sprint/220 tianshujie fixbug
See merge request easycorp/zentaopms!4707
|
2022-07-28 05:47:21 +00:00 |
|
|
tianshujie
|
dbcb3c9f1b
|
* Fix bug #25465.
|
2022-07-28 13:44:04 +08:00 |
|
|
tianshujie
|
d515c08c5e
|
* Fix bug #25683.
|
2022-07-28 13:42:31 +08:00 |
|
|
tianshujie
|
6336149a1e
|
* Fix bug #25766.
|
2022-07-28 13:33:38 +08:00 |
|
|
lanzongjun
|
f866342fd2
|
* upgrade
|
2022-07-28 13:26:09 +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 |
|
|
liumengyi
|
c9753f5490
|
* Fix bug #25814.
|
2022-07-28 13:22:32 +08:00 |
|
|
李玉春
|
580bb4dc22
|
Merge branch 'cyy_gitea' into 'master'
Cyy gitea
See merge request easycorp/zentaopms!4702
|
2022-07-28 05:11:07 +00:00 |
|
|
sunguangming
|
019bf42e4d
|
* Fix bug #25814.
|
2022-07-28 13:10:11 +08:00 |
|
|
zhouxudong
|
d7606aa700
|
* Fix bug #25819.
|
2022-07-28 05:03:24 +00:00 |
|
|
tianshujie
|
0f75b6ef36
|
* Fix bug #25808.
|
2022-07-28 13:03:09 +08:00 |
|
|
caoyanyi
|
abc3542cf3
|
* Modify repo list.
|
2022-07-28 13:01:32 +08:00 |
|
|
liumengyi
|
95c7c2ccfc
|
* Fix bug #25814.
|
2022-07-28 13:01:06 +08:00 |
|
|
caoyanyi
|
d9b1d038eb
|
* Modify page style and some bug.
|
2022-07-28 11:31:24 +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 |
|
|
mayue
|
12fa7ecaec
|
* Fix cfd issue.
|
2022-07-28 11:01:24 +08:00 |
|
|
王怡栋
|
6376fb58e0
|
Merge branch 'sprint/master_zhouxudong_25748' into 'master'
* Fix bug #25748.
See merge request easycorp/zentaopms!4698
|
2022-07-28 02:05:44 +00:00 |
|
|
王怡栋
|
9db987f0aa
|
Merge branch 'sprint/220_liumengyi_fixbug' into 'master'
* Finish task #62494, and fix bug #25797.
See merge request easycorp/zentaopms!4699
|
2022-07-28 02:05:11 +00:00 |
|
|
liumengyi
|
ad763d0fd5
|
* Optimize code for task #62494.
|
2022-07-28 10:04:05 +08:00 |
|
|
liumengyi
|
1375165c73
|
* Optimize code for task #62494.
|
2022-07-28 10:02:43 +08:00 |
|
|
liumengyi
|
e13315a151
|
* Finish task #62494.
|
2022-07-28 09:57:02 +08:00 |
|
|
liumengyi
|
60b32e04da
|
* Fix bug #25797.
|
2022-07-28 09:54:42 +08:00 |
|
|
caoyanyi
|
558412c237
|
* Modify repo pull in tmp.
|
2022-07-28 09:47:10 +08:00 |
|
|
王怡栋
|
f970d5654b
|
Merge branch 'sprint/hufangzhou_25621' into 'master'
* Fix bug #25621.
See merge request easycorp/zentaopms!4697
|
2022-07-28 00:53:08 +00:00 |
|
|
王怡栋
|
d6ea8aea86
|
Merge branch 'master_xieqiyu_25004' into 'master'
* Fix bug#25004.
See merge request easycorp/zentaopms!4676
|
2022-07-28 00:52:40 +00:00 |
|
|
zhouxudong
|
2e6ef972b0
|
* Fix bug #25748.
|
2022-07-28 00:47:37 +00:00 |
|
|
hufangzhou
|
48285709d3
|
* Fix bug #25621.
|
2022-07-28 08:29:54 +08:00 |
|
|
tianshujie
|
9f3c5e3b30
|
* Fix bug #25682.
|
2022-07-28 08:24:34 +08:00 |
|
|
xieqiyu
|
e927796641
|
* Fix bug#25004.
|
2022-07-28 08:16:07 +08:00 |
|
|
xieqiyu
|
0ec68feb10
|
* Fix bug#25004.
|
2022-07-27 21:38:28 +08:00 |
|
|
朱金勇
|
04cc07475b
|
Merge branch 'sprint/hufangzhou_closeApp' into 'master'
* Remove the unsed code.
See merge request easycorp/zentaopms!4696
|
2022-07-27 09:57:17 +00:00 |
|
|
朱金勇
|
0bb37ccf10
|
Merge branch 'fix_open_tab' into 'master'
* fix open tab with same url occurs blank page.
See merge request easycorp/zentaopms!4694
|
2022-07-27 09:57:07 +00:00 |
|
|
hufangzhou
|
a9f10fe868
|
* Remove the unsed code.
|
2022-07-27 17:40:31 +08:00 |
|
|
王怡栋
|
c605d6e51c
|
Merge branch 'sprint/master_zhouxudong_25103' into 'master'
* Fix bug #25103.
See merge request easycorp/zentaopms!4695
|
2022-07-27 09:35:06 +00:00 |
|
|
zhouxudong
|
45ace8beb5
|
* Fix bug #25103.
|
2022-07-27 09:11:56 +00:00 |
|
|
王怡栋
|
e74ddb9e4a
|
Merge branch 'sprint/220_liumengyi_25782' into 'master'
* Fix bug #25782.
See merge request easycorp/zentaopms!4693
|
2022-07-27 08:59:41 +00:00 |
|
|
王怡栋
|
378fb33899
|
Merge branch 'sprint/xuanxuan_112' into 'master'
Sprint/xuanxuan 112
See merge request easycorp/zentaopms!4687
|
2022-07-27 08:59:23 +00:00 |
|
|
Hao Sun
|
b13e504ec4
|
* fix open tab with same url occurs blank page.
|
2022-07-27 08:58:40 +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 |
|
|
liumengyi
|
845da88b1d
|
* Fix bug #25782.
|
2022-07-27 16:26:46 +08:00 |
|
|
tianshujie
|
4268af5d06
|
* Fix function name.
|
2022-07-27 16:22:42 +08:00 |
|
|
tianshujie
|
fd1868a287
|
* Fix bug #25465.
|
2022-07-27 16:22:07 +08:00 |
|
|
hufangzhou
|
6e9ba532ba
|
* Fix bug #25743.
|
2022-07-27 16:20:21 +08: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 |
|