 Hao Sun
|
842230d91f
|
* add new icons: icon-swap, icon-lane, icon-side-right, icon-side-left.
|
2021-07-16 09:41:02 +08:00 |
|
|
Guan Xiying
|
1c802f2a36
|
Merge branch 'jihu'
|
2021-07-14 09:48:58 +08:00 |
|
|
Guan Xiying
|
6f2ae70f06
|
* Merge from mapi branch.
|
2021-07-14 09:28:34 +08:00 |
|
|
王怡栋
|
65a43e49a3
|
Merge branch '15.0' into 'master'
* update picker js.
See merge request easycorp/zentaopms!4
|
2021-07-13 06:18:45 +00:00 |
|
|
Hao Sun
|
9267c1e6b1
|
* hide program item in search list in drop menu.
|
2021-07-12 15:47:38 +08:00 |
|
|
Hao Sun
|
0e6b12d782
|
* fix project dropmenu not work as expected.
|
2021-07-09 14:56:17 +08:00 |
|
|
Hao Sun
|
98eaee685b
|
* update picker js.
|
2021-07-09 11:40:00 +08:00 |
|
|
wangyidong
|
fa4fa5941e
|
Merge branch '15.0'
|
2021-07-06 19:28:30 +08:00 |
|
|
Hao Sun
|
5654030da5
|
* update zui: force pages to open in app tab in workflow and related modules.
|
2021-07-05 14:29:48 +08:00 |
|
|
Hao Sun
|
81e73ff548
|
* update zui: force pages in workflow module open in app tab.
|
2021-07-05 13:11:32 +08:00 |
|
|
Hao Sun
|
e41fc21ece
|
* add new icon: icon-assets and icon-diamond.
# Conflicts:
# www/theme/zui/fonts/ZentaoIcon.eot
# www/theme/zui/fonts/ZentaoIcon.ttf
# www/theme/zui/fonts/ZentaoIcon.woff
|
2021-06-23 15:41:56 +08:00 |
|
|
Hao Sun
|
7556df707c
|
* add new icon: icon-assets and icon-diamond.
|
2021-06-23 15:06:53 +08:00 |
|
|
Yagami
|
00e9c35cff
|
* Fix btn border.
|
2021-06-22 14:25:52 +08:00 |
|
|
Hao Sun
|
f8c9d4ff34
|
* skip to watch changes for search form.
|
2021-06-21 17:24:38 +08:00 |
|
|
Yagami
|
b08c1e4fd5
|
* Finish task #38710.
|
2021-06-21 14:28:29 +08:00 |
|
|
Guan Xiying
|
f853b676e0
|
* Remov utf8 bom.
|
2021-06-21 10:03:21 +08:00 |
|
|
Hao Sun
|
c8eadb2ce9
|
* update datetimepicker.
|
2021-06-18 09:54:48 +08:00 |
|
|
Hao Sun
|
48a50f9e0a
|
* update datetimepicker.
|
2021-06-18 09:53:35 +08:00 |
|
|
wangyidong
|
6a0674c3db
|
* fix for api.
|
2021-06-17 14:48:24 +08:00 |
|
|
wangyidong
|
387b09e25c
|
Merge branch '15.0.beta3'
|
2021-06-06 09:27:45 +08:00 |
|
|
wangyidong
|
769e6b433b
|
* merge from 15.0.beta3.
|
2021-06-05 13:01:53 +08:00 |
|
|
wangyidong
|
4696a6dceb
|
* code for xhtml.
|
2021-06-03 09:47:06 +08:00 |
|
|
wangyidong
|
0696c67339
|
* finish task #38645.
|
2021-06-01 09:19:30 +08:00 |
|
|
Hao Sun
|
3e97c2111f
|
* update zenicon, add new icon "icon-summary"（培训总结）.
|
2021-05-27 15:32:43 +08:00 |
|
|
Hao Sun
|
a8608cffc2
|
* bug #12758, skip to watch form changes in advnace table.
|
2021-05-24 10:12:53 +08:00 |
|
|
Hao Sun
|
fc7f7f102d
|
* bug #12708, improve UI of tips for unsaved forms.
|
2021-05-24 09:59:45 +08:00 |
|
|
Hao Sun
|
3e44ff7a49
|
* bug #12704, fix tips of unsaved form for lang 'zh-cn'.
|
2021-05-24 09:27:34 +08:00 |
|
|
Hao Sun
|
9d67ef41aa
|
* bug #12715, fix alert for unsaved form not work as expected.
|
2021-05-24 09:23:51 +08:00 |
|
|
wangyidong
|
1cae502aee
|
* adjust for web html.
|
2021-05-20 16:55:12 +08:00 |
|
|
Hao Sun
|
33a5e6d13e
|
* task #38159, story #25767, alert when leave page with unsaved form.
|
2021-05-16 16:12:12 +08:00 |
|
|
Hao Sun
|
d08413d20d
|
* upgrade version of iconfont.
|
2021-05-16 11:22:52 +08:00 |
|
|
Hao Sun
|
1bf69e647f
|
* add icon-estimate.
|
2021-05-14 17:08:05 +08:00 |
|
|
Catouse
|
f21e1f9334
|
* fix icon-qucheng with large font size.
|
2021-04-23 15:28:38 +08:00 |
|
|
Catouse
|
be8a73b171
|
* fix link with data-app not work in tree content view.
|
2021-04-23 14:09:18 +08:00 |
|
|
Catouse
|
b276f0369f
|
Revert "* update zui.js."
This reverts commit 60c2855bba.
|
2021-04-23 13:47:21 +08:00 |
|
|
Catouse
|
744703fff4
|
* update zui.js.
# Conflicts:
# www/js/zui/min.js
|
2021-04-23 13:46:48 +08:00 |
|
|
Catouse
|
60c2855bba
|
* update zui.js.
|
2021-04-23 13:37:19 +08:00 |
|
|
Guanxiying
|
164c218209
|
+ Add init tester file.
|
2021-04-23 09:37:20 +08:00 |
|
|
zhujinyong
|
45246578c0
|
* Fix style of avatar menu.
|
2021-04-15 23:03:17 +08:00 |
|
|
wangyidong
|
656b745a3e
|
* adjust for doc dropmenu.
|
2021-04-15 09:34:36 +08:00 |
|
|
Catouse
|
81a93f961a
|
* fix search-list position on dropup with small distance to window top.
|
2021-04-12 21:17:27 +08:00 |
|
|
Catouse
|
869f175505
|
* force to open user-login/logout in parent window.
|
2021-04-12 16:47:06 +08:00 |
|
|
Catouse
|
4b0c06412d
|
* fix search-list style in dropMenu.
|
2021-04-12 16:39:51 +08:00 |
|
|
Yagami
|
b2314e26ee
|
* Fix table assign css.
|
2021-04-12 13:18:28 +08:00 |
|
|
Yagami
|
a92b40e1b2
|
* Fix bug #37388.
|
2021-04-12 13:16:15 +08:00 |
|
|
Yagami
|
ca96ce81e0
|
* Fix icon size.
|
2021-04-08 13:52:27 +08:00 |
|
|
Catouse
|
7e0c64726c
|
* auto adjust navbar position to prevent overlay with heading.
|
2021-04-08 13:03:00 +08:00 |
|
|
Catouse
|
8a114befb5
|
* auto adjust navbar position to prevent overlay with heading.
|
2021-04-08 11:24:32 +08:00 |
|
|
Catouse
|
7289ddbf26
|
* skip handle modalTrigger which is inited from js on click to prevent show modal in page.
|
2021-04-07 15:38:35 +08:00 |
|
|
holan20180123
|
fb25508394
|
* Adjust user menu style.
|
2021-04-01 17:40:23 +08:00 |
|