admin/cacti
1
0 Fork 0
mirror of https://github.com/Cacti/cacti.git synced 2026-11-09 22:13:05 +09:00
Code Issues Packages Projects Releases Wiki Activity
8,102 Commits 84 Branches 85 Tags
eccf83ea33e271f9aafb82d1cdceed1d521738f7
Commit Graph
51 Commits
Author SHA1 Message Date
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
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 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 243efdc093 Resolving Issue #822 
Aggregate Graph Items are incorrectly editable.
 2017-07-04 08:28:15 -05: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 68d097e4a0 One change in templating to order items by sequnce 
The remainder are minor format changes for readability..
 2017-05-29 17:59:33 -05:00
cigamit 3f2d15565f Another crack at issue #599 
Well, the errors are gone, but see if it's what you were expecting.
 2017-05-27 11:44:00 -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
Tony Roman 8a179d7d7f Fix up to move if elseif else blocks to PSR 2017-05-07 19:57:36 -04:00
cigamit 2a2cdfd799 remove use of font tag from aggregates 2017-04-30 19:55:58 -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 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 a76b93691e Fix JavaScript errors when managing Aggreage Graphs 2017-04-22 13:06:10 -05:00
patrick d2185c98b1 PHP7.2 changes: 
- Replaced deprecated each() for foreach()
 2017-04-21 22:12:55 +02:00
Patrick 623611cd16 PHP7.2 changes: 
- Replaced deprecated each() for foreach()
- Removed unnecessary reset() calls used for resetting pointers of an array before iterating by a foreach() loop
 2017-04-18 14:40:29 +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 258b9f1dc6 Resolving Issue #307 
This may ultimately not fix the entire issue.
 2017-02-19 11:56:27 -06:00
Tony Roman 35a5988f41 Update source code files copyright to new year 2017-01-01 13:45:29 -05:00
cigamit facb1f7786 Removing the Allow Graph Export columns and UI components 2016-12-22 20:00:27 -06:00
cigamit 954bf636a5 Fix issues with aggregates without a template 2016-12-16 18:07:31 -06:00
cigamit e1f41fc74e Correct column name 'sequence' 2016-12-13 23:12:09 -06:00
cigamit ad15b329de Resolve issue with Aggregate Graph template propogation. 2016-11-22 18:46:48 -06:00
cigamit d94cf0d07f resolving https://github.com/Cacti/cacti/issues/68 2016-10-06 07:55:23 -05:00
cigamit 342c16ee65 Aggregate - Auto select defaults if user doesn't select anything 
Seems better than getting undefined index errors
 2016-10-04 12:52:07 -05:00
cigamit 52ffbdd2a4 resolving bug#2759 2016-08-31 07:58:36 -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 f376ea4ff3 undefined index in aggregates 2016-06-18 09:44:24 -05:00
cigamit eb0a1601c1 i18n on lib directory, double to single quotes 2016-05-30 19:49:54 -05:00
cigamit 3d818fd8da aggregate i18n 2016-05-28 18:06:43 -05:00
cigamit 8c65b9bc25 in cases of a new graph item, the default is skip 2016-05-23 17:22:00 -05:00
cigamit 2a67e6729e correct undefined index warnings 2016-05-23 17:18:18 -05:00
cigamit 10760a71aa adding new graph items to aggregate 2016-03-20 12:59:42 -05:00
cigamit 40e18d2334 more aggregate fixes 2016-03-20 12:18:52 -05:00
cigamit 01315a7fb1 more aggregate changes 
testers need to run the sql alter statement in the install directory
 2016-03-20 11:04:51 -05:00
cigamit fbfc426318 double to single quotes and prepared statements 2016-03-20 10:48:49 -05:00
cigamit f6bac0c7b8 resovle some developer mode logging and template saving issues 2016-02-20 17:11:29 -06:00
Micke2k d188f1631d Change Copyright year 2015 -> 2016 2016-01-29 21:46:02 +04:00
cigamit 51e3588e83 Remove use of colors array, fixin some gui issues 2015-09-07 21:32:01 -05:00
Linegod 0c489922a3 ereg to preg_match 2015-05-31 23:28:40 -06:00
cigamit 71a1c6675d normalize the use of checkboxes and fix device autocomplete behavior 
remove the use of the get_checkbox_style and move to CSS.  also, fix the
behavior of the device automcomplete when using ajax page navigation
using the modern theme.
 2015-05-17 20:06:50 -05:00
cigamit f49357c71b HTML5 Support 
changes to support html5
 2015-05-15 22:29:42 -05:00
cigamit 43548da562 Remove BGColor 
Removing all but a few bgcolor instances
 2015-04-03 20:12:38 -05:00
cigamit ea50211217 Update Deprecated jQuery Calls to 2.x Engine 
- Many attributes are set using prop now.
- Initialize checkboxes on Aggregate Templates
 2015-04-03 19:51:09 -05:00
cigamit 2e4663cc56 Remove Aggregate Logging 
Remove Aggregate logging functions as they are no longer required.
 2015-04-03 19:38:17 -05:00