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
10,241 Commits 81 Branches 85 Tags
1962e28098ef7597f80da3d77adcd8c94de98265
Commit Graph
402 Commits
Author SHA1 Message Date
cigamit 96f62fe610 Resolve Issue #1527 
Update Fontawesome from 4.7 to 5.0.10
 2018-04-22 09:24:27 -05:00
cigamit 85ecf7f57b Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x 
# Conflicts:
#	docs/CHANGELOG
#	lib/utility.php
 2018-02-26 21:24:43 -06:00
cigamit e38a874bab Minor alignment issue 2018-02-26 21:22:09 -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 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 8a42ab3aa7 Some pagination not translated into foreign languages 2017-12-24 08:11:25 -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
Patrick 4ed445eab4 Fix for #1005 and updated Dutch translations (#1006) 
* Updated Dutch translations
- 1007 translations remaining (70% translated)
- English typo fixes

* Fix for #1005
 2017-09-30 07:34:31 -05:00
Patrick c53c9c217b Fix for #1005 and updated Dutch translations (#1006) 
* Updated Dutch translations
- 1007 translations remaining (70% translated)
- English typo fixes

* Fix for #1005
 2017-09-29 08:50:05 +02: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 e7a6a783fa issue: Move Graph removal function to Graph API 2017-09-01 10:09:53 -05:00
patrick a669e4138c Let's have this a bit more optimized. :) 
Reference commit: 912e927b97
 2017-07-30 18:44:45 +02:00
patrick 53a862c345 Let's have this a bit more optimized. :) 
Reference commit: 912e927b97
 2017-07-30 18:39:40 +02:00
cigamit 912e927b97 Resolving Issue #885 
Graph generated with no device and no graph template forgets device
definitions
Also, ensure that all clicks are disabled when the graph is locked.
 2017-07-29 15:10:56 -05:00
cigamit be39275c9b Unlock graph and other elements not showing in Sunshine theme 2017-07-20 19:55:26 -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 14c8d72547 issue: Visual issue when creating non-templated Aggregate graphs 2017-07-02 15:36:49 -05:00
cigamit f613b6d20a Resolving Issue #794 
SQL Error when creating manual graphs
 2017-06-06 06:50:32 -05:00
John Horne a36c5a3b39 When changing graph templates, set the template filter to any for the return page. 2017-06-05 01:20:54 +01:00
John Horne e388ca903a To ensure that all compatible graph templates are listed, we need to allow the 
database calls to handle more than one entry.
 2017-06-02 17:54:15 +01:00
cigamit 01d6793c73 Minor issue with graph title theming when creating aggregate from template 
Due to missing type='text', jqueryui would not skin the element.
 2017-05-29 18:40:10 -05:00
cigamit 9e5550a9e1 If a Graph is not Template based, populate the Template correctly. 2017-05-21 12:34:18 -05:00
cigamit f460518570 Resolving issue #717 
Allow ajax callbacks when adding non-templated graph items
 2017-05-21 11:49:18 -05:00
cigamit 88200ceac6 Resolving Issue #704 
Fix GUI issue for Graphs not belonging to a device
 2017-05-19 22:49:43 -05:00
cigamit a639b68763 Resolving Issue #712 
Change Graph Template dropdown invalid.  SQL Error
 2017-05-19 22:27:45 -05:00
cigamit c5162bf809 Refixing Issue #560 2017-05-18 05:56:15 -05:00
Jimmy Conner aea8ddc7bd Merge pull request #702 from reboot1983/strlen 
Cool stuff
 2017-05-17 22:13:11 -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
John Horne 1c1d41500e Add 'dq_' to the array list of allowed template id prefixes before verification. 2017-05-15 16:51:31 +01:00
cigamit e8082c4dcc Resolving Issue #670 
Validation error when you do "Change Graph Template" in Cacti
 2017-05-14 07:50:39 -05: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 a50a4dec02 Make graphs.php page responsive on graph output 2017-04-30 17:02:07 -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
cigamit a031853804 Resolving Issue #610 
Change Graph Template action not available
 2017-04-24 20:45:49 -05:00
cigamit c67608f7f4 Fixing two Aggregate issues 
1) Sequencing was broken on non-templated Aggregates causing totals not
to function
2) Skip/Total Selectors for Aggregates not functional when creating
Non-Templated Aggregates
 2017-04-23 13:09:03 -05:00
cigamit 59b89364e1 Resolving Issue #560 
Add 'Duplicate' and 'Convert to Graph Template' back to Graph Management
page for Advanced mode
 2017-04-22 13:23:57 -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 2b3bbc4231 Resolving Issue #531 
Issues with TextAlign and Tick graph items
 2017-04-07 20:57:39 -05:00