Commit Graph
34965 Commits
Author SHA1 Message Date
周旭东 f661baac8a Update importbug.html.php 2022-03-09 05:23:38 +00:00
周旭东 6b9c1cbaae Update kanban.css 2022-03-09 05:22:17 +00:00
zhouxudong 2eb4271b2b * Finishi task #50425. 2022-03-09 13:20:09 +08:00
zhouxudong c8704e30f8 * Finish task #50425. 2022-03-09 11:29:09 +08:00
孙广明 382c57984e Merge branch 'pailei_sunhuawei_story31107' into 'pailei2'
Pailei sunhuawei story31107

See merge request easycorp/zentaopms!2151
2022-03-09 01:14:21 +00:00
孙华伟 719cd91f8e Update kanban control.php 2022-03-09 01:08:17 +00:00
孙华伟 4ac1b90743 Update model.php 2022-03-09 00:59:31 +00:00
孙华伟 8f3dc47e67 Update kanban control.php 2022-03-09 00:55:06 +00:00
李玉春 5d4e08fae7 Merge branch 'sprint/pailei2_zhouxudong_19120' into 'pailei2'
* Fix bug #19120.

See merge request easycorp/zentaopms!2148
2022-03-08 09:20:03 +00:00
zhouxudong 027fbc1472 * Fix bug #19120. 2022-03-08 17:12:52 +08:00
孙华伟 31df5afed4 * add permissions. 2022-03-08 15:22:46 +08:00
孙华伟 98311aca91 * 2022-03-08 14:54:10 +08:00
孙华伟 c7f5c1f255 * 2022-03-08 14:43:41 +08:00
孙华伟 67a0272d96 *Story #31107. 2022-03-08 14:41:51 +08:00
李玉春 3b79f9ce1c Merge branch 'sprint/pailei2_zhouxudong_fixbug' into 'pailei2'
* Fix bug #19962.

See merge request easycorp/zentaopms!2137
2022-03-08 06:40:16 +00:00
李玉春 0ff0403825 Merge branch 'sprint/pailei2_zhouxudong_19823' into 'pailei2'
* Fix bug #19823.

See merge request easycorp/zentaopms!2140
2022-03-08 06:39:13 +00:00
李玉春 39d11cbedb Merge branch 'sprint/pailei2_zhouxudong_19990' into 'pailei2'
Sprint/pailei2 zhouxudong 19990

See merge request easycorp/zentaopms!2136
2022-03-08 03:29:32 +00:00
zhouxudong 65554fcadb * Fix bug #19823. 2022-03-08 11:23:31 +08:00
zhouxudong cbe21a49d8 * Fix bug #19962. 2022-03-08 10:56:25 +08:00
李玉春 d08585a725 Merge branch 'fixbug_zhouxin_16448,16449' into 'pailei2'
Fix bug 16448,16449.

See merge request easycorp/zentaopms!2134
2022-03-08 02:48:27 +00:00
zhouxin 97216edb43 Adjust code. 2022-03-08 02:47:43 +00:00
周旭东 c611670e8e Update en.php 2022-03-08 02:40:30 +00:00
周旭东 6b62b3f16d Update create.js 2022-03-08 02:37:53 +00:00
zhouxudong 49e06424d1 * Fix bug #19990. 2022-03-08 10:36:57 +08:00
zhouxin 63a6825b95 Fix bug 16448,16449. 2022-03-08 02:28:58 +00:00
zhouxudong ca901e8364 * Fix bug #19990. 2022-03-08 10:21:41 +08:00
孙华伟 03e3f26ad5 * 2022-03-08 10:03:06 +08:00
孙华伟 f8eacb6726 *Story #31107. 2022-03-08 09:48:18 +08:00
孙广明 7b962c4e38 Merge branch 'pailei' 2022-03-07 10:56:26 +08:00
孙广明 8c878ee546 Merge branch 'sprint/186_liumengyi_50325' into 'master'
* Finish task #50325.

See merge request easycorp/zentaopms!2098
2022-03-07 02:49:13 +00:00
孙广明 73e99235f6 Merge branch 'pailei_xieqiyu_20385' into 'pailei'
* Fix bug#20385.

See merge request easycorp/zentaopms!2102
2022-03-07 02:48:52 +00:00
xieqiyu 2b83d5d647 * Fix bug#20385. 2022-03-07 10:45:30 +08:00
李玉春 5c8f504da8 Merge branch 'sprint/pailei_zhouxudong_14549' into 'pailei'
* Finish task #49882.

See merge request easycorp/zentaopms!2100
2022-03-07 02:44:50 +00:00
王怡栋 74cf093beb Merge branch 'sprint/187_hufangzhou_50310' into 'master'
* Fix bug #50310.

See merge request easycorp/zentaopms!2101
2022-03-07 02:41:06 +00:00
hufangzhou 6822e98080 * Fix bug #50310. 2022-03-07 10:36:44 +08:00
zhouxudong c6eb97cc5f * Finish task #49882. 2022-03-07 10:21:57 +08:00
王怡栋 3fc98877f9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-07 10:00:17 +08:00
王怡栋 da92204f31 * code for lite version. 2022-03-07 09:59:56 +08:00
李玉春 fe873b6a53 Merge branch 'sprint/185_zhouxudong_49881' into 'pailei'
* Finish task #49881.

See merge request easycorp/zentaopms!2097
2022-03-07 01:37:43 +00:00
liumengyi 0ca866ed99 * Fix bug #50325. 2022-03-07 09:37:42 +08:00
李玉春 60fd687731 Merge branch 'sprint/185_zhouxudong_49889' into 'pailei'
Sprint/185 zhouxudong 49889

See merge request easycorp/zentaopms!2094
2022-03-07 01:37:01 +00:00
李玉春 282de05e8f Merge branch 'devops23_20308' into 'master'
修复bug 20308,20299

See merge request easycorp/zentaopms!2091
2022-03-07 01:33:14 +00:00
zhouxudong bb3be7d065 * Finish task #49881. 2022-03-07 09:31:22 +08:00
孙广明 62111d3705 Merge branch 'pailei_zhouxin_49318' into 'pailei'
Finish task 49318.

See merge request easycorp/zentaopms!2095
2022-03-07 01:10:32 +00:00
王怡栋 77529777e0 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 20022,18600

See merge request easycorp/zentaopms!2082
2022-03-07 01:09:18 +00:00
王怡栋 be02aede09 Merge branch 'sgm_50323' into 'master'
* Finish task #50323.

See merge request easycorp/zentaopms!2096
2022-03-07 01:01:09 +00:00
zhouxin ea4c5ec99b Adjust code. 2022-03-07 00:59:32 +00:00
孙广明 5cae6e943c * Finish task #50323. 2022-03-07 08:54:42 +08:00
zenggang c2e2385a9b * Adjust code 2022-03-07 00:48:08 +00:00
周旭东 9d84ab50d3 Update en.php 2022-03-07 00:40:25 +00:00