tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,038 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

987 Commits

Author SHA1 Message Date
danielmaya 877607e63e Fixed draw link without color 2018-01-10 11:42:17 +01:00
danielmaya 8968e10dab Fixed raw_text in networkmap 2018-01-09 18:54:14 +01:00
enriquecd ca5032b4f6 Fix advanced options toggle for data string modules - #1734 2018-01-09 12:16:11 +01:00
vgilc db55901bf5 Merge branch '1437-Mejorar-pantalla-de-introducción-de-licencia-open' into 'develop' 
Change license windows style - #1437

See merge request artica/pandorafms!1048
 2017-12-21 10:58:46 +01:00
danielmaya 87e2f4f3f9 Fixed filter in gis maps 2017-12-04 11:41:52 +01:00
vgilc 75c8b1ae8f Merge branch '1537-errores-al-reiniciar-el-mapa-de-red-dev' into 'develop' 
Added fix to reset map function

See merge request artica/pandorafms!1140
 2017-12-01 09:31:21 +01:00
daniel a0bdab9b83 Merge branch 'develop' into 1483-Cuadro_de_umbrales 
Conflicts:
	pandora_console/godmode/agentes/module_manager_editor_common.php
	pandora_console/godmode/modules/manage_network_components_form_common.php
 2017-11-30 16:29:00 +01:00
Arturo Gonzalez 92d054695d Added fix to reset map function 2017-11-30 16:00:32 +01:00
vgilc 6ff9eb054c Merge branch '1083-linea-de-color-cuando-uno-de-los-modulos-de-la-relacion-no-esta-bien-dev' into 'develop' 
Added link color

See merge request artica/pandorafms!1049
 2017-11-29 13:28:17 +01:00
vgilc 7beb05f8db Merge branch '1369-interface-graphs-when-interface-is-not-init-in-networkmaps-dev' into 'develop' 
Fixed filter to show interface graph or not

See merge request artica/pandorafms!957
 2017-11-29 13:27:39 +01:00
vgilc 8e71f632e8 Merge branch '1537-new-option-in-networkmaps-to-reset-the-map-dev' into 'develop' 
Added new option to networkmap, reset

See merge request artica/pandorafms!1035
 2017-11-29 13:27:00 +01:00
Arturo Gonzalez 21bbfb557b Added lost code 2017-11-27 15:00:59 +01:00
vgilc 62ffb46763 Merge branch '1471-fallo-enlace-publico-dashboards' into 'develop' 
Fixed public dashboard permissions

See merge request artica/pandorafms!1004
 2017-11-23 09:03:07 +01:00
fermin831 0f814c0b63 Added public dashboard authentication to some components 2017-11-21 16:59:49 +01:00
Arturo Gonzalez fa50ac5cdf Added link color 2017-11-10 11:05:53 +01:00
enriquecd 845db988e8 Change license windows style - #1437 2017-11-10 10:13:24 +01:00
Arturo Gonzalez 7b956e8ef6 Added new option to networkmap, reset 2017-11-07 15:05:31 +01:00
vgilc 2d87172558 Merge branch 'vulnerabilidad-en-consola' into 'develop' 
Resolve: Vulnerabilidad en consola

See merge request artica/pandorafms!1020
 2017-11-06 17:41:45 +01:00
Alejandro Gallardo Escobar ac70caac71 [Console] Fixed XSS vulnerabilities 2017-11-06 15:20:24 +01:00
danielmaya 7c78cd2a34 Fixed password entities in snmp walk 2017-11-03 13:18:00 +01:00
Arturo Gonzalez 0b63fc22f9 Added lost code in limbo, come back to the heaven darling 2017-10-26 13:28:08 +02:00
Arturo Gonzalez b5faf010b0 Fixed filter to show interface graph or not 2017-10-24 10:07:07 +02:00
daniel a9a817df79 fixed error d3 in firefox 2017-10-23 14:05:21 +02:00
vgilc d181edc471 Merge branch '393-Feature-para-mostrar-los-timesticks-en-Dias-Horas-Minutos-Seg-dev' into 'develop' 
New feature. Dynamic units

See merge request !818
 2017-10-04 17:41:37 +02:00
Arturo Gonzalez 65bfedf404 Fixed id of pandora node 2017-10-03 10:32:22 +02:00
Daniel Maya d7f3e1ecde New feature. Dynamic units 2017-09-14 12:10:41 +02:00
vgilc 6bf85a0789 Merge branch '1070-disable-interface-links-in-fictional-nodes-dev' into 'develop' 
Removed interface link function in fictional nodes

