admin/cacti
1
0 Fork 0
mirror of https://github.com/Cacti/cacti.git synced 2026-10-28 15:47:39 +09:00
Code Issues Packages Projects Releases Wiki Activity
16,258 Commits 69 Branches 85 Tags
develop
Commit Graph
411 Commits
Author SHA1 Message Date
Mark Brugnoli-Vinten 1ca32862a9 Resolving issue #1920 (#1922) 
* Resolving issue #1920

* Minor QA issue
 2018-09-14 20:59:52 -05:00
cigamit c9b078883d Correct for undefined function 2018-09-02 11:27:54 -05:00
cigamit 5eee727f78 Resolving Issue #553 
Aggregated graph does not belong to host
 2018-08-19 20:13:34 -05:00
cigamit d739e8cf48 Resolving Issue #1494 
Unable to Deep Link/Bookmark Trees
 2018-08-09 17:08:46 -05:00
cigamit 4fcf03d280 Resolving Issue #1765 
Graphs Missing when Expand Devices on and Data Query sort type.
 2018-08-06 20:33:03 -05:00
cigamit 75189c61f9 Resolving Issue #1761 
- Graph management shows bogus template names
- Additionally, allow Multi-selects to have a reasonable width
- For Non-Templated and Template Not Found, properly show those things
as select items in the filter.
 2018-07-30 20:43:18 -05:00
cigamit 6f679e97a1 Resolving Issue #1765 
Some tree graphs not rendering as they should be.
 2018-07-29 11:27:11 -05:00
cigamit 04033667ac Resolve HTML validation warnings 
- align attribute is deprecated in HTML5,
- JavaScript should not be inside of table body sections.
 2018-07-26 20:28:57 -05:00
cigamit fc03a5edb4 Another minor change for upcoming location branches 2018-06-09 11:58:27 -05:00
cigamit 2f408b7c8b Resolving Issue #1643 
Wrong graph counts showing on page
 2018-05-30 06:52:57 -05:00
cigamit 85e33abdf8 More changes around site branches #122 
Marking this one complete.  Will log a new issue to create Location
branches under site branches.
 2018-05-12 15:37:57 -05:00
cigamit 35d9d3df75 More uQueryUI classes and form QA 2018-05-09 21:59:08 -05:00
cigamit 96f62fe610 Resolve Issue #1527 
Update Fontawesome from 4.7 to 5.0.10
 2018-04-22 09:24:27 -05:00
cigamit a8cbe34bcb Resolving Issue #1507 
This is a slightly different interpretation of the problem as the Graph
Template ID should not have been in the saved filter setting.
 2018-04-04 19:24:23 -05:00
cigamit f89ab3b3bc Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x 
# Conflicts:
#	auth_login.php
#	data_sources.php
#	graphs_new.php
#	include/auth.php
#	lib/api_tree.php
#	lib/html_form_template.php
#	lib/html_tree.php
#	lib/template.php
#	permission_denied.php
#	poller_automation.php
#	tree.php
 2018-03-25 11:08:00 -05:00
cigamit ec307ee6f9 Resolving Issue #1493 
Can't create tree branches with '#' sign
 2018-03-24 09:00:46 -05:00
cigamit 57cf3ce3d7 Fix a few i18n and format issues 2018-03-21 17:14:49 -05:00
cigamit 55f1eb8332 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x 
# Conflicts:
#	lib/html_tree.php
 2018-02-06 20:44:28 -06:00
cigamit f5ef8d4be7 Reclaim some space on tree 
Remove the device and graph prefixes from the tree, they just take extra
space.  The icons are self explanitory.
 2018-02-06 20:28:08 -06:00
cigamit 10a8e523f7 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x 
# Conflicts:
#	cacti.sql
#	data_sources.php
#	docs/CHANGELOG
#	graphs.php
#	host.php
 2018-01-26 19:31:47 -06:00
