Commit Graph
30735 Commits
Author SHA1 Message Date
孙广明 0f72dcc6ea * Fix project name check unique logic. 2021-12-06 15:22:57 +08:00
孙广明 bd28d11c75 * Fix bug. 2021-12-06 15:04:33 +08:00
孙广明 c3836a8327 * Fix release lang. 2021-12-06 08:22:31 +08:00
孙广明 664ba5336a * Add lang. 2021-12-06 08:20:21 +08:00
孙广明 b464d9d108 * Fix bug #17080. 2021-12-03 15:45:00 +08:00
孙广明 9144c435bc * Fix bug #17068. 2021-12-03 13:49:57 +08:00
李玉春 3455ec3004 Merge branch 'sprint/174_xieqiyu_17022' into 'master'
* Add judgment on null parameters.

See merge request easycorp/zentaopms!740
2021-12-03 05:05:42 +00:00
zhujinyong d73d395995 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-03 12:37:58 +08:00
zhujinyong e660a67e40 * Fix product api. 2021-12-03 12:37:45 +08:00
李玉春 671cf2a8fa Merge branch 'sprint/174_sunhao/bug16878' into 'master'
* Bug 16878, fix layout when open execution/task in iframe modal.

See merge request easycorp/zentaopms!765
2021-12-03 02:57:22 +00:00
liyuchun c919c8105d * Adjust code style. 2021-12-03 10:56:55 +08:00
李玉春 26056ba15b Merge branch 'devops_16736' into 'master'
* Fix bug#16736,17037,16844

See merge request easycorp/zentaopms!766
2021-12-03 02:25:07 +00:00
孙广明 87c7acdf03 Merge branch 'sprint/175_liyuchun_45162' into 'master'
* Finish task #45154.

See merge request easycorp/zentaopms!762
2021-12-03 02:11:49 +00:00
孙广明 fd0e67494d Merge branch 'sprint/175_zhengrunyu_fixbug' into 'master'
*Fixbug .

See merge request easycorp/zentaopms!767
2021-12-03 02:11:31 +00:00
zhengrunyu cda9cdf969 *Fixbug . 2021-12-03 10:04:54 +08:00
zhujinyong fc9fe1ac84 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-03 10:01:17 +08:00
zhujinyong 861e92107c + Add user type for api. 2021-12-03 10:01:01 +08:00
zenggang 4b53f349df * Fix bug#16736,17037,16844 2021-12-03 01:59:04 +00:00
李玉春 0d9f5197af Merge branch 'sprint/175_sgm_fixbug' into 'master'
* Fix bug #17051.

See merge request easycorp/zentaopms!764
2021-12-03 01:57:35 +00:00
Hao Sun 42a1cdc0b4 * Bug 16878, fix layout when open execution/task in iframe modal. 2021-12-03 09:56:11 +08:00
孙广明 ae50871336 * Fix style. 2021-12-03 09:55:21 +08:00
王怡栋 096f679282 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-03 09:54:44 +08:00
王怡栋 caab069444 * add system mode for config. 2021-12-03 09:54:28 +08:00
孙广明 fe3e96de2d * Fix bug #17051. 2021-12-03 09:46:58 +08:00
李玉春 87769894a6 Merge branch 'sprint/174_hufangzhou_17038' into 'master'
* Fix bug #17038.

See merge request easycorp/zentaopms!754
2021-12-03 01:46:39 +00:00
liyuchun c39512c79e * Finish task #45154. 2021-12-03 09:33:35 +08:00
王怡栋 3c276c75f5 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-03 09:26:27 +08:00
王怡栋 2837dc322c * adjust for classic mode and fix bug. 2021-12-03 09:25:44 +08:00
孙广明 32ec141d3d Merge branch 'sprint/devops_liyuchun_bug' into 'master'
* Adjust style.

See merge request easycorp/zentaopms!750
2021-12-03 01:04:19 +00:00
孙广明 27a25ed019 Merge branch 'sprint/174_tianshujie_17025' into 'master'
* Fix bug #17025.

See merge request easycorp/zentaopms!761
2021-12-03 01:03:41 +00:00
朱金勇 789a419696 Merge branch 'sprint/168_sunhao/improve_kanban' into 'master'
* Support for using kanban in old browsers without CSS flex.

See merge request easycorp/zentaopms!757
2021-12-03 00:50:26 +00:00
tianshujie 90b385d022 * Fix bug #17025. 2021-12-03 08:45:02 +08:00
李玉春 acf728eb91 Merge branch 'sprint/175_sgm_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!756
2021-12-03 00:26:35 +00:00
Hao Sun 3230cff401 * fix kanban not work in ie. 2021-12-02 17:03:41 +08:00
孙广明 24c613bba9 * Fix bug. 2021-12-02 17:01:33 +08:00
孙广明 1c61d0c57a Merge branch 'sprint/174_tianshujie_17050' into 'master'
* Fix bug #17050.

See merge request easycorp/zentaopms!755
2021-12-02 08:58:47 +00:00
tianshujie e02537be9b * Fix bug #17050. 2021-12-02 16:56:29 +08:00
hufangzhou dda03577c1 * Fix bug #17038. 2021-12-02 16:55:52 +08:00
Hao Sun 62efd53edb * update kanban lib and refactor usage of it. 2021-12-02 16:54:56 +08:00
王怡栋 01cb981c6e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-02 16:53:55 +08:00
王怡栋 0951e47a28 * fix for save query condition. 2021-12-02 16:53:20 +08:00
孙广明 2dbdf45a28 Merge branch 'sprint/174_tianshujie_error' into 'master'
* Fix the problem that cookic is not updated in time.

See merge request easycorp/zentaopms!753
2021-12-02 08:45:30 +00:00
孙广明 669e66e39d Merge branch 'sprint/175_liumengyi_17031' into 'master'
* Fix bug #17031,#17029.

See merge request easycorp/zentaopms!752
2021-12-02 08:44:20 +00:00
tianshujie 1c3c07e6e0 * Fix the problem that cookic is not updated in time. 2021-12-02 16:43:15 +08:00
liumengyi cbf1fe21ac * Remove empty lines. 2021-12-02 16:16:03 +08:00
李玉春 1885ea1b6d Merge branch 'sprint/175_sgm_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!751
2021-12-02 08:11:37 +00:00
李玉春 82f0d4f39c Merge branch 'sprint/174_hufangzhou_16975' into 'master'
* Fix bug #16975.

See merge request easycorp/zentaopms!739
2021-12-02 08:08:58 +00:00
孙广明 6e2f7563df * Fix bug. 2021-12-02 16:08:43 +08:00
liumengyi 9d7cd3b29e * Fix bug #17031,#17029. 2021-12-02 16:08:17 +08:00
李玉春 e99a81d9ad Merge branch 'sprint/174_hufangzhou_branch' into 'master'
* Fix bug #17046.

See merge request easycorp/zentaopms!749
2021-12-02 08:06:07 +00:00