See merge request !644
 2017-09-11 09:35:35 +02:00
daniel d74a3f74b4 Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-01 10:51:54 +02:00
daniel fe2a2a36e8 fixed minor errors in WUX 2017-08-30 16:09:11 +02:00
daniel b078d48918 fixed errors in wux 2017-08-30 09:47:57 +02:00
Arturo Gonzalez 88834d6ea1 Added a first version of snmp browser with a proxy server 2017-08-24 16:26:58 +02:00
Arturo Gonzalez ffed7359bc Added execution in server proxy to event response commands 2017-08-24 13:25:03 +02:00
daniel c29d8a4fdb Revert "merge develop" 
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
 2017-08-23 09:35:17 +02:00
daniel 8232911713 merge develop 2017-08-22 18:39:34 +02:00
daniel 7e649b78b3 wux new form 2017-08-09 11:29:16 +02:00
Arturo Gonzalez 6b30accd11 Added new function to redirect with dbclick when fictinal have a map link 2017-07-25 15:38:28 +02:00
Enrique Camargo 0ff56b0856 Update openlayers.pandora.js 2017-07-13 12:07:53 +02:00
enriquecd c9219107bf Hold mark labels font size when autorefresh and fix drag map font size bug - #1115 2017-07-12 18:49:39 +02:00
Arturo Gonzalez ba829e78ce Removed interface link function in fictional nodes 2017-07-05 09:07:55 +02:00
Arturo Gonzalez 474957249b Added correct button declaration 2017-06-07 10:29:01 +02:00
enriquecd ced8050317 Decode html entities in module plugin selector for edit bulk operation - #959 2017-06-05 12:50:22 +02:00
vgilc 3aa4fc7315 Merge branch '943-header-refresh-no-stops-in-events-view-dev' into 'develop' 
Removed old code that breaks the autorefresh pause

See merge request !538
 2017-06-01 09:32:42 +02:00
vgilc 1d6747c353 Merge branch '807-module-massive-operations-with-tag-filter-dev' into 'develop' 
807 module massive operations with tag filter dev

See merge request !476
 2017-05-31 17:42:09 +02:00
Arturo Gonzalez 4ba94f065e Removed old code that breaks the autorefresh pause 2017-05-31 16:40:10 +02:00
artu30 a78b5cc60d Merge branch 'develop' into '777-translations-dev' 
# Conflicts:
#   pandora_console/godmode/update_manager/update_manager.offline.php
#   pandora_console/include/functions_update_manager.php
 2017-05-22 17:51:21 +02:00
artu30 b5d3893c41 Merge branch 'develop' into '836-fixed-margin-top-images-in-vc-lines-open-dev' 
# Conflicts:
#   pandora_console/include/javascript/pandora_visual_console.js
 2017-05-22 17:38:49 +02:00
Arturo Gonzalez f58a9151f7 Fixed bad merge, thx branches 2017-05-22 17:37:21 +02:00
Arturo Gonzalez 309e9e900e Added margin top value to images when have lines 2017-05-22 17:31:29 +02:00
vgilc 4cee2eaea8 Merge branch '836-bad-parents-line-position-in-visual-console-dev' into 'develop' 
836 bad parents line position in visual console dev

See merge request !448
 2017-05-17 17:48:53 +02:00
Arturo Gonzalez d49f1f9916 Added tags filter to mosule massive operations (agent selection first) 2017-05-17 10:41:30 +02:00
Arturo Gonzalez 0346b49f1e Fixed jquery request 2017-05-16 10:42:41 +02:00
Arturo Gonzalez 6f40069aa9 Added a new system to draw lines in visual console when element have an image 2017-05-09 17:29:17 +02:00
Arturo Gonzalez eb1dafe807 Fixed lines in visual console 2017-05-09 12:40:22 +02:00
Arturo Gonzalez ba312476e3 Changed help section in cascade protection help button and fixed help language. 2017-04-27 15:49:23 +02:00
Arturo Gonzalez 6aab4e60ae Added buttons text to translate them 2017-04-26 09:50:42 +02:00
vgilc 1e5cf2d44e Merge branch '409-change-font-size-of-map-gis' into 'develop' 
Gis Maps Feature: When scrolling in map, change font-size of labels.

See merge request !360
 2017-04-25 16:27:37 +02:00
