0dc6925561
Merge branch 'feature/ipv6-addresses-9645-9826'
...
resolves #9645
resolves #9826
2015-09-28 15:49:58 +02:00
d03647f2e6
JS: Rename dblclickselect to selectable
...
refs #9826
2015-09-28 15:44:25 +02:00
3e06a9c8aa
monitoring: Revert CSS styles for address6 support
...
We're rewriting the whole style in a different branch.
refs #9645
2015-09-28 14:57:56 +02:00
2c73d9fad7
monitoring: Don't select unncessary columns in the services overview
2015-09-28 14:56:36 +02:00
82914cf9a3
monitoring: Don't select unncessary columns in the hosts overview
2015-09-28 14:54:49 +02:00
2ff822c2ac
Merge branch 'master' into feature/ipv6-addresses-9645-9826
2015-09-28 13:09:30 +02:00
7a8ac9796b
ArrayDatasource: Make it cloning itself when creating a new query
...
Quickfix only. The actual issue is that the datasource caches indifferently
the result of the first evaluated query. This should be done by the query.
2015-09-28 12:26:33 +02:00
ee7e7a1a78
Merge branch 'bugfix/Prettify-page-layout-when-accessing-a-non-existent-route-while-not-being-authenticated-10009'
...
fixes #10009
2015-09-28 09:57:27 +02:00
2f9bd78721
Merge branch 'master' into bugfix/Prettify-page-layout-when-accessing-a-non-existent-route-while-not-being-authenticated-10009
2015-09-28 09:55:07 +02:00
4889e63e95
Do not fade-in the logo for error pages and fix some coding style issues
...
refs #10009
2015-09-28 09:53:38 +02:00
d627f419ef
Fix that an object's notes and action url label is escaped twice
...
fixes #10218
2015-09-28 09:05:17 +02:00
8e29fe92a5
Use a login-like layout for error messages displayed to non-authenticated users
...
refs #10009
2015-09-25 17:40:00 +02:00
426f64e32a
CSS: rename .form to .below-logo
...
refs #10009
2015-09-25 16:41:07 +02:00
ed935696ac
CSS: outsource .logo related rules into a new .less file `logo.less'
...
refs #10009
2015-09-25 15:31:39 +02:00
d4c1ca9e18
Merge branch 'feature/custom-menu-items-5600'
...
resolves #5600
fixes #10169
fixes #10046
fixes #10082
2015-09-25 14:17:34 +02:00
a55cced039
Merge branch 'master' into feature/custom-menu-items-5600
...
Conflicts:
modules/monitoring/application/views/scripts/list/comments.phtml
modules/monitoring/application/views/scripts/list/downtimes.phtml
2015-09-25 14:12:43 +02:00
f17c185aed
js: Improve logging when pushing history states
2015-09-25 14:08:10 +02:00
67a28a4b47
js: Do not re-open the detail url if it's the origin of a redirect
...
refs #5600
2015-09-25 13:58:52 +02:00
a9ec0eebef
Merge branch 'bugfix/don-t-use-parse_ini_file-in-Config-10150'
...
fixes #10150
2015-09-25 12:19:38 +02:00
812545c04b
IniStore::load(): use IniParser::parseIniFile() instead of parse_ini_file()
...
refs #10150
2015-09-25 12:15:47 +02:00
8dc9928cb3
IniParser::parseIniFile(): return a Config instance
...
refs #10150
2015-09-25 12:04:13 +02:00
a090907373
Conform to coding guidelines
2015-09-25 11:37:06 +02:00
086579b254
NavigationController: Rerender the layout when removing menu entries
...
refs #5600
2015-09-25 10:51:44 +02:00
2952eaefcd
NavigationController: Rerender the layout when unsharing menu entries
...
refs #5600
2015-09-25 10:51:16 +02:00
e8f93e8ea1
NavigationConfigForm: Translate non-translated error messages
...
refs #5600
2015-09-24 15:50:40 +02:00
3f22469c18
NavigationConfigForm: Fix name validation when adding or editing items
...
refs #5600
2015-09-24 15:50:19 +02:00
cd1510d846
NavigationConfigForm: Set a "name" as default key column for nav configs
...
refs #5600
2015-09-24 15:49:04 +02:00
b7ef951e57
NavigationController: Rerender the layout when editing a menu entry
...
refs #5600
2015-09-24 14:05:57 +02:00
c4df7e05be
NavigationController: Rerender the layout when adding a menu entry
...
refs #5600
2015-09-24 14:05:28 +02:00
165dc00fad
Url: Do not throw ProgrammingError if there is no relative url available
...
refs #5600
2015-09-24 14:03:15 +02:00
338c0680e0
NavigationConfigForm: Consider a user's config and the share config as one
...
Actually, we need a more sophisticated solution for this, but I guess this is a
proper quickfix to avoid any conflicts when switching between shared and
non-shared.
refs #5600
2015-09-24 12:58:11 +02:00
4d303e7121
NavigationController: Redirect to the shared overview if its the referrer..
...
..when editing a navigation item.
refs #5600
2015-09-23 14:21:04 +02:00
6aecfe6959
Introduce base form class ActionForm
...
refs #5600
2015-09-23 13:45:33 +02:00
40c2cb2d12
MonitoredObject: Support host- and servicegroup filters in method matches()
...
refs #5600
2015-09-23 13:03:41 +02:00
e42548fc80
MonitoredObject: Allow to fetch servicegroups for host objects
...
refs #5600
2015-09-23 13:02:43 +02:00
9042d55dd4
FilterExpression: Add support multi value columns in method matches()
...
refs #5600
2015-09-23 13:02:13 +02:00
e4e560ab1a
FilterMatchNot: Do not re-invent the parents implementation of matches()
...
refs #5600
2015-09-23 13:01:08 +02:00
939188be94
FilterMatch: Do not re-invent the parents implementation of matches()
...
refs #5600
2015-09-23 13:00:46 +02:00
cd319f8c7d
Let the error page look like the login page when a non-authenticated user requests a non-existent page
...
refs #10009
2015-09-22 18:25:57 +02:00
fcdf41a9b8
DashletForm: Provide a helpful hint how to input external urls
...
refs #5600
2015-09-22 16:24:09 +02:00
f47c0475c9
NavigationItemForm: Provide a helpful hint how to input external urls
...
refs #5600
2015-09-22 16:18:55 +02:00
5193fce1dd
Url: Fix external url detection
...
refs #5600
2015-09-22 16:18:27 +02:00
81e13109fc
Revert "Url: Add support macros"
...
This reverts commit 33231d24da
2015-09-22 15:51:00 +02:00
b69311165c
Conform to coding guidelines
2015-09-22 14:53:29 +02:00
626c3494e4
Config::fromIni(): use IniParser::parseIniFile() instead of parse_ini_file()
...
refs #10150
2015-09-22 14:50:49 +02:00
acb93ce1ae
Implement Document::toArray()
...
refs #10150
2015-09-22 14:50:49 +02:00
777c4d0baf
Implement Section::toArray()
...
refs #10150
2015-09-22 14:50:49 +02:00
b441156934
Implement IniParser::parseIniFile()
...
refs #10150
2015-09-22 14:50:49 +02:00
30fa554ad9
Merge branch 'bugfix/ldap-group-to-roles-assignment-not-working-9950'
...
fixes #9950
2015-09-22 14:25:35 +02:00
33231d24da
Url: Add support macros
...
refs #5600
2015-09-22 14:15:04 +02:00
Eric Lippmann
Johannes Meyer
Alexander A. Klimov
Matthias Jentsch