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

500 Commits

Author SHA1 Message Date
Tatiana Llorente 6c9ce7e65b Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica 
Conflicts:
	pandora_console/godmode/setup/setup_general.php
	pandora_console/include/styles/pandora.css
	pandora_console/install.php


Former-commit-id: b94f977a4d39f2e9e59b7ed9626115b0a458c5dd
 2019-02-15 13:18:10 +01:00
Daniel Barbero 624d804168 Fixed minor error 
Former-commit-id: 05fc8b97c42ee9907954cb28d9e560c9076d50e9
 2019-02-14 16:53:01 +01:00
Daniel Barbero d9ba3af358 Fixed errors in setup performances 
Former-commit-id: 1eb48c00f527f43504a41aea8b352f30792e080b
 2019-02-14 16:31:19 +01:00
Daniel Barbero 0fb61444f6 Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico 
Conflicts:
	pandora_console/godmode/setup/performance.php
	pandora_console/include/functions_api.php
	pandora_console/install.php


Former-commit-id: e8fc07d1f10723700114949b30e9f3770208149e
 2019-02-14 08:01:23 +01:00
daniel f14684b22d Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico 
Conflicts:
	pandora_console/godmode/setup/performance.php
	pandora_console/godmode/setup/setup.php


Former-commit-id: 9a96a30cc97d2d2af707d7cd89b5a1e6ad0d0746
 2019-02-07 07:58:33 +01:00
manuel.montes bf7e7f1e5c Fixed merge errors 
Former-commit-id: 30312c4b1ae7a3615576abbae90776f278586f27
 2019-02-06 18:11:50 +01:00
Tatiana Llorente 9568cc9aba Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica 
Conflicts:
	pandora_console/godmode/agentes/agent_manager.php
	pandora_console/godmode/agentes/configurar_agente.php
	pandora_console/include/functions_config.php


Former-commit-id: 19f087050477dcc099bd31d7de62ac893de5d686
 2019-02-06 18:06:49 +01:00
manuel.montes d113bfbeb8 Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte 
Conflicts:
	pandora_console/include/styles/pandora.css


Former-commit-id: 57658aa74a36e6ca9bc53af58e3732e895cf977c
 2019-02-06 17:02:58 +01:00
manuel.montes dee7c769f2 Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte 
Conflicts:
	pandora_console/godmode/setup/performance.php
	pandora_console/godmode/setup/setup_auth.php
	pandora_console/godmode/setup/setup_ehorus.php
	pandora_console/godmode/setup/setup_general.php
	pandora_console/godmode/setup/setup_visuals.php
	pandora_console/include/styles/pandora.css

	modificado:     pandora_console/include/functions_html.php


Former-commit-id: feaf2f5d3defda182f9cdaf151854257aeba1b22
 2019-02-06 16:11:46 +01:00
Tatiana Llorente 9baa3dcfa2 Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos 
Conflicts:
	pandora_console/extensions/agents_modules.php
	pandora_console/extensions/module_groups.php
	pandora_console/general/login_page.php
	pandora_console/godmode/alerts/alert_list.builder.php
	pandora_console/godmode/alerts/alert_list.list.php
	pandora_console/godmode/gis_maps/configure_gis_map.php
	pandora_console/godmode/groups/group_list.php
	pandora_console/godmode/reporting/visual_console_builder.data.php
	pandora_console/godmode/reporting/visual_console_builder.editor.php
	pandora_console/godmode/reporting/visual_console_builder.elements.php
	pandora_console/godmode/setup/setup_visuals.php
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_networkmap.php
	pandora_console/include/functions_pandora_networkmap.php
	pandora_console/include/functions_ui.php
	pandora_console/include/functions_visual_map_editor.php
	pandora_console/include/styles/common.css
	pandora_console/include/styles/countdown.css
	pandora_console/include/styles/datepicker.css
	pandora_console/include/styles/dialog.css
	pandora_console/include/styles/help.css
	pandora_console/include/styles/menu.css
	pandora_console/include/styles/pandora.css
	pandora_console/include/styles/pandora_forms.css
	pandora_console/operation/agentes/estado_monitores.php
	pandora_console/operation/agentes/interface_traffic_graph_win.php
	pandora_console/operation/agentes/realtime_win.php
	pandora_console/operation/agentes/stat_win.php
	pandora_console/operation/events/events.php
	pandora_console/operation/snmpconsole/snmp_view.php
	pandora_console/operation/tree.php
	pandora_console/operation/visual_console/render_view.php


Former-commit-id: 87793fc5a319121753f591da7949ad0ff3bd72b1
 2019-02-05 09:23:53 +01:00
