 liuhong
|
cc85ddfbc0
|
*Finish task #63780.
|
2022-08-09 01:01:50 +00:00 |
|
|
wangyidong
|
4bf7706d23
|
* code for task #63802.
|
2022-08-08 17:35:28 +08:00 |
|
|
李玉春
|
574a10bbf3
|
Merge branch 'cyy_testcase' into 'master'
* Add gitea test case.
See merge request easycorp/zentaopms!4837
|
2022-08-08 09:22:56 +00:00 |
|
|
朱金勇
|
6d82afe4fa
|
Merge branch 'sprint/sunhao/table_overflow_type' into 'master'
* change text overflow style in table.
See merge request easycorp/zentaopms!4787
|
2022-08-08 09:08:11 +00:00 |
|
|
朱金勇
|
d14a1dafad
|
Merge branch 'sprint/sunhao/optimize_blue_theme' into 'master'
* update blue theme.
See merge request easycorp/zentaopms!4746
|
2022-08-08 09:07:57 +00:00 |
|
|
孙广明
|
e3eeddfbc0
|
Merge branch 'lyk_25690' into 'master'
* Fix bug #25690
See merge request easycorp/zentaopms!4846
|
2022-08-08 08:59:32 +00:00 |
|
|
孙广明
|
fe0f69fc77
|
Merge branch 'lyk_64217' into 'master'
* Finish task #64217
See merge request easycorp/zentaopms!4844
|
2022-08-08 08:59:22 +00:00 |
|
|
liuyongkai
|
dafa228a04
|
* Fix bug #25690
|
2022-08-08 08:57:42 +00:00 |
|
|
王怡栋
|
22bf2d8058
|
Merge branch 'sprint/hufangzhou_62965' into 'master'
* Finish task #62965. Fix bug #26130, #26129, #26120.
See merge request easycorp/zentaopms!4843
|
2022-08-08 08:47:08 +00:00 |
|
|
王怡栋
|
ac968a603a
|
Merge branch 'master_xieqiyu_26097' into 'master'
* Fix bug#26097.
See merge request easycorp/zentaopms!4838
|
2022-08-08 08:46:28 +00:00 |
|
|
王怡栋
|
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 |
|
|
liuyongkai
|
da82407e9d
|
* Finish task #64217
|
2022-08-08 08:37:53 +00:00 |
|
|
hufangzhou
|
96506b7125
|
* Adjust spacing in whitelist.
|
2022-08-08 16:34:47 +08:00 |
|
|
hufangzhou
|
b44ed94231
|
* Finish task #62965. Fix bug #26130, #26129, #26120.
|
2022-08-08 16:31:20 +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 |
|
|
xieqiyu
|
69830e04d7
|
* Fix bug#26097.
|
2022-08-08 13:14:21 +08:00 |
|
|
tanghucheng
|
2eec12eeac
|
* Format code for port.
|
2022-08-08 12:15:28 +08:00 |
|
|
caoyanyi
|
523a5f5d9b
|
* Adjust codes.
|
2022-08-08 12:12:41 +08:00 |
|
|
caoyanyi
|
60492e05bb
|
* Adjust code.
|
2022-08-08 12:10:50 +08:00 |
|
|
caoyanyi
|
a8de81dce8
|
* Add gitea test case.
|
2022-08-08 12:09:29 +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 |
|