enriquecd 7f927bfdd3 Change strings in minor release update manager / open / 2 - #486 2017-04-24 13:14:14 +02:00
vgilc 41e30eb39b Merge branch '546-widgets-de-dashboard-open' into 'develop' 
Resolve jquery library bug (holagram dashboard) - #546

See merge request !289
 2017-04-18 16:01:22 +02:00
m-lopez-f f8d3c8804e Gis Maps Feature: When scrolling in map, change font-size of labels. 2017-04-10 17:46:32 +02:00
Arturo Gonzalez 640fee4b82 Added lost url to um open online 2017-04-05 16:23:30 +02:00
Arturo Gonzalez 629439f271 Added some modifications to adapt um and rr in meta 2017-04-05 10:26:12 +02:00
vgilc 3f27e0a306 Revert "Merge branch 'remove-traces-debug' into 'develop'" 
This reverts merge request !266
 2017-04-04 13:48:11 +02:00
vgilc 6b2cdb9784 Merge branch 'remove-traces-debug' into 'develop' 
remove debug console.log traces.

See merge request !266
 2017-04-04 13:47:41 +02:00
Arturo Gonzalez 12203f9c2b Added time improvements to networkmaps 2017-04-03 14:20:11 +02:00
vgilc 6fbd8b9978 Merge branch '673-674-networkmap_visual_changes' into 'develop' 
Added visual changes to module nodes in networkmap and added a new option to change the node name

See merge request !334
 2017-04-03 13:53:17 +02:00
enriquecd 3d89007adb Reposition of footer after load ajax elements in networkmap dialog - #112 2017-03-31 14:16:52 +02:00
Arturo Gonzalez 5f29a8f831 Added visual changes to module nodes in networkmap and added a new option to change the node name 2017-03-31 13:18:28 +02:00
Arturo Gonzalez a67d40a447 Added a few modifications to move the footer when nodes table is too long and recolocate interface text with every movement to see it well 2017-03-30 15:56:00 +02:00
Arturo Gonzalez a8b7f055f4 Added a lot of changes to networkmaps 2017-03-28 14:37:40 +02:00
Arturo Gonzalez bcb8968bec Added a few modifications to networkmaps 2017-03-28 11:32:58 +02:00
Arturo Gonzalez a0d9ddd8e6 Added some changes to networkmap 2017-03-27 17:55:17 +02:00
Arturo Gonzalez 27e8ddcdaf Added AMA edges to list of links with the same parent and children 2017-03-27 16:37:26 +02:00
Arturo Gonzalez 311143067a Fixed identical text to multiple links delimiter 2017-03-27 16:28:24 +02:00
Arturo Gonzalez 9512d61e16 Added interface text to add i.link or u.link 2017-03-27 16:03:25 +02:00
Arturo Gonzalez 949fbc3660 Added the second interface text 2017-03-27 15:33:27 +02:00
Arturo Gonzalez fc7afffb2c Added curved lines to networkmap to support more than 1 MM edges between the same node 2017-03-27 14:28:11 +02:00
Arturo Gonzalez 2c3412a8a2 Init to show all mm links (between the same agent) 2017-03-24 12:47:28 +01:00
Arturo Gonzalez 277a3b656d Fixed mr and um mix in um online open 2017-03-24 11:22:30 +01:00
enriquecd e2567f7b6a Resolve jquery library bug (holagram dashboard) - #546 2017-03-22 12:06:29 +01:00
Arturo Gonzalez 6731eb7da4 Fixed async error 2017-03-21 15:13:04 +01:00
Arturo Gonzalez 8ae921402c Added mr folder cleaner 2017-03-21 14:48:12 +01:00
Arturo Gonzalez b64afb7d6f Added a few changes to um and rr 2017-03-21 10:39:39 +01:00
Arturo Gonzalez c9fd56df75 Fixed errors in um online open 2017-03-17 14:22:04 +01:00
Arturo Gonzalez 8fc433f2a8 Added code to control the ocassional errors 2017-03-17 14:13:45 +01:00
Arturo Gonzalez 750203033f Added minor fixes to um open 2017-03-17 14:05:53 +01:00
Arturo Gonzalez 89727824a4 Fixed error in um online open 2017-03-17 13:56:38 +01:00
Arturo Gonzalez aebbc783df Added changes to um online open to integrate mr 2017-03-17 13:27:06 +01:00
Arturo Gonzalez 011517f61d Fixed "cancel" text in offline um dialogs 2017-03-17 11:29:31 +01:00
daniel 060e8f1ddc merge develop 2017-03-17 10:12:53 +01:00
Arturo Gonzalez 25fb6bd894 Added minor fixes to rr 2017-03-17 09:57:10 +01:00
Arturo Gonzalez 5a1192c412 Added more changes to um online open with mr 2017-03-17 09:19:55 +01:00
Arturo Gonzalez ff596fa797 Added a lot of changes in update manager online open to integrate with mr 2017-03-17 09:19:55 +01:00
Arturo Gonzalez 5f72dbafcc Debug UM and RR system 2017-03-17 09:19:55 +01:00
Arturo Gonzalez e7b811c39d Fixed error in um offline oum path to get mrs. 2017-03-17 09:02:40 +01:00
Arturo Gonzalez e713b843dc Added a message whe system have a mr pending 2017-03-16 19:18:42 +01:00
Arturo Gonzalez 831b5e2c7d Added a lot of modifications to integrate mr with um 2017-03-16 19:14:33 +01:00
Arturo Gonzalez 01b9572edc Added more changes to um online open with mr 2017-03-16 18:23:07 +01:00
Arturo Gonzalez b9702a5b00 Added a lot of changes in update manager online open to integrate with mr 2017-03-16 18:07:19 +01:00
Arturo Gonzalez 51cd53b3b3 Debug UM and RR system 2017-03-16 10:46:41 +01:00
m-lopez-f b937db8f35 remove debug console.log traces. 2017-03-16 09:10:22 +01:00
daniel e252135979 merge develop 2017-03-15 17:09:40 +01:00
Arturo Gonzalez d9d01a453a Added a last modifications to um offline and online open 2017-03-15 13:53:44 +01:00
Arturo Gonzalez 0db1dc50c7 Added a lot of code to um offline and online open. 2017-03-15 13:20:05 +01:00
daniel a87839bd07 login page 2017-03-15 10:12:18 +01:00
Daniel Maya f4350aed6b Ticket 477. Fixed some bug in the visual console 2017-03-14 15:54:46 +01:00
Arturo Gonzalez 6aa97917f2 Added new verification when mr filename is wrong. Ticket #510 2017-03-14 15:20:22 +01:00
Arturo Gonzalez be6cc9ea79 Added the last dialog to um. Ticket #486 2017-03-14 13:52:29 +01:00
Arturo Gonzalez 36fda7a23d Added interface modules to db (to next relations with this interfaces) 2017-03-14 12:24:37 +01:00
Arturo Gonzalez cb84e69ada Added warning img to mr advice. Ticket #486 2017-03-14 10:48:29 +01:00
Arturo Gonzalez 73c31012d9 Added new visual styles to um and rr systems. Ticket #486 2017-03-14 10:36:10 +01:00
artu30 7bca59dee1 Merge branch 'move_mr_to_um' into 'develop' 
Move mr to um

