Commit Graph
43295 Commits
Author SHA1 Message Date
王怡栋 ff55e9ca2e Merge branch 'master_liuhong_63772' into 'master'
* Code for task#63772. Fix bug of plan empty when at the page of project bug...

See merge request easycorp/zentaopms!4854
2022-08-09 05:33:04 +00:00
王怡栋 a106fcb5db Merge branch 'master_liuhong_63777' into 'master'
*Finish task #63777.

See merge request easycorp/zentaopms!4852
2022-08-09 05:31:12 +00:00
王怡栋 5e842bff36 Merge branch 'importExport' into 'master'
* Add language file for port.

See merge request easycorp/zentaopms!4849
2022-08-09 05:30:28 +00:00
王怡栋 19f7a0df69 Merge branch 'sprint/224_liumengyi_63691' into 'master'
* Finish task #63691.

See merge request easycorp/zentaopms!4850
2022-08-09 05:30:07 +00:00
wangyidong 038b43e8f5 * adjust for upgrade. 2022-08-09 11:32:18 +08:00
wangyidong 402d439ee0 * fix bug #26164. 2022-08-09 10:52:08 +08:00
xieqiyu f323e7ad91 * Code for task#63772. 2022-08-09 10:46:05 +08:00
管西迎 c5f539cf28 * Set stages. 2022-08-09 02:44:16 +00:00
管西迎 f89bba43e6 Fix only condition. 2022-08-09 02:39:26 +00:00
管西迎 0e3e758b06 Add allow_failure. 2022-08-09 02:34:09 +00:00
管西迎 1f828a0a8a Add uinit test. 2022-08-09 02:27:57 +00:00
王怡栋 b1c4645857 Merge branch 'fix_code_error' into 'master'
* Fix code error.

See merge request easycorp/zentaopms!4853
2022-08-09 01:56:11 +00:00
mayue 6c8cdaad1f * Fix code error. 2022-08-09 09:50:37 +08:00
xieqiyu 8a159ba714 * Code for task#63772. Fix bug of plan empty when at the page of project bug and execution bug in all product. 2022-08-09 09:39:58 +08:00
wangyidong 2769e53ea0 * adjust for task #63802. 2022-08-09 08:54:42 +08:00
tanghucheng f30414f8a3 * Add language file for port. 2022-08-09 08:36:12 +08:00
王怡栋 652a3456f0 Merge branch 'importExport' into 'master'
* Code for port.

See merge request easycorp/zentaopms!4848
2022-08-09 00:33:29 +00:00
tanghucheng 77133a8f4b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-09 08:31:43 +08:00
王怡栋 4384002a33 Merge branch 'sprint/copyproject' into 'master'
Sprint/copyproject

See merge request easycorp/zentaopms!4847
2022-08-09 00:28:56 +00:00
liuhong 75ddc3fd14 *Finish task #63777. 2022-08-08 21:32:15 +00:00
tanghucheng 851af309cb * Code for port. 2022-08-08 23:26:34 +08:00
liuhong 47db91c402 *Finish task #63772. 2022-08-08 15:25:34 +00:00
lanzongjun 0e75eed65c fix cp project 2022-08-08 18:57:16 +08:00
lanzongjun 5481c3b2b9 fix cp project 2022-08-08 18:47:18 +08:00
lanzongjun 15cce6ebfa fix cp project 2022-08-08 18:18:09 +08: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