Alejandro Gallardo Escobar d38236091b Format fixes 
Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e
 2019-02-01 09:55:29 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
daniel 1d7f5365ab add params setup historic database 
Former-commit-id: 6a2d0cf00f18ceee467ca98279adf5285ea161dd
 2019-01-30 12:07:17 +01:00
tatiana.llorente@artica.es f5c96b7e5d New organization of CSS files - #3358 
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
 2019-01-24 11:10:49 +01:00
manuel.montes fd2dcb3281 Changed radio buttons by toogle switch checkbox 
Former-commit-id: d4b46db05fa38e268e0c6f82979bca52fec36e78
 2019-01-17 17:28:23 +01:00
tatiana.llorente@artica.es 6f65c9876f Added option in setup for unique main IP in agents - #1744 
Former-commit-id: f8f9668a14818a01b811a73052e2e7e82e9a8c7a
 2019-01-09 16:20:24 +01:00
daniel 1b78c1a78d fixed error log js and warning php visual style 2018-11-23 09:21:22 +01:00
manuel.montes c131c631d4 Fixed bug in visual styles configuration 2018-11-07 16:34:09 +01:00
daniel 0978be9b51 fixed errors php7 2018-10-30 14:43:27 +01:00
daniel 0b0bad8a73 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/graphs/fgraph.php
 2018-10-25 17:43:28 +02:00
vgilc fcb95a8d8d Merge branch '2510-Checkboxes-y-radio-buttons-en-Config.-visual' into 'develop' 
visuals fix in visual styles

See merge request artica/pandorafms!1731
 2018-10-25 13:16:57 +02:00
vgilc 5255ced7d1 Merge branch '2762-Poner-capitalizacion-correcta' into 'develop' 
Capital letter in the letter a of audit - #2762

See merge request artica/pandorafms!1766
 2018-10-25 11:55:15 +02:00
daniel f824650642 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 2018-10-16 15:42:17 +02:00
daniel e2f7157545 fixed php7 2018-10-04 11:43:08 +02:00
fermin831 e318d9539c Added favourite services configuration tokens 2018-09-19 16:56:58 +02:00
tatiana.llorente@artica.es 69ec75e392 Capital letter in the letter a of audit - #2762 2018-09-14 09:38:36 +02:00
daniel f117d1af43 fixed heigth charts for reports 2018-09-11 09:33:24 +02:00
manuel.montes 7d6bf289f8 visuals fix in visual styles 2018-09-05 08:23:57 +02:00
samucarc dae0021db9 Changed soft graphs hint 2018-08-28 11:02:27 +02:00
daniel 06c436e5bf add new tocken zoom graph visual styles 2018-08-03 10:01:04 +02:00
daniel 0dd39f1f00 fixed errors in graph slice for uncompresed 2018-07-05 11:52:52 +02:00
danielmaya 4214577eea Added new token for static graph height 2018-06-19 18:27:04 +02:00
daniel 7fe88d761e remove setup resolution graph 2018-06-13 11:32:03 +02:00
daniel 9ecc770519 remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces 2018-06-13 11:02:58 +02:00
daniel 25942907cf Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-12 15:46:41 +02:00
daniel 2d6fa8d0e0 fixed errors graphs 2018-06-12 15:46:05 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
fermin831 a54c074b11 [Rebranding] Added hide help on node 2018-05-25 10:29:40 +02:00
fermin831 6675597b62 [Rebranding] Minor fix 2018-05-24 18:35:20 +02:00
fermin831 750ed29ac9 [Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable 2018-05-24 16:59:50 +02:00
fermin831 063865e179 [Rebranding] Refactorized logos preview in nodo 2018-05-24 12:50:24 +02:00
fermin831 9935b7f8a3 [Rebranding] Added custom logo to node request new license 2018-05-22 16:49:49 +02:00
fermin831 0e3db1eb80 [Rebranding] Added custom logo to network maps central node 2018-05-21 18:26:28 +02:00
Fermin 8f2302630c [Rebranding] Docs and Support login icons are configurables 2018-05-21 14:29:11 +02:00
Fermin 3497132517 [Rebranding] Moved rebranding to visual styles section 2018-05-21 11:56:16 +02:00
fermin831 a3ebd00876 [Rebranding] Node setup and footer 2018-05-09 13:12:03 +02:00
Alejandro Gallardo Escobar e77b9f35b6 Improved the help of the WMS server connection creation 2018-05-08 17:29:58 +02:00
Alejandro Gallardo Escobar cc06dfe876 Added a new GIS map source type called WMS 2018-04-27 12:17:42 +02:00
enriquecd 18f3020785 Change fixed header and fixed menu positions - #1844 2018-02-28 19:02:54 +01:00