See merge request !249
 2017-03-13 16:45:54 +01:00
Arturo Gonzalez 6a39147940 Added rr to um offline. Ticket #510 2017-03-13 16:30:04 +01:00
Arturo Gonzalez 44ac96ae5e Added mr to um menu (online open and enterprise). Ticket #510 2017-03-13 15:52:30 +01:00
enriquecd 0094cfa9bf Center alert modal window when is opened - #93 2017-03-13 13:25:16 +01:00
Arturo Gonzalez 46b008708c Move mr to um section 2017-03-10 14:01:24 +01:00
m-lopez-f 8de4984faf Fixed dialog of system warning alerts. Gitlab: #506 2017-03-09 15:40:59 +01:00
m-lopez-f baf16db154 Fixed problems with bulk delete alerts opertation. Gitlab: #492 2017-03-09 11:40:32 +01:00
Arturo Gonzalez 1b1ab69edc Fixed holding area checking 2017-03-08 13:25:13 +01:00
Arturo Gonzalez 8bae65b4a2 Fixed gis map agents name when refresh map. Ticket #395 2017-03-01 09:20:28 +01:00
Arturo Gonzalez 2d3d82001e Fixed some things to networkmaps. Ticket #406 2017-02-28 12:51:24 +01:00
Daniel Maya 742f487d72 Change to alias in treeview 2017-02-27 15:06:24 +01:00
Alejandro Gallardo Escobar 58617c00aa Merge branch 'develop' into feature/alias_friendly_name 2017-02-20 18:52:18 +01:00
Arturo Gonzalez 03f2250ffa Removed weird alerts in networkmap. 2017-02-20 16:35:32 +01:00
Daniel Maya 3051ce4e23 Merge branch 'develop' into feature/alias_freandly_name 
Conflicts:
	pandora_console/include/functions_ui.php
 2017-02-17 10:11:59 +01:00