netniV 6039e847fc Fix for Issue #1256 / #1268 - RFILTER and display corrections (#1269) 
* Fix for Issue #1256 and #1268
This patch fixes issues with both the display of the error messages and with RFILTER variables not properly being primed as discussed on issue #1256 and issue #1268

* Update CHANGELOG

* Fix issue number
 2018-01-26 17:56:24 -07:00
cigamit ffe87ea0f3 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x 
# Conflicts:
#	docs/CHANGELOG
#	plugins.php
 2018-01-12 11:04:44 -06:00
cigamit a4023f787e Resolving Issue #1175 
When session timeouts occur, logout gracefully
Some spurious conversion to html_escape()
 2018-01-06 17:04:28 -06:00
cigamit 62615311b5 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x 
# Conflicts:
#	docs/CHANGELOG
 2018-01-06 14:08:07 -06:00
Tony Roman 519b35f5cd Update copyright to 2018 2018-01-06 09:10:15 -05:00
cigamit 99d19d5312 Correct whitespace and formatting issues 
Whitespace and formatting in lib
 2017-11-19 14:35:17 -06:00
Tony Roman 6d1b0a9a76 Merge branch 'develop' into feature/1.2.x 
Conflicts:
	aggregate_graphs.php
	auth_login.php
	automation_templates.php
	cli/add_tree.php
	graph_templates_items.php
	lib/api_automation.php
	lib/api_tree.php
	lib/auth.php
	lib/html_form_template.php
 2017-11-18 09:44:33 -05:00
