admin/cacti
1
0 Fork 0
mirror of https://github.com/Cacti/cacti.git synced 2026-11-08 21:16:17 +09:00
Code Issues Packages Projects Releases Wiki Activity
8,333 Commits 73 Branches 85 Tags
59f04f054eb40aceea8bb2adff565d2e60cd223f
Commit Graph
192 Commits
Author SHA1 Message Date
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 ec307ee6f9 Resolving Issue #1493 
Can't create tree branches with '#' sign
 2018-03-24 09:00:46 -05:00
cigamit 7e70e27940 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x 
# Conflicts:
#	docs/CHANGELOG
#	include/themes/modern/main.css
#	tree.php
 2018-02-18 16:26:26 -06:00
cigamit eecda378de Resolving Issue #1355 
If only one tree exists, don't show move arrows
 2018-02-14 21:17:24 -06:00
cigamit b25896415a Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x 
# Conflicts:
#	docs/CHANGELOG
 2018-02-06 08:08:43 -06:00
cigamit 91e0869676 Use correct logging level 2018-02-04 22:34:01 -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 5fada91ed4 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x 
# Conflicts:
#	docs/CHANGELOG
 2018-01-19 07:59:03 -06:00
netniV b05c4df21c Fix for Issue #1230 - undefined function (#1232) 2018-01-19 07:28:56 -06:00
cigamit bec9b91a7b Remove inflight nonsense 2018-01-16 06:15:04 -06:00
cigamit c0aecc1347 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x 
# Conflicts:
#	lib/functions.php
 2018-01-16 06:14:27 -06:00
cigamit d40a2b1be1 Resolve three issues and add one feature 
1) Drag and Drop on three pages could lead to sequencing issues
2) Allow Trees to be rearranged using Drag and Drop
 2018-01-15 18:28:41 -06:00
cigamit 822f738bed Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x 
# Conflicts:
#	include/layout.js
#	tree.php
 2018-01-13 12:36:40 -06:00
cigamit d4edcf8737 Resolving Issues #1189, #1191, and Pull Request #1192 
This change utilizes the new API to resort the tree based upon the
filter buttons available.  It is essentially pull request #1192 just
handled a slightly different way.
 2018-01-13 12:31:06 -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 9bae6a7a10 Resolving Issue #1174 
Disable tree edit drag and drop when tree is not in edit mode
 2018-01-05 18:06:50 -06:00
cigamit 4f3654d711 Add the nubmer of Site Branches 
Add the number of site branches to the main Tree table view.
 2017-12-27 20:20:11 -06:00
cigamit a3c600dbcd Make tree editing responsive 2017-12-22 14:42:30 -06:00
cigamit 8ba822ac8a Removed deprecated call option 2017-11-19 15:03: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 bae0b5ea94 Resolving Issue #980 
Resolve issue where a new tree branches refreshs before you have a
chance to name it
 2017-09-17 20:57:16 -05:00
cigamit 7f24eb4a38 Resolving Issue #980 
Resolve issue where a new tree branches refreshs before you have a
chance to name it
 2017-09-17 17:02:39 -05: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 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 0e3afcb878 issue: Up/Down arrow titles labeled incorrectly on Tree Management page 2017-07-06 17:41:16 -05:00
cigamit f850e57629 Freshed core filter html 
In preparation for responsive filters phase II
 2017-07-05 17:13:10 -05:00
cigamit bf6e60bed1 Resolving Issue #577 
Dragging multiple items causes the tree to refresh too early.
 2017-05-27 23:30:09 -05:00
cigamit a3fb027558 Minor format changes in tree code 2017-05-27 23:20:23 -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 a6eb1c735e wc3 Validation on select files 2017-04-30 19:28:09 -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 b28f44a9d9 Add escaping to filter values prior to request. 
Handles the sepecial case of a pound sign causing issues.
 2017-04-23 07:35:01 -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
cigamit 600ad9afc7 Resolving Issue #538 
Unable to rename a tree branch
Also, update jsTree to latest
Add some i18n to jsTree context menus
 2017-04-08 06:54:18 -05:00
cigamit b9ab5994a2 Adjust number format, add hyperlinks, use standardized titles 2017-03-26 09:37:31 -05: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 cc8f64487a Resolving Issue #398 2017-03-11 09:34:09 -06:00
cigamit db6d820958 Resolving Issue #375 
Drag and Drop of Devices and Graphs allows dropping onto self
 2017-03-05 10:59:15 -06:00
cigamit d3b5f34bf2 Resolving Issue #303 2017-02-23 17:44:18 -06:00