 孙广明
|
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 |
|
|
王怡栋
|
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 |
|
|
孙广明
|
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 |
|
|
孙广明
|
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 |
|
|
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 |
|
|
王怡栋
|
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 |
|
|
liuhong
|
0e9304bff4
|
* Fix task #79669.
|
2022-12-13 06:38:10 +00:00 |
|
|
王怡栋
|
f722967983
|
Merge branch 'sprint/hufangzhou_minify' into 'master'
* Fix bug for helper class not found.
See merge request easycorp/zentaopms!6529
|
2022-12-13 06:18:17 +00:00 |
|
|
王怡栋
|
e70366d1c7
|
Merge branch 'zentaopms273_wyd' into 'master'
* code task #79859,79858,79857,79856,79855,79854.
See merge request easycorp/zentaopms!6531
|
2022-12-13 06:17:58 +00:00 |
|
|
wangyidong
|
8dc609e4a0
|
* code task #79859,79858,79857,79856,79855,79854.
|
2022-12-13 14:15:39 +08:00 |
|
|
liuhong
|
64388b7ec3
|
* Finish task #7966* Finish task #79669.
|
2022-12-13 06:13:22 +00:00 |
|
|
孙广明
|
81d54c790e
|
* Finish task #79664.
|
2022-12-13 13:43:24 +08:00 |
|
|
liuhong
|
093826a152
|
* Adjust code task #79669.
|
2022-12-13 05:13:22 +00:00 |
|
|
朱金勇
|
2a69111edc
|
Merge branch 'fix_doccomment' into 'master'
* Use string instead of varchar.
See merge request easycorp/zentaopms!6504
|
2022-12-13 04:29:38 +00:00 |
|
|
liuhong
|
553a684afe
|
* Finish task #79669.
|
2022-12-13 03:10:25 +00:00 |
|
|
liuhong
|
9013eda03b
|
* Add Sql column for zt_feedback #79661.
|
2022-12-13 02:35:04 +00:00 |
|
|
hufangzhou
|
68108737e6
|
* Fix bug for helper class not found.
|
2022-12-13 02:18:30 +00:00 |
|
|
孙广明
|
17b092b060
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Task #79450#79671#79665#79670#79466
See merge request easycorp/zentaopms!6525
|
2022-12-13 01:47:15 +00:00 |
|
|
lanzongjun
|
493910031a
|
* Finish Task #79466
|
2022-12-13 09:45:01 +08:00 |
|
|
孙广明
|
389a68e863
|
Merge branch 'master_xieqiyu_79663' into 'master'
* Code for task#79663.
See merge request easycorp/zentaopms!6526
|
2022-12-13 01:33:28 +00:00 |
|
|
lanzongjun
|
0a492b61fa
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun
|
2022-12-13 09:08:08 +08:00 |
|
|
lanzongjun
|
6da0c6ea01
|
* Finish Task #79670
|
2022-12-13 09:06:53 +08:00 |
|
|
王怡栋
|
29ffa09b81
|
Merge branch 'zentaopms273_wyd' into 'master'
* code for task #79861,79860.
See merge request easycorp/zentaopms!6527
|
2022-12-13 00:40:15 +00:00 |
|
|
王怡栋
|
90acd9abcf
|
Merge branch 'feedback_1692' into 'master'
* Resolve feedback#1692
See merge request easycorp/zentaopms!6524
|
2022-12-13 00:39:42 +00:00 |
|
|
wangyidong
|
5bf3b27262
|
* code for task #79861,79860.
|
2022-12-13 08:38:36 +08:00 |
|
|
liuhong
|
d3d10ea6a7
|
* Adjust code task #79661.
|
2022-12-12 12:03:10 +00:00 |
|
|
lanzongjun
|
d2cb9938b5
|
* Finish Task #79670
|
2022-12-12 17:34:43 +08:00 |
|