fbsanchez
fc0d9463d5
Fixed
2019-06-25 12:07:56 +02:00
fbsanchez
24025ebb74
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-18 17:48:03 +02:00
Daniel Rodriguez
a87e3ce97e
Merge branch 'ent-3739-Vista-Agent-Module-view-no-funciona-en-pantalla-completa-y-autorefresco' into 'develop'
...
Fixed bug in Agent-Module fullscreen view
See merge request artica/pandorafms!2299
2019-06-18 17:00:15 +02:00
Tatiana Llorente
46f64f75c8
Fixed autorefresh in full screen - #3739
2019-06-18 14:54:40 +02:00
fbsanchez
4bb300889d
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-12 13:17:36 +02:00
Tatiana Llorente
31905f005a
Visual changes in Agent/Module View - #3739
2019-06-11 17:34:13 +02:00
Alejandro Fraguas
021ae9b1cd
Merge branch 'ent-3561-error-herramienta-db-schema-check' into 'develop'
...
Ticket Resolved
See merge request artica/pandorafms!2227
2019-06-07 09:48:51 +02:00
fbsanchez
23e6711f09
WIP Events
2019-06-06 17:50:47 +02:00
manuel
cc43e40694
Merge branch 'develop' into ent-3739-Vista-Agent-Module-view-no-funciona-en-pantalla-completa-y-autorefresco
...
Conflicts:
pandora_console/extensions/agents_modules.php
2019-06-05 08:47:16 +02:00
fbsanchez
2f5265fcbb
color updates
2019-06-04 14:08:07 +02:00
fbsanchez
40cca5e1e3
BIG style change, erased all important flags
2019-05-30 18:21:13 +02:00
manuel
bf3ac73feb
Removed empty help icons
2019-05-24 14:26:28 +02:00
manuel
ada49966e0
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
2019-05-21 10:05:06 +02:00
Daniel Rodriguez
f807c23df7
Merge branch 'ent-3264-importa-politicas-desde-resource-registration-en-modo-centralizado' into 'develop'
...
Fixed policy import with centralized management in node
See merge request artica/pandorafms!2217
Former-commit-id: abe02564ab3d19101e37f02bd9cc9f37739e1992
2019-05-14 16:50:42 +02:00
Daniel Maya
26bc3af1d1
Fixed centralized mode message
2019-05-14 15:16:24 +02:00
manuel
6bd8221bc0
changed helps
...
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
2019-04-29 14:36:02 +02:00
Daniel Barbero Martin
ac41e9255f
helpers
...
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53:18 +02:00
Tatiana Llorente
05261e7924
Changed styles from table database interface - #3904
...
Former-commit-id: addb71fdbe4a584047230b4aa61c58e0acf25cd4
2019-04-17 11:49:49 +02:00
Tatiana Llorente
2a37224653
New design for the tables - #3707
...
Former-commit-id: 3ff7435a5edbbd736d56df4c7fc02d21209c3d96
2019-04-10 10:06:27 +02:00
Tatiana Llorente
d91631e0e1
New design for the tables - #3707
...
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
2019-04-05 13:18:38 +02:00
Tatiana Llorente
f497d3bd2e
Added class to action buttons and moved checkbox to the left side
...
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
2019-04-02 13:42:30 +02:00
Tatiana Llorente
845cb85c55
New design for tables - #3707
...
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
2019-03-27 17:03:55 +01:00
manuel
f0d664eec3
Fixed bug in Agent-Module fullscreen view
...
Former-commit-id: 7dfaa8e637af0d6a0865f5f6eb0505f79393d026
2019-03-27 12:29:15 +01:00
Tatiana Llorente
a99c8b1a7b
New view user edit
...
Former-commit-id: 46b0d396f2121901b19417ebdfe91963c3ea0e54
2019-03-20 13:26:15 +01:00
marcos.alconada
dcb0d5e1ee
Ticket Resolved
...
Former-commit-id: 82c331ef17b17a875ad5e6cb95177c035d8435bd
2019-02-28 16:44:37 +01:00
Daniel Maya
fd3762cabe
Fixed policy import with centralized management in node
...
Former-commit-id: f76d8a777c155aa706af34cbe2091b3c8bf09a9d
2019-02-27 16:26:15 +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
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
artica
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
artica
7a9684f23c
Changed the format of the .css files
...
Former-commit-id: a0dce3fe780031105396a8439c83d520197670af
2019-01-30 12:42:16 +01:00
artica
dc238cf74a
Changed the format of the .js and .html files
...
Former-commit-id: 7a06315787b85355f4840cbfb0431d55dea4293d
2019-01-30 12:27:18 +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
vgilc
9d557ced84
Merge branch '2855-Buscador-en-la-vista-de-modulo-de-grupos' into 'develop'
...
implemented search filters for module group and agent group in module groups view
See merge request artica/pandorafms!1956
Former-commit-id: 622169f4682d7197e6551e96568f6ff17f313f08
2018-12-21 10:32:45 +01:00
vgilc
b9fd907933
Merge branch '2992-Realtime-Graph-decimales' into 'develop'
...
Implemented limitation decimals in y-axis realtime graphs
See merge request artica/pandorafms!1941
Former-commit-id: 0ca73da98323fa3880cccd96d12150228ce2dead
2018-12-21 10:25:57 +01:00
alejandro-campos
5c0f85a4bb
fix bug when searching non existing agent group in module groups view
2018-12-20 15:37:00 +01:00
daniel
494b858a20
fixed errors session_start
2018-11-21 13:08:58 +01:00
alejandro-campos
420adb4630
implemented search filters for module group and agent group in module groups view
2018-11-12 13:02:37 +01:00
manuel.montes
a3f4bfaa3d
Implemented limitation decimals in y-axis realtime graphs
2018-11-07 13:57:47 +01:00
daniel
0978be9b51
fixed errors php7
2018-10-30 14:43:27 +01:00
vgilc
08a8165b93
Merge branch '2827-Mensaje-de-alerta-disparada' into 'develop'
...
Added number of times an alert is fired - #2827
See merge request artica/pandorafms!1823
2018-10-29 09:15:32 +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
3ed5b97e1d
Merge branch '2455--6064-Error-Insert-data-nombre-de-XML-mal-construido' into 'develop'
...
Fixed bug in the construction of the name of the xml file
See merge request artica/pandorafms!1737
2018-10-25 13:20:05 +02:00
fermin831
e7663fc5f0
Fixed booleans realtime graphs
2018-10-17 19:20:22 +02:00
daniel
16be9488c8
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
...
Conflicts:
pandora_console/include/functions_graph.php
2018-10-11 13:06:17 +02:00
fermin831
2693bbe209
Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev
...
Conflicts:
pandora_console/godmode/massive/massive_delete_modules.php
pandora_console/operation/agentes/ver_agente.php
2018-10-10 19:39:27 +02:00
daniel
a59ecc7ef3
fixed minor error counters alert fired in module_group view
2018-10-05 11:55:06 +02:00
danielmaya
e8621e54e5
Updated tags optimization
2018-10-05 09:40:08 +02:00
daniel
0ce7d3a2ed
fixed errors php7
2018-10-04 17:17:39 +02:00
fermin831
7ffeaaf50b
[Tags performance] fermin revision 1
2018-10-03 11:13:52 +02:00
danielmaya
942c5391f9
Fixed agents/modules view. it shows nothing if there are no agents and modules selected
2018-10-03 10:31:45 +02:00