Commit Graph

2858 Commits

Author SHA1 Message Date
Eric Lippmann d3ac1b16ee Merge branch 'master' into feature/dope-layout-5543 2015-09-27 13:11:11 +02:00
Eric Lippmann ed9a6aa39d lib: Fix Navigation::addItem()
refs #5543
2015-09-27 12:26:58 +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
Eric Lippmann 7ff74ae36a lib: Use navigation classes in the limiter control
refs #5543
2015-09-25 13:36:28 +02:00
Eric Lippmann 823a2cc8ea CSS: Add nav.less and limiter.less to our stylesheet
refs #5543
2015-09-25 13:36:04 +02:00
Eric Lippmann 1122ffafad lib: Add navigation classes (WIP)
- Lacks custom renderer functionality
- Lacks navigation item priorities
- Lacks permission handling

refs #5600
2015-09-25 13:16:44 +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
Eric Lippmann 59b9155ca7 CSS: Include dev.less in our style sheet
refs #5543
2015-09-25 00:35:12 +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
Eric Lippmann 27f3dd94d2 CSS: Add text-small to time-since, -until and -ago
refs #5543
2015-09-24 10:28:56 +02:00
Eric Lippmann 5b1e4f0a1c CSS: Add new main.less to our stylesheet
refs #5543
2015-09-23 13:41:39 +02:00
Eric Lippmann 2e9ea40eb1 CSS: Disable main-content.less for now
refs #5543
2015-09-23 13:37:19 +02:00
Eric Lippmann e982735451 CSS: Rename main.less to base.less
refs #5543
2015-09-23 13:36:25 +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
Eric Lippmann d1b141d142 CSS: Include main.less in our stylesheet
refs #5543
2015-09-23 11:01:55 +02:00
Eric Lippmann 12227d9d08 CSS: Disable defaults.less for now
refs #5543
2015-09-23 10:57:39 +02:00
Eric Lippmann 8b9cdc5c1e CSS: Include normalize.css in our style sheet
refs #5543
2015-09-23 10:43:43 +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 33231d24da.
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
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
Matthias Jentsch 42fb1a174b Do not crash when ldap_dn is defined in additional variables
refs #9950
2015-09-22 14:08:15 +02:00
Matthias Jentsch 46f2f71c57 Improve logging of membership queries
refs #9950
2015-09-22 13:02:08 +02:00
Matthias Jentsch 84554d245d Conform to coding guidelines
refs #9950
2015-09-22 12:51:00 +02:00
Johannes Meyer 3c7155f246 NavigationItemRenderer: Pass external urls through the iframe module
refs #5600
2015-09-21 14:13:10 +02:00
Johannes Meyer 7e460e7c03 Url: Remove redundant slash on urls without path 2015-09-21 14:04:36 +02:00
Johannes Meyer 776d06d6ca Url: Fix host check in fromPath()
refs #5600
2015-09-21 14:03:53 +02:00
Johannes Meyer c8d3aa2517 Url: Support external urls in fromPath()
refs #5600
2015-09-21 13:10:35 +02:00
Johannes Meyer 3aaf726856 Update CSS style used for the navigation
refs #5600
2015-09-21 11:13:05 +02:00
Johannes Meyer 76cf01869e NavigationItem: Add property $target
refs #5600
2015-09-21 10:18:46 +02:00
Eric Lippmann 46ab8d847d Forms: Wrap the label and the help icon in a div
refs #5543
2015-09-19 21:58:02 +02:00
Eric Lippmann a92c0de52f CSS: Disable all form styles for the moment
refs #5543
2015-09-19 21:57:29 +02:00
Jo Rhett f3df1f228d Fix for support issue 9950, do lookups properly on posixGroup group classes 2015-09-18 13:37:04 -07:00
Alexander A. Klimov 17e8f01d24 Use the DN to fetch group memberships from LDAP
fixes #9901
2015-09-18 15:34:12 +02:00
Eric Lippmann cf8548a29d CSS: Add Icinga theme (WIP)
refs #5543
2015-09-18 15:25:14 +02:00
Johannes Meyer d4a9198310 Navigation: Only fail if there's really no chance to create the requested hierarchy
refs #5600
2015-09-17 14:42:02 +02:00
Johannes Meyer b6fe6ffd6b Navigation: Relax type check in method fromConfig()
refs #5600
2015-09-17 13:41:28 +02:00
Johannes Meyer bb4f4e9095 User: Properly load menu items
refs #5600
2015-09-17 13:40:58 +02:00
Johannes Meyer 0ec3610349 Web: Properly load shared menu items
refs #5600
2015-09-17 13:40:40 +02:00
Eric Lippmann eff9249863 lib: Don't provide LDAP server-side sort request if the query has no order
refs #10147
2015-09-17 13:01:58 +02:00