Commit Graph

2320 Commits

Author SHA1 Message Date
Aleksander Machniak
9eba51e23b Merge branch 'master' into dev/elastic 2018-06-25 07:58:09 +00:00
johndoh
4ea790ba37 Extend skin_logo allowing per skin logos (#6273) 2018-06-19 11:26:57 +02:00
Aleksander Machniak
8ed053ccb7 Merge branch 'master' into dev/elastic 2018-06-14 13:51:17 +02:00
Aleksander Machniak
00acb46411 Update to TinyMCE 4.7.13, refactor image selector dialog, add style for Elastic skin 2018-06-13 14:00:39 +02:00
Aleksander Machniak
44d0824585 Merge branch 'master' into dev/elastic
Conflicts:
	skins/elastic/styles/widgets/mail.less
2018-06-12 09:54:38 +02:00
Aleksander Machniak
9e289982ac Add "Disk usage: " prefix to the quota element title 2018-05-25 12:47:59 +02:00
Aleksander Machniak
9e129c93d7 Fix blankpage compat. with assets_path setting 2018-05-23 16:08:35 +00:00
Aleksander Machniak
199761ad12 Fix blankpage compat. with assets_path setting 2018-05-23 16:07:25 +00:00
Aleksander Machniak
13ad9e6593 Merge branch 'master' into dev/elastic 2018-05-23 09:51:08 +02:00
Aleksander Machniak
4b97f40af9 Get rid of debug_level (#6298) 2018-05-22 11:12:24 +02:00
Aleksander Machniak
750827ad65 Merge branch 'master' into dev/elastic 2018-05-21 09:34:51 +02:00
johndoh
647a7e91c6 Unify content frame (watermark) template objects (#6285)
* unify content frame (watermark) template objects
* several improvements, use existing env var for watermark url
* tighten up var parsing for contentframe template object
2018-05-18 17:25:02 +02:00
Aleksander Machniak
9746de23e8 Elastic: Small improvements in searchbar 2018-05-17 13:16:50 +00:00
Aleksander Machniak
0d62450efc Add easy way to change skin via GET param, for developers only 2018-05-17 11:02:42 +00:00
Aleksander Machniak
da5080a980 Merge branch 'master' into dev/elastic
Conflicts:
	skins/elastic/ui.js
2018-05-14 09:22:45 +02:00
Aleksander Machniak
430c000e32 Support skin localization (#5853) 2018-05-11 09:59:27 +02:00
Aleksander Machniak
f0fc42b3c4 Elastic: Try a new design for some toolbars (work in progress) 2018-05-09 13:51:44 +02:00
Aleksander Machniak
35a3abd3de Fix skin extending for assets (#5115) - take two 2018-04-24 06:32:16 +00:00
Aleksander Machniak
8355ba62fb Revert "Fix skin extending for assets (#5115)" 2018-04-23 19:53:45 +02:00
Aleksander Machniak
acfd335f14 Simplify code to set/change a skin
When changing skin in Preferences we do not use the new skin immediately,
we do this after redirect.
2018-04-20 09:14:44 +02:00
Aleksander Machniak
3e0e12227e Use default skin on login page, also after logout
Before we stored user skin in session to keep user skin on logon after logout.
After more thinking... imho it's better to always present the same logon look.
2018-04-20 08:52:19 +02:00
Aleksander Machniak
3f53acb64a Fix regression in skin extending for assets (commit ecde98729b)
It could have been possible that core template loaded plugin files
by mistake (if file with the same name existed), we don't want that.
2018-04-18 09:34:37 +00:00
Aleksander Machniak
c1774b6e1d Put additional footer content before "footer scripts" (for Elastic) 2018-04-16 12:59:00 +02:00
Aleksander Machniak
ecde98729b Fix skin extending for assets (#5115)
Remove redundant is_file() calls.
2018-04-15 12:21:56 +02:00
Aleksander Machniak
418c72137e Improve search_form() for external use 2018-04-11 09:08:18 +02:00
Aleksander Machniak
b2bebe531a Fix bug where usernames without domain part could be malformed or converted to lower-case on logon (#6224) 2018-04-10 09:24:29 +02:00
Aleksander Machniak
8e543f843e Fix check_request() bypass in places using get_uids() [CVE-2018-9846] (#6238) 2018-04-09 09:07:27 +02:00
Aleksander Machniak
5832eca405 RCMAIL_CHARSET -> RCUBE_CHARSET (#6236) 2018-04-06 08:10:11 +02:00
Aleksander Machniak
73ea8f94d0 Use htmlspecialchars() with charset argument, simplify some code 2018-04-03 15:29:59 +02:00
Aleksander Machniak
a451ad6599 Fix handling encoding of HTML tags in "inline" JSON output (#6207) 2018-03-07 17:40:12 +01:00
Aleksander Machniak
4f6079833a Fix PHP 7.2 warning: count(): Parameter must be an array or an object that implements Countable 2018-01-22 08:20:23 +01:00
Aleksander Machniak
b00d5c3836 Automatically localize data-label-* attributes of a template object 2018-01-18 11:33:11 +01:00
Aleksander Machniak
83bd85677b Remove x_frame_options env 2018-01-07 08:55:46 +01:00
Aleksander Machniak
b172fb505c Improve trusted_host_patterns code 2018-01-01 11:10:53 +01:00
Aleksander Machniak
55a1d6ef1b Make search form's aria label to also support plugin localization (via label-domain property) 2017-12-21 11:43:41 +01:00
Aleksander Machniak
38d275445d Plugin API: Add 'write' argument to 'render_page' hook 2017-12-18 12:04:42 +01:00
Aleksander Machniak
8e2f6275a4 Prevent from empty 'class' attribute in generated html 2017-12-06 20:13:50 +01:00
Aleksander Machniak
00cb440a07 Inline warnings can contain HTML code (regression fix) 2017-12-06 19:40:27 +01:00
Aleksander Machniak
db382fa19c Change remote images to remote resources warning also in html attachment preview 2017-12-06 19:33:03 +01:00
Aleksander Machniak
46e2e7e16c CS fix 2017-12-06 15:50:58 +01:00
Aleksander Machniak
758044d69e Add skin config options to dont_override list
... so e.g. options in user preferences will be hidden.
2017-11-28 16:32:01 +01:00
Aleksander Machniak
1cf72fa2b6 Allow plugins to include Less files (#6051) 2017-11-20 13:48:07 +01:00
PhilW
26f1b0770c use skinned alert boxes 2017-11-16 20:54:40 +00:00
PhilW
b897fe9349 use skined confirmation boxes where possible 2017-11-16 20:54:24 +00:00
Aleksander Machniak
910c735b87 Merge branch 'master' into dev-elastic 2017-11-08 15:00:53 +01:00
Aleksander Machniak
2a32f51c91 Fix file disclosure vulnerability caused by insuficient input validation in relation with attachment plugins (#6026) 2017-11-08 11:03:19 +01:00
Aleksander Machniak
ef0982f1b8 Merge branch 'master' into dev-elastic 2017-10-28 18:24:54 +02:00
JohnDoh
a8f0d35ebc Extend disabled_actions config so it accepts also button names (#5903) 2017-10-21 08:48:34 +02:00
Aleksander Machniak
d815525c6a Merge branch 'master' into dev-elastic 2017-10-20 13:34:25 +02:00
Aleksander Machniak
22b30de5d9 Fix bug where assets_path wasn't added to some watermark frames 2017-10-04 09:27:23 +02:00