 lanzongjun
|
f09fd6d981
|
fix bug resize move
|
2022-08-04 14:07:02 +08:00 |
|
|
lanzongjun
|
f2d0b3b3b3
|
resolve conflict
|
2022-08-04 13:51:27 +08:00 |
|
|
lanzongjun
|
cff20cfe1f
|
* fix bug
|
2022-08-04 13:50:52 +08:00 |
|
|
mayue
|
436cf26588
|
Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/max40_gantt_upgrade
|
2022-08-04 13:07:42 +08:00 |
|
|
lanzongjun
|
9baa2fba54
|
* fix bug
|
2022-08-04 13:06:17 +08:00 |
|
|
mayue
|
58567b28e7
|
* Finish task #62887.
|
2022-08-04 11:09:48 +08:00 |
|
|
mayue
|
da64ac5a50
|
Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/max40_gantt_upgrade
|
2022-08-04 09:57:07 +08:00 |
|
|
lanzongjun
|
8ce6a83819
|
* fix bug
|
2022-08-04 09:56:03 +08:00 |
|
|
mayue
|
397c6d55b4
|
* Optimize code.
|
2022-08-04 09:38:01 +08:00 |
|
|
mayue
|
dfeafd9dbd
|
* Add key for zt_task.
|
2022-08-04 09:21:05 +08:00 |
|
|
mayue
|
37c49204e1
|
Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/max40_gantt_upgrade
|
2022-08-04 09:09:53 +08:00 |
|
|
mayue
|
0ab5b2956d
|
* Finish task #62892.
|
2022-08-04 09:07:37 +08:00 |
|
|
lanzongjun
|
451bffdc26
|
* finish task #62892
|
2022-08-03 09:59:01 +08:00 |
|
|
lanzongjun
|
32edb1c34b
|
Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/gantt_upgrade
|
2022-08-03 09:28:53 +08:00 |
|
|
lanzongjun
|
1ae1352f11
|
* finish task #62889
|
2022-08-03 09:28:39 +08:00 |
|
|
mayue
|
733385c430
|
* Merge code .
|
2022-08-02 17:38:48 +08:00 |
|
|
mayue
|
6ebb39755a
|
* Add some code.
|
2022-08-02 17:36:44 +08:00 |
|
|
mayue
|
27a91903f1
|
Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/max40_gantt_upgrade
|
2022-08-02 17:32:10 +08:00 |
|
|
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 |
|
|
mayue
|
62b3b33910
|
* Add update17.4.sql.
|
2022-08-01 16:53:49 +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 |
|