 王怡栋
|
a9d13faa1a
|
Merge branch 'master' into 'sprint/189_zhouxudong_53651'
# Conflicts:
# module/execution/js/edit.js
|
2022-05-12 05:20:13 +00:00 |
|
|
王怡栋
|
5674160b7e
|
Merge branch 'master_xieqiyu_53666' into 'master'
Master xieqiyu 53666
See merge request easycorp/zentaopms!3353
|
2022-05-12 05:05:25 +00:00 |
|
|
zhouxudong
|
13e965e484
|
* Finish task #53651.
|
2022-05-12 05:02:51 +00:00 |
|
|
zhouxudong
|
f98d82234a
|
* Finish task #53651.
|
2022-05-12 03:57:23 +00:00 |
|
|
zhouxudong
|
65fff67e58
|
* finish task #53651.
|
2022-05-12 00:30:00 +00:00 |
|
|
xieqiyu
|
ce7c0afdc1
|
* Finish task#53666.
|
2022-05-11 18:24:13 +08:00 |
|
|
zhouxudong
|
675d2c2e86
|
* Fix bug #22339.
|
2022-05-11 08:49:22 +00:00 |
|
|
孙广明
|
622185aa65
|
Merge branch 'sprint/189_zhouxudong_53651' into 'master'
Sprint/189 zhouxudong 53651
See merge request easycorp/zentaopms!3323
|
2022-05-11 05:51:12 +00:00 |
|
|
zhouxudong
|
ca827e1d6c
|
* Finish task #53651.
|
2022-05-11 05:32:48 +00:00 |
|
|
zhouxudong
|
da5cd2aa44
|
* Finish task #53651.
|
2022-05-11 03:02:28 +00:00 |
|
|
zhouxudong
|
1723a78c92
|
* Finish task #53651.
|
2022-05-10 09:11:06 +00:00 |
|
|
tianshujie
|
5bdb7f521c
|
* Finish task #53668.
|
2022-05-10 17:05:49 +08:00 |
|
|
tianshujie
|
896e36c90c
|
* Finish task #53667.
|
2022-05-10 10:50:02 +08:00 |
|
|
tianshujie
|
c3fdb74a24
|
* Finish task #53668.
|
2022-05-10 10:12:48 +08:00 |
|
|
孙华伟
|
dcfe09867f
|
*Fix bug#18898.
|
2022-04-19 15:17:50 +08:00 |
|
|
zhujinyong
|
864694faab
|
Merge branch 'sprint/sunhao/bug6910'
|
2022-04-18 17:16:17 +08:00 |
|
|
zhouxudong
|
89bfe585c8
|
* Fix bug #20867.
|
2022-04-18 15:31:00 +08:00 |
|
|
Hao Sun
|
e1a11341c6
|
* refactor: format.
|
2022-04-18 10:34:14 +08:00 |
|
|
Hao Sun
|
af43ca6bb3
|
* bug #6910, optimize helper "text-limit" and support for displaying html.
|
2022-04-18 10:25:28 +08:00 |
|
|
xieqiyu
|
68097e7725
|
* Fix bug#14595.
|
2022-04-11 17:36:44 +08:00 |
|
|
王怡栋
|
6c07213aa2
|
Merge branch 'sprint/tianshujie_bug18781' into 'master'
Modify the popup style of the popup window.
See merge request easycorp/zentaopms!2809
|
2022-04-07 09:25:16 +00:00 |
|
|
孙广明
|
d9345f6a62
|
Merge branch 'master_xieqiyu_21550' into 'master'
* Fix bug#21550.
See merge request easycorp/zentaopms!2807
|
2022-04-07 09:23:31 +00:00 |
|
|
tianshujie
|
534783603f
|
Modify the popup style of the popup window.
|
2022-04-07 17:22:26 +08:00 |
|
|
xieqiyu
|
8aaaeafcb3
|
* Modify review code.
|
2022-04-07 17:22:15 +08:00 |
|
|
xieqiyu
|
1a59190992
|
* Fix bug#21550.
|
2022-04-07 17:09:41 +08:00 |
|
|
tianshujie
|
14fd19d50b
|
* Fix bug #18781.
|
2022-04-07 16:58:07 +08:00 |
|
|
tianshujie
|
2af6c7df8b
|
* Fix bug #20977.
|
2022-04-07 14:38:41 +08:00 |
|
|
tianshujie
|
479c647cf5
|
* Fix code style issues.
|
2022-04-02 15:01:16 +08:00 |
|
|
tianshujie
|
9d03df55de
|
* Fix bug #19950.
|
2022-04-02 13:46:49 +08:00 |
|
|
tianshujie
|
8b2c7f1288
|
* Fix bug #21158.
|
2022-04-02 13:41:52 +08:00 |
|
|
王怡栋
|
4fa721b0bb
|
Merge branch '165_package'
|
2022-04-01 15:30:36 +08:00 |
|
|
孙广明
|
4e2f0a3d86
|
Merge branch 'master_xieqiyu_19273' into 'master'
* Fix bug#19273.
See merge request easycorp/zentaopms!2666
|
2022-03-31 07:24:15 +00:00 |
|
|
孙广明
|
d388d2bfe7
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!2671
|
2022-03-31 06:26:21 +00:00 |
|
|
xieqiyu
|
2ed1eedfcf
|
* Fix bug#19273.
|
2022-03-31 13:42:28 +08:00 |
|
|
tianshujie
|
16df973236
|
* Fix bug #16636.
|
2022-03-31 09:28:28 +08:00 |
|
|
Hao Sun
|
123aec72c4
|
* bug #18424, optimize d-n-d UI for kanban, finish drag action when mouse leave document.
|
2022-03-31 08:42:36 +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 |
|
|
Hao Sun
|
cd4c0ae708
|
* bug #20927, limit affixed header in kanban container.
|
2022-03-28 15:50:08 +08:00 |
|
|
王怡栋
|
15a3516aca
|
Merge branch 'master' into 165_package
|
2022-03-28 08:50:18 +08:00 |
|
|
tianshujie
|
a3b55806f5
|
* Fix bug #17212.
|
2022-03-25 10:25:37 +08:00 |
|
|
tianshujie
|
79e9ff2bdd
|
* Fix bug #17187.
|
2022-03-25 09:52:44 +08:00 |
|
|
王怡栋
|
e504d28044
|
Merge branch 'sprint/master_lanzongjun_fixbug_lite' into 'sprint/165_package'
* fix bug #21088,#21077
See merge request easycorp/zentaopms!2507
|
2022-03-24 08:39:06 +00:00 |
|
|
tianshujie
|
a5db3ca766
|
* optimize UI for kanban and fix drop rules not work.
|
2022-03-24 14:54:11 +08:00 |
|
|
Hao Sun
|
5c17d72ca9
|
* fix kanban drop rules not work.
|
2022-03-24 14:34:17 +08:00 |
|
|
Zongjun Lan
|
e3fe57931f
|
* fix bug #21088
|
2022-03-24 14:21:29 +08:00 |
|
|
tianshujie
|
82e7beb7a0
|
* Fix bug #20923.
|
2022-03-23 10:20:55 +08:00 |
|
|
tianshujie
|
ccf11069cb
|
* Fix bug #20975.
|
2022-03-22 15:20:47 +08:00 |
|