 李玉春
|
b7576eedcb
|
Merge branch 'sprint/244' into 'sprint/244_wangzemei_70009'
# Conflicts:
# www/theme/blue/style.css
# www/theme/green/style.css
|
2022-09-29 00:58:03 +00:00 |
|
|
李玉春
|
45d2decd5f
|
Merge branch 'sprint/244_wangzemei_70496' into 'sprint/244'
* finish task #70496
See merge request easycorp/zentaopms!5597
|
2022-09-29 00:35:39 +00:00 |
|
|
wangzemei
|
aef8183bd0
|
* rebuild theme
|
2022-09-28 16:51:06 +08:00 |
|
|
wangzemei
|
d78e45c555
|
* fix table-form
|
2022-09-28 16:41:52 +08:00 |
|
|
wangzemei
|
f0e61febec
|
Merge branch 'sprint/244' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wangzemei_70009
|
2022-09-28 16:34:31 +08:00 |
|
|
wangzemei
|
1e85aad5de
|
* update theme
|
2022-09-28 16:30:03 +08:00 |
|
|
wangzemei
|
dd12944dd6
|
* rebuild theme
|
2022-09-28 16:25:46 +08:00 |
|
|
李玉春
|
561c0abeb1
|
Merge branch 'sprint/244_dyl_70025' into 'sprint/244'
Sprint/244 dyl 70025
See merge request easycorp/zentaopms!5583
|
2022-09-28 08:16:42 +00:00 |
|
|
dingyongliang
|
bbd8f8c2e5
|
* change danger label position.
|
2022-09-28 08:14:41 +00:00 |
|
|
dingyongliang
|
088067aaa3
|
* change product btn color.
|
2022-09-28 08:14:41 +00:00 |
|
|
dingyongliang
|
dfe949d04f
|
* task #70025, change program and project color.
|
2022-09-28 08:14:38 +00:00 |
|
|
曹延义
|
5a652d9ef6
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244
|
2022-09-28 15:57:00 +08:00 |
|
|
曹延义
|
e363bb4ef9
|
Merge branch 'sprint/244' into sprint/244_wangzemei_70009
|
2022-09-28 15:19:58 +08:00 |
|
|
wangzemei
|
e30baf5f11
|
* update zui.css
|
2022-09-28 13:33:43 +08:00 |
|
|
胡方舟
|
0681bde87c
|
Merge branch 'sprint/wangzemei/fix_kanban' into 'master'
* fix xuanxuan css
See merge request easycorp/zentaopms!5587
zentaopms_17.6.2
|
2022-09-28 03:30:00 +00:00 |
|
|
王怡栋
|
a3d6bffe61
|
Merge branch 'master_xieqiyu_27408' into 'master'
* Fix bug#27408.
See merge request easycorp/zentaopms!5582
|
2022-09-28 03:28:48 +00:00 |
|
|
李玉春
|
408902f6e0
|
Merge branch 'sprint/244_tianshujie_70504' into 'sprint/244'
* Finish task #70504.
See merge request easycorp/zentaopms!5586
|
2022-09-28 03:28:10 +00:00 |
|
|
wangzemei
|
85685c774d
|
* fix xuanxuan css
|
2022-09-28 11:27:19 +08:00 |
|
|
李玉春
|
d401ef9626
|
Merge branch 'sprint/241_tianshujie_70015' into 'sprint/244'
Sprint/241 tianshujie 70015
See merge request easycorp/zentaopms!5577
|
2022-09-28 03:25:16 +00:00 |
|
|
tianshujie
|
8e5f019f46
|
* Finish task #70015.
|
2022-09-28 11:24:47 +08:00 |
|
|
胡方舟
|
6ed8540d28
|
Merge branch 'sprint/wzm/fixkanban' into 'master'
* fix select class bug about xuanxuan
See merge request easycorp/zentaopms!5584
|
2022-09-28 03:23:46 +00:00 |
|
|
tianshujie
|
0266e470c9
|
* Finish task #70009.
|
2022-09-28 11:23:40 +08:00 |
|
|
tianshujie
|
e033345aea
|
* Finish task #70009.
|
2022-09-28 11:18:17 +08:00 |
|
|
李玉春
|
f6b6bbd5e7
|
Merge branch 'sprint/cyy_bug' into 'sprint/244'
Sprint/cyy bug
See merge request easycorp/zentaopms!5575
|
2022-09-28 03:12:07 +00:00 |
|
|
wangzemei
|
e65e3d81d9
|
* fix select class bug about xuanxuan
|
2022-09-28 11:08:20 +08:00 |
|
|
tianshujie
|
3979c28fb2
|
* Finish task #70487.
|
2022-09-28 11:05:50 +08:00 |
|
|
李玉春
|
1868918ad8
|
Merge branch 'sprint/244_dyl_70501' into 'sprint/244'
* rm product icon.
See merge request easycorp/zentaopms!5568
|
2022-09-28 03:03:22 +00:00 |
|
|
曹延义
|
46474331ba
|
* Modify batch edit style for product list page.
|
2022-09-28 11:00:45 +08:00 |
|
|
xieqiyu
|
46bba7775e
|
* Fix bug#27408.
|
2022-09-28 02:50:03 +00:00 |
|
|
tianshujie
|
43a95b18e2
|
* Finish task #70487,70492.
|
2022-09-28 10:45:23 +08:00 |
|
|
王怡栋
|
7b25b702f7
|
Merge branch 'bug_28068' into 'master'
* Fix bug#28068
See merge request easycorp/zentaopms!5578
|
2022-09-28 02:09:49 +00:00 |
|
|
曹延义
|
ca5110623e
|
* Add project checkbox style.
|
2022-09-28 10:09:32 +08:00 |
|
|
tianshujie
|
4f8bc6a9ad
|
* Finish task #70489,70488.
|
2022-09-28 10:06:55 +08:00 |
|
|
wangzemei
|
2486111312
|
* rebuild zui
|
2022-09-28 09:59:38 +08:00 |
|
|
wangzemei
|
27e11ade10
|
* rebuild zui
|
2022-09-28 09:49:55 +08:00 |
|
|
曹延义
|
836696dcf9
|
* Add PM avatar to project browse.
|
2022-09-28 09:32:45 +08:00 |
|
|
wangzemei
|
b81b507222
|
* finish 70496
|
2022-09-28 09:24:05 +08:00 |
|
|
tianshujie
|
c5c299b727
|
* Finish task #70015.
|
2022-09-28 09:22:13 +08:00 |
|
|
tianshujie
|
129c7dfd03
|
* Finish task #70015.
|
2022-09-28 09:15:16 +08:00 |
|
|
wangzemei
|
9a6502f4dd
|
* merge sprint/244
|
2022-09-28 09:13:55 +08:00 |
|
|
曹延义
|
d16362e3da
|
* Set batch edit checkbox style to cookie.
|
2022-09-28 08:58:30 +08:00 |
|
|
胡方舟
|
19175806f5
|
Merge branch 'sprint/wangzemei/241_fix' into 'master'
* fix bug #28047 # 28065
See merge request easycorp/zentaopms!5579
|
2022-09-28 00:55:03 +00:00 |
|
|
孙广明
|
dcdcaad2a0
|
Merge branch 'lyk_28056' into 'master'
* Fix bug #28056.
See merge request easycorp/zentaopms!5576
|
2022-09-28 00:53:58 +00:00 |
|
|
wangzemei
|
58969d7ade
|
* fix bug #28047 # 28065
|
2022-09-28 08:52:48 +08:00 |
|
|
zenggang
|
4279033526
|
* Fix bug#28068
|
2022-09-27 08:41:55 +00:00 |
|
|
tianshujie
|
e0d1c1983f
|
* Finish task #70504.
|
2022-09-27 16:36:57 +08:00 |
|
|
曹延义
|
6cb187bec1
|
* Modify product page style.
|
2022-09-27 16:26:24 +08:00 |
|
|
tianshujie
|
78905f7e05
|
* Finish task #70015.
|
2022-09-27 16:23:02 +08:00 |
|
|
曹延义
|
336982fd73
|
* Adjust code.
|
2022-09-27 16:19:16 +08:00 |
|
|
曹延义
|
6133128e23
|
* Modify project style.
|
2022-09-27 16:18:29 +08:00 |
|