 wangyidong
|
6db44273d2
|
Merge branch 'sprint224_zg_tasks'
|
2022-08-10 14:51:59 +08:00 |
|
|
guofeilong
|
f7c76765c6
|
* Fix css bug in td.c-title
|
2022-08-10 03:04:13 +00:00 |
|
|
zenggang
|
b62d5315ff
|
* Adjust code
|
2022-08-10 01:35:59 +00:00 |
|
|
liumengyi
|
7252dc6b7c
|
* Finish task #63694.
|
2022-08-09 14:51:15 +08:00 |
|
|
lanzongjun
|
5481c3b2b9
|
fix cp project
|
2022-08-08 18:47:18 +08:00 |
|
|
lanzongjun
|
15cce6ebfa
|
fix cp project
|
2022-08-08 18:18:09 +08:00 |
|
|
朱金勇
|
6d82afe4fa
|
Merge branch 'sprint/sunhao/table_overflow_type' into 'master'
* change text overflow style in table.
See merge request easycorp/zentaopms!4787
|
2022-08-08 09:08:11 +00:00 |
|
|
朱金勇
|
d14a1dafad
|
Merge branch 'sprint/sunhao/optimize_blue_theme' into 'master'
* update blue theme.
See merge request easycorp/zentaopms!4746
|
2022-08-08 09:07:57 +00:00 |
|
|
hufangzhou
|
b44ed94231
|
* Finish task #62965. Fix bug #26130, #26129, #26120.
|
2022-08-08 16:31:20 +08:00 |
|
|
王怡栋
|
ed951dc12e
|
Merge branch 'sprint/gantt_upgrade' into 'master'
Sprint/gantt upgrade
See merge request easycorp/zentaopms!4835
|
2022-08-08 03:25:42 +00:00 |
|
|
lanzongjun
|
8adc70569f
|
fix
|
2022-08-05 14:21:04 +08:00 |
|
|
liumengyi
|
05f3985def
|
* Fix bug #26033.
|
2022-08-05 13:15:17 +08:00 |
|
|
liumengyi
|
54bca1b907
|
* Fix bug #26033.
|
2022-08-05 11:01:01 +08:00 |
|
|
lanzongjun
|
aca14bafc6
|
remove ext
|
2022-08-05 08:50:17 +08:00 |
|
|
lanzongjun
|
f241846903
|
resolve conflict
|
2022-08-05 08:43:09 +08:00 |
|
|
Hao Sun
|
bf68fdab37
|
* change text overflow style in table.
|
2022-08-04 05:18:31 +00:00 |
|
|
guofeilong
|
164e6a99d4
|
* Fix icon ztf and draft_edit
|
2022-08-04 01:03:55 +00:00 |
|
|
lanzongjun
|
245aaf0b14
|
add dhtmlx
|
2022-08-02 17:14:33 +08:00 |
|
|
Hao Sun
|
03bd23492b
|
* update blue theme.
|
2022-08-02 09:12:17 +00:00 |
|
|
Wenrui LI
|
da9d8249b5
|
* fix header menu unable to maintain hover state in zentaoclient.
|
2022-08-02 16:11:00 +08:00 |
|
|
guofeilong
|
736ecf9882
|
* Change icon-ZTF to icon-ztf
|
2022-07-28 09:44:23 +00:00 |
|
|
guofeilong
|
f47e82579e
|
* Add Icon file-log and draft-edit
|
2022-07-28 08:50:58 +00:00 |
|
|
lanzongjun
|
3351911caa
|
delete gantt ext
|
2022-07-28 14:47:26 +08:00 |
|
|
lanzongjun
|
f866342fd2
|
* upgrade
|
2022-07-28 13:26:09 +08:00 |
|
|
朱金勇
|
7c9e7430e8
|
Merge branch 'sprint/xuanxuan_111' into 'master'
Sprint/xuanxuan 111
See merge request easycorp/zentaopms!4665
|
2022-07-27 07:30:08 +00:00 |
|
|
chaideqing
|
429f7638b7
|
* code format
|
2022-07-27 15:20:18 +08:00 |
|
|
guofeilong
|
4f82de69c8
|
* Add Icon ZTF
|
2022-07-27 03:39:49 +00:00 |
|
|
guofeilong
|
91de8f2459
|
* Add Icon ZTF and sub-review
|
2022-07-26 09:22:44 +00:00 |
|
|
guofeilong
|
0cff64eda2
|
* Add Icon back-circle
|
2022-07-25 09:58:40 +00:00 |
|
|
chaideqing
|
3106ec0d63
|
* fix card blank and card height wrong
|
2022-07-25 14:55:37 +08:00 |
|
|
chaideqing
|
c69bd2c145
|
* fix card top blank and close button too small in xuanxuan show
|
2022-07-22 17:04:08 +08:00 |
|
|
朱金勇
|
e938a86fb5
|
Merge branch 'sprint/sunhao/zui_table' into 'master'
* update zui table, optimize UI for nested mode.
See merge request easycorp/zentaopms!4626
|
2022-07-21 08:21:43 +00:00 |
|
|
Hao Sun
|
be417874c2
|
* update zui table, optimize UI for nested mode.
|
2022-07-21 07:03:08 +00:00 |
|
|
wangyidong
|
ab6ee566e7
|
* code for task #61191.
|
2022-07-20 16:14:55 +08:00 |
|
|
chaideqing
|
2449cad6c1
|
* fix modal height=0 when trigger a modal to show
|
2022-07-20 13:49:15 +08:00 |
|
|
wangzemei
|
7e8e91659c
|
* Fix bug #24273
|
2022-07-19 05:44:09 +00:00 |
|
|
Wenrui LI
|
d3351f941c
|
* adjust toolbar position.
|
2022-07-15 11:23:25 +08:00 |
|
|
Wenrui LI
|
85342843ef
|
* fix toolbar position for zentaoclient.
|
2022-07-15 11:10:34 +08:00 |
|
|
wangzemei
|
6827ec748a
|
* Fix bug #25316
|
2022-07-14 09:12:09 +00:00 |
|
|
tianshujie
|
711c0e9e8c
|
* Fix bug #25088.
|
2022-07-14 14:46:46 +08:00 |
|
|
wangzemei
|
739758db0f
|
* Code for bug #23827
|
2022-07-12 08:01:51 +00:00 |
|
|
wangzemei
|
24aab39145
|
* Code for bug #23827
|
2022-07-12 07:24:15 +00:00 |
|
|
wangzemei
|
debc2e3365
|
* Fix bug #24836
|
2022-07-11 09:32:20 +00:00 |
|
|
guofeilong
|
9d5451fb67
|
* Add ZentaoIcon Customer
|
2022-07-11 08:21:04 +00:00 |
|
|
guofeilong
|
bf624cdc5d
|
* Add ZentaoIcon Save
|
2022-07-11 07:28:08 +00:00 |
|
|
王怡栋
|
e9809af13a
|
Merge branch 'master' into 'sprint/212_hufangzhou_59535'
# Conflicts:
# www/js/my.full.js
|
2022-07-11 07:10:23 +00:00 |
|
|
hufangzhou
|
3f2b98e71c
|
* Move the functions to my.full.js file.
|
2022-07-11 15:03:40 +08:00 |
|
|
wangzemei
|
7bb8a64638
|
* Fix bug #25041
|
2022-07-11 06:04:07 +00:00 |
|
|
tianshujie
|
5ccd62ea84
|
* Merge insensitive refresh custom forms into one method.
|
2022-07-07 10:44:29 +08:00 |
|
|
tianshujie
|
dc7e0ec546
|
* Put the functions that add and remove elements in my.full.js.
|
2022-07-06 16:37:10 +08:00 |
|