admin/cacti
1
0 Fork 0
mirror of https://github.com/Cacti/cacti.git synced 2026-11-09 14:02:54 +09:00
Code Issues Packages Projects Releases Wiki Activity
8,619 Commits 81 Branches 85 Tags
b9b2bcd4a214906caaafcda5edccdfd249a5bf60
Commit Graph
290 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 2b8097c060 Resolving Issue #1882 
Bypass output validation in select cases
 2018-08-30 19:29:27 -05:00
cigamit b92a62816a Correct Syntax Error in data_sources.php 2018-07-28 21:31:58 -05:00
cigamit f07c6da88c Small issue with invalid Edit Device URL location 2018-07-28 20:37:15 -05:00
cigamit 01870a1c14 Resolving Issue #1744 
Realtime graphs not working.
 2018-07-25 20:18:26 -05:00
cigamit efb3101cfd Resolving Issue #1658 
Devices drop down should be filtered by Site
 2018-06-17 13:40:21 -05:00
cigamit 86641b1be2 Pre-apply jQueryUI styles to input objects 2018-05-09 20:58:37 -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 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 0eb5a973c9 Correct an issue related to #1457 2018-03-21 17:21:33 -05:00
cigamit 1f1b353b2e Additional Sanitization for Issue #1457 
- Minor format changes as well
 2018-03-17 10:01:49 -05: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 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 8ee60a9168 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x 
# Conflicts:
#	include/global_arrays.php
 2017-12-24 08:54:22 -06:00
cigamit 8d63e6b144 Resolving Issue #1128 
Resolve php warning when raising messages
 2017-12-24 08:50:12 -06:00
cigamit 7ed134070a Resolving Issue #1142 
Add Site dropdown to the Graphs and Data Sources pages
 2017-12-21 20:00:18 -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
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 18e3ab3e29 Minor restructuring of data_sources.php 2017-09-01 10:20:55 -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 eed8943fb7 Resolve two issues as below 
issue: External Data Sources show as having poller interval on Data
Source page
issue: Allow Selecting 'External' as the Data Source Profile when
creating non-templated Data Sources
 2017-07-02 12:50:34 -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 5c4ca4e08a -issue#655: Data source not displaying device name 
Although I still could not reproduce any of this bug, I refactored the if statement mentioned in the bug (added in commit 6ec122c73b).
- Fixed some alignment
- Removed unnecessary global and variables
- I hope I've fixed #655
 2017-05-09 11:08:17 +02:00
Tony Roman 8a179d7d7f Fix up to move if elseif else blocks to PSR 2017-05-07 19:57:36 -04:00
cigamit a6eb1c735e wc3 Validation on select files 2017-04-30 19:28:09 -05:00
cigamit 6ec122c73b Resolving undefined variable waring on data source page 
Also updating ChangeLog
 2017-04-30 18:03:00 -05:00
cigamit ff125d01cb Update all pages to include div based forms 
This requires a CSS change which is going to be committed next and
separately to call out the changes required there.
 2017-04-30 13:15:58 -05:00
patrick d2185c98b1 PHP7.2 changes: 
- Replaced deprecated each() for foreach()
 2017-04-21 22:12:55 +02: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
cigamit f22c9694e4 Add multiple column sort and glyph API's 
Convert all core pages to use multiple column sort.  There may still be
some pages around automation that are required to be migrated.  However,
they will continue to operate as is.
 2017-03-17 17:19:03 -05:00
cigamit 7867e55ff0 Resolving Issue #254 2017-02-02 20:27:54 -06:00
cigamit a8c560966a Correcting spelling and grammar issues 2017-01-12 19:09:16 -06:00
Tony Roman 35a5988f41 Update source code files copyright to new year 2017-01-01 13:45:29 -05:00
cigamit 4a19fdcd95 Data Source and Template Enhancements 
Allow filtering by profile,
Allow changing default profile for template
 2016-10-01 09:52:39 -05:00
cigamit 56cd61518d resolving bug#168 
not entirely happy with this solution, but it is a start.
 2016-09-04 10:31:25 -05:00
cigamit e154fbd8d0 change from Has Graph to Orphans 2016-09-03 13:15:57 -05:00
cigamit 9daa5a38fd do not allow removal of data sources when there are graphs using it 2016-09-01 23:19:13 -05:00
cigamit 1aa80816f2 standardize not found messaging 2016-08-31 16:23:20 -05:00
cigamit ad47cff05d remove validation warnings 2016-08-28 22:43:27 -05:00
cigamit b523f1dea5 remove addslashes, prepared statements, wc3 validation, double to single quote 
this is required for preparation of magic_quotes_gpc.
 2016-08-28 15:27:48 -05:00
cigamit 0bfae42f14 removing duplication of graphs and data sources 2016-08-26 17:05:53 -05:00
cigamit e7f383f42e resolving bug#2736 
resolving by removing the functionality.  non-templated graphs is being
phased out.  so, this functionality is dubious at best.
 2016-08-26 16:58:01 -05:00
cigamit df8161c4a9 fix minor issue with change data source 2016-08-26 16:44:58 -05:00