Commit Graph

1535 Commits

Author SHA1 Message Date
zhouxin
a8d3ff2801 * Fix bug #17322. 2022-03-30 05:11:32 +00:00
zhouxin
1d21f7f62d * Fix bug #17322. 2022-03-30 03:23:48 +00:00
李玉春
c83e0de8c7 Merge branch 'master_xieqiyu_21283' into 'master'
* Fix bug#21283.

See merge request easycorp/zentaopms!2630
2022-03-30 03:18:12 +00:00
xieqiyu
f418c9b954 * Fix bug#21283. 2022-03-30 11:10:49 +08:00
tianshujie
317ff297b1 * Fix Kanban related issues. 2022-03-30 11:02:29 +08:00
tianshujie
0e3779ca1b * Fix Kanban related issues. 2022-03-30 10:45:01 +08:00
tianshujie
63e915a555 * Modify the code judgment logic. 2022-03-30 10:10:19 +08:00
tianshujie
b638bd1c83 * Fix bug #21282. 2022-03-30 09:40:23 +08:00
tianshujie
7885b87ef3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tianshujie_bug16101 2022-03-29 14:30:55 +08:00
李玉春
4d28e9772d Merge branch 'devops24_21092' into 'master'
Fix bug#21092

See merge request easycorp/zentaopms!2600
2022-03-29 06:19:09 +00:00
zenggang
028833b838 * Fix bug#21092,11398 2022-03-29 06:16:14 +00:00
tianshujie
a0c4457a95 * Fix bug #16101. 2022-03-29 13:59:16 +08:00
李玉春
8b24143995 Merge branch 'fixbug_sunjun_21258' into 'master'
*Fixbug #21258

See merge request easycorp/zentaopms!2606
2022-03-29 05:54:21 +00:00
songchenxuan
310a946e0a * Check locate if api. 2022-03-29 11:17:08 +08:00
sunjun
a2e9c28f6e *Fixbug #21258 2022-03-29 11:12:02 +08:00
李玉春
a2da8e12f0 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2597
2022-03-29 01:12:21 +00:00
tianshujie
778bc04e51 * Fix bug #21228. 2022-03-29 08:55:51 +08:00
李玉春
9b388cc312 Merge branch 'fixbug_sunjun_13852' into 'master'
Fixbug sunjun 13852

See merge request easycorp/zentaopms!2576
2022-03-29 00:50:37 +00:00
sunjun
b411be89ec *Fixbug #13852 2022-03-29 08:44:48 +08:00
tianshujie
c7225ac3d6 * Fix bug #14433. 2022-03-28 17:19:29 +08:00
sunjun
0ce312f107 *Fixbug #13852 2022-03-28 17:02:25 +08:00
朱金勇
0bb360f80c Merge branch 'sprint/sunhao/bug20927' into 'master'
* bug #20927, limit affixed header in kanban container.

See merge request easycorp/zentaopms!2585
2022-03-28 09:00:40 +00:00
Hao Sun
cd4c0ae708 * bug #20927, limit affixed header in kanban container. 2022-03-28 15:50:08 +08:00
tianshujie
cd2e539a6d * Fix bug #21212. 2022-03-28 13:56:04 +08:00
tianshujie
0194c5b3c7 * Fix bug #21186. 2022-03-28 11:13:23 +08:00
sunjun
79016f3bf7 *Fixbug #13852 2022-03-28 10:00:29 +08:00
mayue
f184873bca * Fix bug #17402. 2022-03-25 13:45:28 +08:00
李玉春
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
sunjun
43bfd5a4c1 *Fixbug 21115 2022-03-24 16:52:03 +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