tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-24 22:34:24 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,759 Commits 126 Branches 76 Tags
Commit Graph

8759 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Johannes Meyer
d4c1ca9e18 Merge branch 'feature/custom-menu-items-5600' 
resolves #5600
fixes #10169
fixes #10046
fixes #10082
 2015-09-25 14:17:34 +02:00
Johannes Meyer
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
Johannes Meyer
f17c185aed js: Improve logging when pushing history states 2015-09-25 14:08:10 +02:00
Johannes Meyer
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
Alexander A. Klimov
a9ec0eebef Merge branch 'bugfix/don-t-use-parse_ini_file-in-Config-10150' 
fixes #10150
 2015-09-25 12:19:38 +02:00
Alexander A. Klimov
812545c04b IniStore::load(): use IniParser::parseIniFile() instead of parse_ini_file() 
refs #10150
 2015-09-25 12:15:47 +02:00
Alexander A. Klimov
8dc9928cb3 IniParser::parseIniFile(): return a Config instance 
refs #10150
 2015-09-25 12:04:13 +02:00
Alexander A. Klimov
a090907373 Conform to coding guidelines 2015-09-25 11:37:06 +02:00
Johannes Meyer
086579b254 NavigationController: Rerender the layout when removing menu entries 
refs #5600
 2015-09-25 10:51:44 +02:00
Johannes Meyer
2952eaefcd NavigationController: Rerender the layout when unsharing menu entries 
refs #5600
 2015-09-25 10:51:16 +02:00
Alexander A. Klimov
4a85e112d2 Don't link to loaded modules in the about page if the user doesn't have the required permission 
refs #9381
 2015-09-25 10:45:17 +02:00
Alexander A. Klimov
f64db890d2 Show loaded modules in the about page 
refs #9381
 2015-09-24 19:23:49 +02:00
Alexander A. Klimov
52221dd10a Add doc and social media links to the about page 
refs #9247
 2015-09-24 15:54:56 +02:00
Johannes Meyer
e8f93e8ea1 NavigationConfigForm: Translate non-translated error messages 
refs #5600
 2015-09-24 15:50:40 +02:00
Johannes Meyer
3f22469c18 NavigationConfigForm: Fix name validation when adding or editing items 
refs #5600
 2015-09-24 15:50:19 +02:00
Johannes Meyer
cd1510d846 NavigationConfigForm: Set a "name" as default key column for nav configs 
refs #5600
 2015-09-24 15:49:04 +02:00
Johannes Meyer
b7ef951e57 NavigationController: Rerender the layout when editing a menu entry 
refs #5600
 2015-09-24 14:05:57 +02:00
Johannes Meyer
c4df7e05be NavigationController: Rerender the layout when adding a menu entry 
refs #5600
 2015-09-24 14:05:28 +02:00
Johannes Meyer
165dc00fad Url: Do not throw ProgrammingError if there is no relative url available 
refs #5600
 2015-09-24 14:03:15 +02:00
Alexander A. Klimov
bfc2738fe5 Translate license statement 
refs #9247
 2015-09-24 13:07:31 +02:00
Johannes Meyer
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
Alexander A. Klimov
e2d6089ff3 Make Version::get() failsafe 
refs #9247
 2015-09-24 12:25:02 +02:00
Alexander A. Klimov
feb27b8a02 Rename application/VERSION to application/GITCOMMIT 
refs #9247
 2015-09-24 11:35:18 +02:00
Alexander A. Klimov
3e99adbe63 Version::get(): first try to parse application/VERSION 
refs #9247
 2015-09-24 11:05:21 +02:00
Alexander A. Klimov
cc4a47506f Fetch version from constant 
refs #9247
 2015-09-24 10:53:33 +02:00
Alexander A. Klimov
91377a4bd7 Show copyright and license on the about page 
refs #9247
 2015-09-23 18:54:42 +02:00
Alexander A. Klimov
7c3b46fefa Make regex less complicated 2015-09-23 17:48:30 +02:00
Alexander A. Klimov
d6cf6313b9 Split complex if statements 2015-09-23 15:53:10 +02:00
Alexander A. Klimov
abcdc5adb1 Fetch Git commit ID from .git/HEAD if available 
refs #9247
 2015-09-23 15:06:02 +02:00
Johannes Meyer
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
Johannes Meyer
6aecfe6959 Introduce base form class ActionForm 
refs #5600
 2015-09-23 13:45:33 +02:00
Johannes Meyer
40c2cb2d12 MonitoredObject: Support host- and servicegroup filters in method matches() 
refs #5600
 2015-09-23 13:03:41 +02:00
Johannes Meyer
e42548fc80 MonitoredObject: Allow to fetch servicegroups for host objects 
refs #5600
 2015-09-23 13:02:43 +02:00
Johannes Meyer
9042d55dd4 FilterExpression: Add support multi value columns in method matches() 
refs #5600
 2015-09-23 13:02:13 +02:00
Johannes Meyer
e4e560ab1a FilterMatchNot: Do not re-invent the parents implementation of matches() 
refs #5600
 2015-09-23 13:01:08 +02:00
Johannes Meyer
939188be94 FilterMatch: Do not re-invent the parents implementation of matches() 
refs #5600
 2015-09-23 13:00:46 +02:00
Alexander A. Klimov
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
Johannes Meyer
fcdf41a9b8 DashletForm: Provide a helpful hint how to input external urls 
refs #5600
 2015-09-22 16:24:09 +02:00
Johannes Meyer
f47c0475c9 NavigationItemForm: Provide a helpful hint how to input external urls 
refs #5600
 2015-09-22 16:18:55 +02:00
Johannes Meyer
5193fce1dd Url: Fix external url detection 
refs #5600
 2015-09-22 16:18:27 +02:00
Johannes Meyer
81e13109fc Revert "Url: Add support macros" 
This reverts commit 33231d24dab942b31c924c4c8e352dd73f80939b.
There is no need for url macros, since we're handling absolute
urls correctly now.
 2015-09-22 15:51:00 +02:00
Matthias Jentsch
b69311165c Conform to coding guidelines 2015-09-22 14:53:29 +02:00
Alexander A. Klimov
626c3494e4 Config::fromIni(): use IniParser::parseIniFile() instead of parse_ini_file() 
refs #10150
 2015-09-22 14:50:49 +02:00
Alexander A. Klimov
acb93ce1ae Implement Document::toArray() 
refs #10150
 2015-09-22 14:50:49 +02:00
Alexander A. Klimov
777c4d0baf Implement Section::toArray() 
refs #10150
 2015-09-22 14:50:49 +02:00
Alexander A. Klimov
b441156934 Implement IniParser::parseIniFile() 
refs #10150
 2015-09-22 14:50:49 +02:00
Matthias Jentsch
30fa554ad9 Merge branch 'bugfix/ldap-group-to-roles-assignment-not-working-9950' 
fixes #9950
 2015-09-22 14:25:35 +02:00
Johannes Meyer
33231d24da Url: Add support macros 
refs #5600
 2015-09-22 14:15:04 +02:00
Johannes Meyer
7321d67b4f Url: Consider urls with a leading slash as absolute.. 
..and make it possible to have a url without a base.

refs #5600
 2015-09-22 14:14:41 +02:00
Johannes Meyer
57e08e92d4 Do not mark relative urls as absolute 
refs #5600
refs #10169
 2015-09-22 14:12:08 +02:00