Commit Graph
1507 Commits
Author SHA1 Message Date
李玉春 c0ebf6480e Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2534
2022-03-25 03:00:00 +00:00
tianshujie a3b55806f5 * Fix bug #17212. 2022-03-25 10:25:37 +08:00
孙广明 e4189b329c * Fix whitelist bug. 2022-03-25 10:21:50 +08:00
tianshujie 79e9ff2bdd * Fix bug #17187. 2022-03-25 09:52:44 +08:00
Hao Sun 539c797bd5 * bug #14569, optimize style for dropmenu. 2022-03-24 17:01:41 +08:00
李玉春 009aaed504 Merge branch 'devops24_zenggang' into 'master'
Finish task#51184,51176,51141

See merge request easycorp/zentaopms!2508
2022-03-24 07:45:13 +00:00
李玉春 43d834e01d Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!2513
2022-03-24 07:44:23 +00:00
zhouxudong 3a3660764c * Fix bug. 2022-03-24 15:15:12 +08:00
zhouxudong c6f8ca1526 * Fix bug. 2022-03-24 14:57:46 +08:00
Hao Sun 5c17d72ca9 * fix kanban drop rules not work. 2022-03-24 14:34:17 +08:00
Hao Sun 0a7c559478 * optimize UI for kanban. 2022-03-24 14:27:03 +08:00
zenggang dd5cab2011 * Finish task#51184,51176,51141 2022-03-24 06:21:10 +00:00
李玉春 c458dab32a Merge branch 'sprint/tianshujie_bug_19072' into 'master'
Sprint/tianshujie bug 19072

See merge request easycorp/zentaopms!2496
2022-03-24 02:40:57 +00:00
tianshujie 9178a6e3b3 * Modify variable name. 2022-03-24 10:27:42 +08:00
tianshujie e9ee8a176d * Fix bug #19072. 2022-03-24 09:35:39 +08:00
李玉春 6729298c92 Merge branch 'bugfix_cyy' into 'master'
Modify app language and API

See merge request easycorp/zentaopms!2488
2022-03-24 00:29:54 +00:00
孙广明 337f12b7e3 Merge branch 'master_xieqiyu_20930' into 'master'
* Fix bug#20930.

See merge request easycorp/zentaopms!2462
2022-03-23 05:53:02 +00:00
李玉春 14d8417580 Merge branch 'sprint/master_zhouxudong_17053' into 'master'
* Fix bug #17053.

See merge request easycorp/zentaopms!2473
2022-03-23 05:34:22 +00:00
zhouxudong 9acef59ced * Fix bug #17053. 2022-03-23 13:31:52 +08:00
caoyanyi 19e7095e6c * Fix bug #21075. 2022-03-23 13:11:39 +08:00
李玉春 1cb7e1a05f Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2468
2022-03-23 03:30:58 +00:00
tianshujie 82e7beb7a0 * Fix bug #20923. 2022-03-23 10:20:55 +08:00
xieqiyu c614eb44e4 * Fix bug#20930. 2022-03-23 09:03:41 +08:00
孙广明 0c79df3fb6 Merge branch 'wyd_fixbug' into 'master'
Wyd fixbug

See merge request easycorp/zentaopms!2461
2022-03-23 00:53:36 +00:00
zhouxin 89a56dc374 * Fix bug #18746. 2022-03-22 08:35:13 +00:00
李玉春 26f84d495d Merge branch 'sprint/master_zhouxudong_16575' into 'master'
Sprint/master zhouxudong 16575

See merge request easycorp/zentaopms!2453
2022-03-22 08:18:36 +00:00
zhouxudong 81e4aa867a * Fix bug #16575. 2022-03-22 16:14:28 +08:00
李玉春 56e4317e23 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2447
2022-03-22 07:55:27 +00:00
tianshujie 5458aeeff9 * Delete useless judgment conditions. 2022-03-22 15:54:03 +08:00
zenggang 04652c0e65 * Adjust code 2022-03-22 07:34:17 +00:00
tianshujie ccf11069cb * Fix bug #20975. 2022-03-22 15:20:47 +08:00
zenggang 784e153159 * Finish task#51115,51116,51120,51121,51133 2022-03-22 07:11:57 +00:00
tianshujie 69e1f67fbd * Fix bug #21054. 2022-03-22 14:32:52 +08:00
孙广明 88f1cd03d5 Merge branch 'fixbug_zhouxin_17415' into 'master'
Fix bug #17415.

See merge request easycorp/zentaopms!2436
2022-03-22 06:06:31 +00:00
李玉春 2b1fee6181 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2433
2022-03-22 05:43:55 +00:00
tianshujie 303c546348 * Fix bug #20915. 2022-03-22 13:25:13 +08:00
李玉春 e811292dc9 Merge branch 'sprint/master_zhoxudong_14090' into 'master'
Sprint/master zhoxudong 14090

See merge request easycorp/zentaopms!2435
2022-03-22 05:12:46 +00:00
zhouxin cc2704e1d0 Fix bug #17415. 2022-03-22 05:10:45 +00:00
zhouxudong b65da66453 * Fix bug #14090. 2022-03-22 13:09:47 +08:00
zhouxudong 67045f3041 *Fix bug #14090. 2022-03-22 11:28:44 +08:00
王怡栋 792501cf85 Merge branch 'sprint/master_lanzongjun_version_lite' into 'master'
* fix task #51347,#51307

See merge request easycorp/zentaopms!2429
2022-03-22 03:09:56 +00:00
李玉春 73b13d19fe Merge branch 'sprint/pailei2_zhouxudong_15763' into 'master'
* Fix bug #15763.

See merge request easycorp/zentaopms!2417
2022-03-22 03:01:10 +00:00
zhouxudong b59845049b * Fix bug #15763. 2022-03-22 10:59:17 +08:00
Zongjun Lan 4d7ee95c09 * fix task #51347,#51307 2022-03-22 10:56:21 +08:00
zhouxudong 39a58efedf * Fix bug #15763. 2022-03-22 10:53:22 +08:00
李玉春 7127d6e8ab Merge branch 'sprint/master_zhoxudong_15984' into 'master'
* Fix bug #15984.

See merge request easycorp/zentaopms!2419
2022-03-22 02:43:35 +00:00
zhouxudong 541032f12e * Fix bug #15763. 2022-03-22 10:40:34 +08:00
zhouxudong d74e5c4c58 * Fix bug #15984. 2022-03-22 09:58:43 +08:00
zhouxin ddc8a8f724 Fix bug #17415. 2022-03-22 01:38:31 +00:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00