Patrick 4bc2f4c0bc Various updates (#1073) 
* Updated Dutch translations
- Fixed i18n

* Defined fields in queries

* Fixed changelog

* Updated Dutch translations

* Various fixes

All committed files:
- true|false to lowercase

add_perms.php:
- displayGroups() was undefined

add_tree.php:
- duplicate case for '--quiet'

repair_templates.php:
- correction function call to diaplay_version()

gettext.php:
- PHP EOF unneeded

* Fixed warnings in graph_view

* Updated Dutch translations
- Updated Dutch translations with latest cacti.pot file

* Updated Dutch translations
- Fixed conflicts in translations

* Various fixes
- Changed array access identifiers
- Fixed some code layout changes
- Fixed one i18n entry in api_automation.php

* Updated changelog

* Layout changes (tab instead of spaces)

* Layout changes (tab instead of spaces)

* Various fixes
- Changed array access identifiers
- Fixed some code layout changes

* Some fixes for better querying

* Layout change only

* Updated Dutch translations

* Updated changelog

* Updated changelog

* Fixed upgrade script 1_1_28.zip

* Few final fixes after CR or changes

* Updated Dutch translations
 2017-11-11 05:45:12 -06:00
cigamit 223780bcec Resolving Issue #1012 
Issue where disabled devices do not appear on the tree edit page.
 2017-11-04 19:51:57 -05:00
Tony Roman 6c73dd6105 Merge branch 'develop' into feature/1.2.x 
Conflicts:
	cli/add_tree.php
	docs/CHANGELOG
 2017-10-16 11:36:51 -04:00
Wolfgang Stöggl 4a1a15d72c Correct spelling of RRDtool (#1038) 
- Change RRDTool -> RRDtool with a lowercase t.
- Replace in all files except *.mo, *.po, *.pot
 2017-10-16 11:32:05 -04:00
cigamit 3a8d4f7ff9 Use html_escape() over htmlspecialchars() for consistency and security 2017-09-04 21:26:27 -05:00
cigamit 2c4b143c97 Resolving Issue #122 
- Support Site Branch Type
- Note that though the branches currently render, their form and what is
rendered is still not finalized.
 2017-09-01 14:19:11 -05:00
cigamit 59e63f6810 Final changes to address Classic theme issues 2017-08-27 13:49:56 -05:00
cigamit 84015d917b Resolving Multiple Issues - Remember to clear your browser cache 
-issue#920: Issue with scrollbars after update to 1.1.19 related to #902
-issue#921: Tree Mode no longer expands to accomodate full tree item
names
-issue#929: Overlapping frames on certain themes
 2017-08-26 07:10:09 -05:00
cigamit 536a724da4 Resolve issues with all themes and the graph page relative to size and scroll 2017-08-20 09:07:41 -05:00
cigamit 9d88bd6b4c Timespan switching not switching to Custom in Preview Mode 2017-08-10 11:08:01 -05:00
cigamit 111dbe1400 Change multiselect default hight. Make a bit larger 2017-07-29 12:23:00 -05:00
cigamit 30bbf226f5 More changes for issue #861 
Filters not working properly for i18n
 2017-07-20 18:55:33 -05:00
cigamit 0673e3c725 Resolving Issue #861 
- The search filter does not support Cyrillic
- Also adding more __esc() to title and value attributes
- Also adding more missing i18n via audit
 2017-07-19 20:16:27 -05:00
cigamit f850e57629 Freshed core filter html 
In preparation for responsive filters phase II
 2017-07-05 17:13:10 -05:00
cigamit f7f025e6ae Finish resolution of Issue #756 
Translation Issues
 2017-06-03 20:15:52 -05:00
patrick 16e2b7c052 Replaced all if statements and inline if statement with $variable != '' where strlen($variable) was used to determine if a string was empty or not 2017-05-18 01:14:15 +02:00
Patrick c01aec3836 Translations: 
- Fixed some translation issues
- Updated dutch translations
 2017-05-09 19:15:22 +02:00
Tony Roman 8a179d7d7f Fix up to move if elseif else blocks to PSR 2017-05-07 19:57:36 -04:00
Patrick b154c3e89e Optimisations for tree view 
lib/auth.php:
- is_device_allowed()
  - removed unused parameter $user
- get_allowed_tree_level()
  - removed unused parameter $user
- get_allowed_tree_content()
  - removed unused paramters $sql_where, $order_by, $limit, $total_rows and $user
  - refactored the code to apply for these unused parameters
- get_allowed_tree_header_graphs()
  - removed unused parameters $order_by, $limit, $total_rows and $user
  - refactored the code to apply for these unused parameters
- get_allowed_trees()
  - removed unused parameters $edit, $sql_where, $limit, $total_rows and $user
  - refactored the code to apply for these unused parameters

lib/functions.php:
- removed get_graph_tree_array() because it's unused after refactor

lib/html_tree.php
- draw_dhtml_tree_level():
  - removed unused parameter $graphing
  - removed unused global $config
- create_dhtml_tree()
  - removed unused global $config
  - refactored get_graph_tree_array() to alias: get_allowed_trees()

auth_profile.php:
  - refactored get_graph_tree_array(true) to alias: get_allowed_trees(true)
 2017-04-28 18:16:46 +02:00
Patrick 048436387b Small optimisations for threeview 
html_tree.php
- get_formatted_data_query_indexes() only needs to be called if $data_query['id'] > 0
 2017-04-26 21:37:43 +02:00
Patrick e27a1b65da Small optimisations for threeview 
- fixed several alignment issues

api_tree.php
- api_tree_rename_node() Removed 3 unused methodcalls
- api_tree_item_save() removed unused query
- api_tree_get_branch_ordering() defined fields in query

auth.php:
- defined tablenames for fields

html_tree.php
- draw_dhtml_tree_level_graphing()
  - removed unused parameter
  - moved get_allowed_graphs() call out of the foreach()

graph_view.php
- simplified the $matched queries
- typo in "update_timepsan" => "update_timespan"
 2017-04-26 21:19:26 +02:00
cigamit 49e83d7fa1 Resolving Issued #580, #606, #608, #609 
- Data collection warnings when using cmd.php
- Replace <path_php_binary> in data input methods
- Spaces adjacent to double quotes are eliminated durate data input
method import
- Horor the column setting in graph tree view mode
 2017-04-24 20:40:05 -05:00
patrick cc1cc7eab2 PHP7.2 changes: 
- Replaced deprecated each() for foreach()
- Removed reset() calls used for each() loops
 2017-04-15 18:00:13 +02:00