Commit Graph
48986 Commits
Author SHA1 Message Date
孙广明 cfd9e136bc * Fix bug #30878. 2022-12-15 10:42:59 +08:00
wangyidong 6391ddfe1e * adjust style. 2022-12-15 10:11:25 +08:00
孙广明 4a718900d2 * Fix bug #30870. 2022-12-15 10:05:16 +08:00
孙广明 0d1495522b * Finish task #79446. 2022-12-15 09:57:19 +08:00
wangyidong 6c02c05d51 * fix bug #30676. 2022-12-15 09:18:46 +08:00
孙广明 4b14d842d2 * Finish task #79447. 2022-12-14 14:39:41 +08:00
孙广明 a118120919 * Add title. 2022-12-14 14:27:38 +08:00
孙广明 507ac90e83 * Finish task #79441. 2022-12-14 14:21:51 +08:00
孙广明 b654a1f43d Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Task #79665#79466

See merge request easycorp/zentaopms!6542
2022-12-14 06:15:04 +00:00
孙广明 c8fbb5633c Merge branch 'master_xieqiyu_79668' into 'master'
Master xieqiyu 79668

See merge request easycorp/zentaopms!6544
2022-12-14 06:14:49 +00:00
孙广明 8d8696b1e4 Merge branch 'master_xieqiyu_79662' into 'master'
* Code for task#79662.

See merge request easycorp/zentaopms!6548
2022-12-14 06:14:08 +00:00
wangyidong 5b48a564f0 * adjust style for release view page. 2022-12-14 14:12:36 +08:00
xieqiyu fc17dfc949 * Code for task#79662. 2022-12-14 14:10:49 +08:00
王怡栋 e14725f9b8 Merge branch 'sprint/hufangzhou_newVersion' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!6547
2022-12-14 05:45:24 +00:00
hufangzhou 6cef691b39 * Add the new version. 2022-12-14 05:28:51 +00:00
孙广明 05f7ad5035 * Finish task #79442. 2022-12-14 13:10:06 +08:00
王怡栋 3657178a04 Merge branch 'zentaopms273_wyd' into 'master'
* adjust for style.

See merge request easycorp/zentaopms!6546
2022-12-14 03:34:01 +00:00
wangyidong 856eb4d410 * adjust for style. 2022-12-14 11:33:00 +08:00
朱金勇 f700fd6aa7 Merge branch 'fix_106' into 'master'
* Fix sql injection when importing jira.

See merge request easycorp/zentaopms!6543
2022-12-14 03:09:42 +00:00
王怡栋 2f2c098958 Merge branch 'zentaopms273_wyd' into 'master'
* fix bug #30769.

See merge request easycorp/zentaopms!6545
2022-12-14 03:05:49 +00:00
wangyidong c7e2ac395d * fix bug #30769. 2022-12-14 11:04:44 +08:00
lanzongjun 34a1ff3518 * Finish Task #79466 2022-12-14 10:50:41 +08:00
lanzongjun 9f3e8eb09f * Finish Task #$plan->branch 2022-12-14 10:28:59 +08:00
王怡栋 1efd6a7f30 Merge branch 'sprint/hufangzhou_feedback_1723' into 'master'
* Handle feedback #1723.

See merge request easycorp/zentaopms!6540
2022-12-14 02:16:58 +00:00
xieqiyu 0e39758f3f * Code for task#79668. 2022-12-14 09:58:40 +08:00
孙广明 9648b48513 * Finish task #79457. 2022-12-14 09:45:36 +08:00
Lufei 2fc604895d * Fix checkPriv error. 2022-12-14 09:37:25 +08:00
Lufei 447db0a97a * Fix sql injection when importing jira.
close GH-106
2022-12-14 09:37:00 +08:00
孙广明 6f584ec3c1 Merge branch 'sprint_273_79669' into 'master'
Sprint 273 79669

See merge request easycorp/zentaopms!6534
2022-12-14 01:33:28 +00:00
lanzongjun afd4d269a2 * Finish Task #79665 2022-12-14 09:33:20 +08:00
孙广明 9fbfd59f9b Merge branch 'master_xieqiyu_79673' into 'master'
* Code for task#79673.

See merge request easycorp/zentaopms!6539
2022-12-14 01:31:59 +00:00
孙广明 d48ae97cf0 * Code for change story title style. 2022-12-14 09:24:16 +08:00
hufangzhou e248cd064b * Handle feedback #1723. 2022-12-14 00:45:03 +00:00
xieqiyu 38fad313d6 * Code for task#79673. 2022-12-13 22:35:01 +08:00
xieqiyu 8ac26c73c3 * Code for task#79668. 2022-12-13 22:05:32 +08:00
王怡栋 4866ca582f Merge branch 'zentaopms273_wyd' into 'master'
* fix bug #30748.

See merge request easycorp/zentaopms!6537
2022-12-13 09:25:16 +00:00
孙广明 b8aa4597a7 Merge branch 'sprint_273_79661' into 'master'
Sprint 273 79661

See merge request easycorp/zentaopms!6535
2022-12-13 09:18:04 +00:00
孙广明 009b6345c8 Merge branch 'master_xieqiyu_79672' into 'master'
* Code for task#79672.

See merge request easycorp/zentaopms!6538
2022-12-13 09:17:51 +00:00
xieqiyu 455e7af0da * Code for task#79672. 2022-12-13 17:08:30 +08:00
wangyidong 4ca4c4ccdb * fix bug #30748. 2022-12-13 17:06:14 +08:00
孙广明 01165d0082 Merge branch 'master_xieqiyu_fixbug' into 'master'
Master xieqiyu fixbug

See merge request easycorp/zentaopms!6536
2022-12-13 08:46:14 +00:00
xieqiyu 54a12ea735 * Fix bug of task#79663. 2022-12-13 16:44:33 +08:00
xieqiyu 5c2ed30fd3 * Fix bug of task#79663. 2022-12-13 16:42:17 +08:00
孙广明 0beb81ebd7 * Fix multi task bug. 2022-12-13 16:15:28 +08:00
王怡栋 01277efa82 Merge branch 'bugfix/liwenrui/userping' into 'master'
* remove ping from user update.

See merge request easycorp/zentaopms!6533
2022-12-13 08:10:43 +00:00
文睿 李 cb87d73f59 * remove ping from user update. 2022-12-13 07:26:56 +00:00
liuhong c215624d2a * Adjust code for task #79669. 2022-12-13 07:23:27 +00:00
王怡栋 4f02b6651a Merge branch 'zentaopms273_wyd' into 'master'
* code for task #79852,79853.

See merge request easycorp/zentaopms!6532
2022-12-13 07:21:03 +00:00
孙广明 55c79e0399 * Code for task #79664. 2022-12-13 15:20:09 +08:00
wangyidong f691ba2918 * code for task #79852,79853. 2022-12-13 15:19:54 +08:00