Daniel Maya d39b108c1f Merge branch 'develop' into feature/alias_freandly_name 
Conflicts:
	pandora_agents/unix/pandora_agent
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
	pandora_console/godmode/agentes/agent_manager.php
	pandora_console/godmode/agentes/modificar_agente.php
	pandora_console/godmode/agentes/planned_downtime.editor.php
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/godmode/massive/massive_edit_modules.php
	pandora_console/include/class/Tree.class.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_treeview.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/pandoradb.sql
 2017-02-16 16:05:21 +01:00
Arturo Gonzalez 928689ef3b Added some modifications in networkmaps fonts. Ticket #270 2017-02-16 15:05:44 +01:00
Arturo Gonzalez 5cce7ac2d0 Fixed interface links editor in networkmaps. Ticket #260 2017-02-15 10:29:45 +01:00
Arturo Gonzalez c6dbf7c3b5 Added some modifications to node links. Ticket #260 2017-02-14 12:40:57 +01:00
Arturo Gonzalez 0c4f90d252 Node details improvements. Ticket #78 References ticket(s): #78 2017-02-14 09:52:11 +01:00
enriquecd bd7ca5645a Show unreachable host reponse when ping from custom responses - #53 2017-02-10 16:42:55 +01:00
enriquecd 36aa73bdd8 Make alert messages window draggable, zindex 3, change disable logo in graph - #52 2017-02-10 10:18:53 +01:00
enriquecd 363c147043 Disabled and enabled or all agents selector in agent massive operations - #37 2017-02-01 17:31:39 +01:00
Arturo Gonzalez d4a35a0097 Added old d3 lib to servicemap. Ticket #218 2017-02-01 11:58:39 +01:00
enriquecd 3f7109c347 Improve visual console 2 - #15 2017-01-18 15:39:04 +01:00
enriquecd 774d6bf231 15-Improve_visual_console_2 2017-01-17 12:47:03 +01:00
m-lopez-f 7403890e6c Add selection modules in bulk operations: Add action alerts. 2017-01-12 15:51:59 +01:00
Arturo Gonzalez 71614ae81b Added interface links support to networkmaps. Ticket #132 GitLab 2016-12-30 08:51:31 +01:00
Arturo Gonzalez 99208f2492 Fixed interfaces section 2016-12-28 15:20:07 +01:00
enriquecd d768da3964 Top position control for sections left bar when is fixed - #3788 2016-11-21 16:25:11 +01:00
enriquecd d203bee751 Visual console improvements - Edit Signes for builder, main creator / Main help modal window #110 2016-11-18 17:19:33 +01:00
m-lopez-f 88879e8e6e Feature: Search by status module in bulk module delete/edit actions. Ticket: #4190 2016-11-17 12:55:29 +01:00
enriquecd 21ddb758ba Fix Dark background and comments for Enterprise popup community version - #65 2016-10-28 18:11:53 +02:00
enriquecd 22973e9f12 New function pandora ux, let open pics from base64 image modules #90 2016-10-26 18:39:41 +02:00
enriquecd 16c69d615a SMP3 network component template fix, now load all fields - #3292 
(cherry picked from commit c20110aa91)
 2016-10-24 12:59:59 +02:00
Arturo Gonzalez 13a19c42c2 Merge branch 'develop' into new_networkmap_feature 2016-10-17 11:36:30 +02:00
Arturo Gonzalez 3e50676e19 Merge branch 'develop' into new_networkmap_feature 2016-10-17 11:36:00 +02:00
Arturo Gonzalez 69ccfa2d65 New networkmaps in progress... (Added new icons to hide and show labels) 2016-10-17 11:22:27 +02:00
Arturo Gonzalez 69e5c12cfe New networkmaps in progress... (Changed alert to dialog) 2016-10-17 10:52:11 +02:00
Arturo Gonzalez ee9083ae73 New networkmaps in progress... (Fixed offset parameters when maps shows in dashboard) 2016-10-17 08:38:55 +02:00
enriquecd a70d840ea4 (cherry picked from commit 64486bc896) 2016-10-14 19:03:13 +02:00