 王怡栋
|
ca91a4c8aa
|
Merge branch 'sprint/224_liumengyi_fixissue' into 'master'
* Fix issue #709.
See merge request easycorp/zentaopms!4833
|
2022-08-08 08:46:11 +00:00 |
|
|
王怡栋
|
7f6e2709d2
|
Merge branch 'master_xieqiyu_26113' into 'master'
* Fix bug#26113.
See merge request easycorp/zentaopms!4831
|
2022-08-08 08:45:32 +00:00 |
|
|
wangyidong
|
4c523e2381
|
Merge branch 'sprint/devplat_30'
|
2022-08-08 16:45:05 +08:00 |
|
|
王怡栋
|
9e6111ad6c
|
Merge branch 'master' into 'sprint/devplat_30'
# Conflicts:
# db/update17.4.sql
|
2022-08-08 08:44:25 +00:00 |
|
|
wangyuting2
|
18bbd15427
|
* Remove a space.
|
2022-08-08 16:43:18 +08: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 |
|
|
王怡栋
|
048cc1fa75
|
Merge branch 'importExport' into 'master'
Merge branch importExport into 'master'
See merge request easycorp/zentaopms!4830
|
2022-08-08 08:27:59 +00:00 |
|
|
王怡栋
|
3dacd0face
|
Merge branch 'fixbug' into 'master'
* Fix bug #26111.
See merge request easycorp/zentaopms!4836
|
2022-08-08 08:20:01 +00:00 |
|
|
wangyidong
|
9136083b10
|
* fix bug.
|
2022-08-08 16:09:32 +08:00 |
|
|
wangyidong
|
024c2352ee
|
* fix bug #26080.
|
2022-08-08 15:52:01 +08:00 |
|
|
wangyuting2
|
86bf5295b5
|
* Finish task #63908.
|
2022-08-08 15:41:00 +08:00 |
|
|
wangyidong
|
660c82b46e
|
* adjust for change table engine in upgrade.
|
2022-08-08 14:05:50 +08:00 |
|
|
liuyongkai
|
327336b7bf
|
* Fix bug 25690.
|
2022-08-08 05:59:13 +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 |
|
|
liuyongkai
|
628834cbab
|
* Fix the view of kanbans' content
|
2022-08-08 05:28:11 +00:00 |
|
|
liuyongkai
|
7e7b535c13
|
* Fix the view of kanbans' content
|
2022-08-08 05:25:02 +00:00 |
|
|
tanghucheng
|
2eec12eeac
|
* Format code for port.
|
2022-08-08 12:15:28 +08:00 |
|
|
tanghucheng
|
36b07367c9
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-08 12:07:23 +08:00 |
|
|
tanghucheng
|
3ad6700786
|
* Fix bug #26111.
|
2022-08-08 11:59:27 +08:00 |
|
|
王怡栋
|
ed951dc12e
|
Merge branch 'sprint/gantt_upgrade' into 'master'
Sprint/gantt upgrade
See merge request easycorp/zentaopms!4835
|
2022-08-08 03:25:42 +00:00 |
|
|
mayue
|
0b362d4061
|
* Add lang .
|
2022-08-08 11:23:36 +08:00 |
|
|
tanghucheng
|
d71cb4dd67
|
* Code for port.
|
2022-08-08 11:07:36 +08:00 |
|
|
wangyidong
|
f0448407e8
|
Merge branch 'sprint/hufangzhou_createdoc'
|
2022-08-08 11:05:43 +08:00 |
|
|
王怡栋
|
ec328f7432
|
Merge branch 'master' into 'sprint/hufangzhou_createdoc'
# Conflicts:
# config/zentaopms.php
|
2022-08-08 03:05:17 +00:00 |
|
|
hufangzhou
|
5280ed4fc6
|
* Remove the unused code.
|
2022-08-08 11:02:06 +08:00 |
|
|
tanghucheng
|
20f93952c1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-08 10:57:56 +08:00 |
|
|
tanghucheng
|
3eccc858eb
|
* Format Code for port.
|
2022-08-08 10:57:31 +08:00 |
|
|
hufangzhou
|
f8b34bc690
|
* Remove the unused code.
|
2022-08-08 10:56:49 +08:00 |
|
|
mayue
|
fc0a0b2d61
|
* Optimize code.
|
2022-08-08 10:56:43 +08:00 |
|
|
hufangzhou
|
6b9705e6c6
|
* Remove the uploader file in the first step of create doc.
|
2022-08-08 10:45:59 +08:00 |
|
|
liumengyi
|
1d9846d808
|
* Fix issue #709.
|
2022-08-08 10:43:38 +08:00 |
|
|
mayue
|
b338d96743
|
* Optimize code.
|
2022-08-08 10:41:26 +08:00 |
|
|
mayue
|
fc13fad289
|
resolve conflict
|
2022-08-08 10:39:25 +08: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 |
|
|
xieqiyu
|
03528bdfc9
|
* Fix bug#26113.
|
2022-08-08 10:10:12 +08:00 |
|
|
tanghucheng
|
08b92c0ee8
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-08 09:48:29 +08:00 |
|
|
tanghucheng
|
c4510a152a
|
* Code for port.
|
2022-08-08 09:48:07 +08:00 |
|
|
王怡栋
|
8c7c196e70
|
Merge branch 'sprint/221_liumengyi_fixbug' into 'master'
* Fix bug #26102, #25992.
See merge request easycorp/zentaopms!4828
|
2022-08-08 01:47:35 +00:00 |
|
|
liyuchun
|
a9661e5718
|
* Fix bug #25176.
|
2022-08-07 08:40:43 +00:00 |
|
|
sunguangming
|
1e05476b43
|
* Code for kanban action.
|
2022-08-05 17:35:29 +08:00 |
|
|
liumengyi
|
911ba77fea
|
* Fix bug #25992.
|
2022-08-05 16:16:05 +08:00 |
|
|
lanzongjun
|
8429ff7062
|
realbegin date fix
|
2022-08-05 16:04:10 +08:00 |
|
|
tanghucheng
|
b0f93ce021
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-05 16:03:43 +08:00 |
|
|
tanghucheng
|
03eb151f67
|
* Code for task showimport.
|
2022-08-05 16:03:21 +08:00 |
|
|
lanzongjun
|
9c6356fded
|
debug
|
2022-08-05 15:50:24 +08:00 |
|
|
liumengyi
|
756c8d4dc0
|
* Fix bug #26102.
|
2022-08-05 15:49:56 +08:00 |
|
|
lanzongjun
|
408150ff5c
|
debug
|
2022-08-05 15:40:25 +08:00 |
|
|
liyuchun
|
54488775af
|
Add unit cases.
|
2022-08-05 07:13:10 +00:00 |
|
|
liyuchun
|
54c81c82e2
|
* Add unit case.
|
2022-08-05 07:06:35 +00:00 |
|