samucarc
|
d82529438c
|
Fixed commit
Former-commit-id: 6b2f2ee955c63da4e73fa0e2bef4c10496ea42eb
|
2019-02-06 20:12:17 +01:00 |
|
samucarc
|
da14bbb66e
|
Fixed commit
Former-commit-id: 2d03897bfb48d40a85b24b9f7ee573dd1fadd7e2
|
2019-02-06 20:08:39 +01:00 |
|
samucarc
|
9c623148f5
|
Fixed conflict
Former-commit-id: 02b3e0656041e5bdadf295177f0c29a81abf8c3f
|
2019-02-06 19:14:46 +01:00 |
|
samucarc
|
fcb9275d11
|
Fixed conflict
Former-commit-id: 7aeb505d4d2b8e11f72e5b841eec557d4afc1b6d
|
2019-02-06 19:09:09 +01:00 |
Daniel Rodriguez
|
f098b72fe4
|
Merge branch 'ent-3274-Retoque-visual-vista-SNMP-interfaces' into 'develop'
Fixed height in slicesbar graph of table interface snmp - #3274
See merge request artica/pandorafms!2144
Former-commit-id: c4e83cd7a6525aae2a567a90b3fb7d4d1ebb70bf
|
2019-02-06 18:56:47 +01:00 |
fermin831
|
986dfcb74d
|
Added basic and dummy user edit notifications
Former-commit-id: d0395c5b2cbc870812e54e15db523eeaac94557f
|
2019-02-06 18:20:26 +01:00 |
|
fermin831
|
37d02ddf59
|
Added disabled status to switches
Former-commit-id: 7fee49f58e4be84bfb8bad08303b203d71dafe16
|
2019-02-06 18:18:48 +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 |
Daniel Maya
|
f1f929bfe4
|
Merge branch 'develop' into 'ent-3392-7367-estado-de-elemento-incorrecto-en-consola-visual'
# Conflicts:
# pandora_console/include/functions_visual_map.php
Former-commit-id: 07e2add1d1e20f292d7bae05bcaa6452c92e4543
|
2019-02-06 17:37:23 +01:00 |
|
Daniel Maya
|
152d55fa8c
|
Merge branch 'develop' into 'ent-3459-7439-vista-de-edit-item-report-template-muy-lenta-debido-a-query-no-optimizada'
# Conflicts:
# pandora_console/godmode/massive/massive_edit_modules.php
Former-commit-id: 6d14e617f32575291898c9ce1bebde1e8b212691
|
2019-02-06 17:04:02 +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 |
|
Daniel Maya
|
c1ee43a064
|
resolved conflicts
Former-commit-id: 6934eb56d50cfaa16a978472de044cfe135e906a
|
2019-02-06 17:00:15 +01:00 |
Alejandro Fraguas
|
9f7ab61766
|
Merge branch '3358-Mejora-en-la-aplicación-de-estilos' into 'develop'
3358 mejora en la aplicación de estilos
See merge request artica/pandorafms!2161
Former-commit-id: ef392bbd62ec9df99964d2057e23e35e334cb6c7
|
2019-02-06 16:34:00 +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 |
daniel
|
b58f96ec42
|
Merge remote-tracking branch 'origin/develop' into 3404-Mejoras_y_arreglos_en_la_instalación_de_la_consola
Conflicts:
pandora_console/install.php
Former-commit-id: 292ab3a98f7b2dffef8e0198298af74a6b619df2
|
2019-02-06 16:04:37 +01:00 |
|
daniel
|
19c5a1c844
|
fixed error pdf
Former-commit-id: 2a81a654df0c216951c61f36ff31a05ce5f7e29a
|
2019-02-06 15:58:36 +01:00 |
|
Tatiana Llorente
|
b805fe594e
|
Merge remote-tracking branch 'origin/develop' into ent-3274-Retoque-visual-vista-SNMP-interfaces
Conflicts:
pandora_console/include/functions_reporting_html.php
Former-commit-id: d096025f7a166160598f9fb26fe17c60809c9c3e
|
2019-02-06 15:34:06 +01:00 |
|
samucarc
|
a3aca91765
|
Fixed WMI passwords when encrypted
Former-commit-id: 7cadbe954ddd7c6878a58a7fbae13ab984ddb736
|
2019-02-06 15:26:43 +01:00 |
|
Tatiana Llorente
|
cc17cbf60f
|
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
Conflicts:
pandora_console/include/functions_config.php
Former-commit-id: 3456fcc7a45639055010e67440601ac4fba547ec
|
2019-02-06 15:22:05 +01:00 |
|
Tatiana Llorente
|
b8aab972c9
|
Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
Conflicts:
pandora_console/godmode/groups/group_list.php
Former-commit-id: 6f928cc0a3ce2d4822affc7444254393d1d47b69
|
2019-02-06 15:14:22 +01:00 |
fbsanchez
|
27495845ba
|
Merge remote-tracking branch 'origin/ent-3371-sistema-de-notificaciones-pandora' into ent-1959-cron-supervisor-de-estado
Former-commit-id: 500d7bb0d6e05093cfa3d7557fb8af6f22c410c7
|
2019-02-06 12:53:02 +01:00 |
|
fermin831
|
6ddcfcbb19
|
Fixed code style lintern
Former-commit-id: d7757a56f8368761776f80f826600d601b56b6d9
|
2019-02-06 12:51:02 +01:00 |
|
fbsanchez
|
77c92ba5ab
|
Merge remote-tracking branch 'origin/ent-3371-sistema-de-notificaciones-pandora' into ent-1959-cron-supervisor-de-estado
Former-commit-id: 982b806890f05118d71c6424a8879168c3a00028
|
2019-02-06 11:49:20 +01:00 |
|
fermin831
|
ac6b74dcdf
|
Added new window to display user notifications config
Former-commit-id: 57ba8fcd01365cedc92535d7cf71f70432a55a94
|
2019-02-06 11:36:28 +01:00 |
artica
|
c0a23889ab
|
Auto-updated build strings.
Former-commit-id: ad456bf0e4cb361694afa246a9348e5b87b85a94
|
2019-02-06 00:01:29 +01:00 |
|
fbsanchez
|
6f87b436d0
|
minor fix
Former-commit-id: 3fabf2561773365932c5d33e8bf9e42b7ed4e7f0
|
2019-02-05 18:47:41 +01:00 |
|
fermin831
|
ddcf0bbd16
|
Added deletion on global notification config
Former-commit-id: 2356bbe374e5decf929cfaaf2fc4776611b0652d
|
2019-02-05 18:14:10 +01:00 |
|
fermin831
|
7df3fe2dac
|
Added functionallity to Add element on notification global config
Former-commit-id: b51cf2d5079019a69fd7c4344dfcff2bf38147db
|
2019-02-05 17:40:44 +01:00 |
|
fermin831
|
b4f3e94b13
|
Clean dialog box on creation
Former-commit-id: 824f7a968b2e196d6df98b9f5dbd48f21a7c9859
|
2019-02-05 15:31:08 +01:00 |
|
fermin831
|
68bdbd511c
|
Fixed add consecutive source elements
Former-commit-id: 7763da94a48442953879538d42f36673fbdec752
|
2019-02-05 13:46:16 +01:00 |
|
fermin831
|
8811257762
|
Popup to add groups and sources to global notification configuration
Former-commit-id: 481812290ea1d1446aa7378ab6a935139483c8a0
|
2019-02-05 13:36:16 +01:00 |
|
fermin831
|
0b72571c7c
|
Added NOT IN in format mysql filter
Former-commit-id: f3a8cdd6923834443ed7223d1e6ad7776b861184
|
2019-02-05 12:53:57 +01:00 |
|
daniel
|
418d497291
|
fixed errors pdf
Former-commit-id: f7ad69f6b5e0910e5f31464ddfe94593529ef6a7
|
2019-02-05 10:40:24 +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
|
97259bc285
|
Auto-updated build strings.
Former-commit-id: e3473dde27b1cc8aaa1ae555158171d25941710f
|
2019-02-05 00:01:28 +01:00 |
|
fbsanchez
|
8d17c9e0d0
|
minor plugintools fix
Former-commit-id: d7d43777b952b483a733c7ac92776f12b5c17e62
|
2019-02-04 19:32:54 +01:00 |
|
fbsanchez
|
7247fbf6ef
|
Merge branch 'ent-1959-cron-supervisor-de-estado' of brutus.artica.lan:artica/pandorafms into ent-1959-cron-supervisor-de-estado
Former-commit-id: 8cb75cd39226594d79f861d44de613c346b84f8d
|
2019-02-04 19:17:41 +01:00 |
|
fbsanchez
|
89af077b52
|
Servers get server string name
Former-commit-id: e67755e9a86872ba65c5768191cba80fbd879322
|
2019-02-04 19:16:50 +01:00 |
|
fbsanchez
|
c15357dc03
|
Servers get server string name
Former-commit-id: 6988fc5972c72c23131704e9dcb45328755b0ee8
|
2019-02-04 19:16:30 +01:00 |
|
fbsanchez
|
53947de42a
|
minor changes - constants style
Former-commit-id: 3482cb88dc0884ea3c1742eb8fef4ac7c603a849
|
2019-02-04 19:14:02 +01:00 |
|
Daniel Rodriguez
|
06e87d2b36
|
Merge branch 'ent-3248-6352-anadir-compatibilidad-snmp-v3-a-servidor-snmp-enterprise' into 'develop'
Add SNMPv3 support to the Enterprise SNMP Server.
See merge request artica/pandorafms!2122
Former-commit-id: 49fd3b38b38d95f6b457dbf83d46f6ba52e94e1e
|
2019-02-04 17:00:25 +01:00 |
|
Alejandro Fraguas
|
67ab08fc41
|
Merge branch 'ent-3344-7304-procesado-de-XML-con-acentos' into 'develop'
added accent compatibility Dataserver
See merge request artica/pandorafms!2109
Former-commit-id: 7e7479c3d82aeb398fb0c76fe7df61d8522af2b3
|
2019-02-04 14:05:40 +01:00 |
|
daniel
|
20e0508e01
|
fixed pdf report
Former-commit-id: 515b8f06f3584c6aaa1a32ea29a2f555e7afccad
|
2019-02-04 12:10:52 +01:00 |
|
Alejandro Fraguas
|
ec97e54dec
|
Merge branch 'ent-3338-Bulk-operations-Module-operations' into 'develop'
Changed the order of actions
See merge request artica/pandorafms!2139
Former-commit-id: 13b7155ec497027e521f3a9b2147b9e24692e0db
|
2019-02-04 11:22:43 +01:00 |
|
fermin831
|
54f0bc1a03
|
Disable selec boxes when click notify all users on notifications global config
Former-commit-id: 93a3a0007a3a8dfabfec5d0b9ead7d185aeee81b
|
2019-02-04 11:02:52 +01:00 |
|
manuel.montes
|
0a94ac9eb0
|
Merge branch 'develop' into ent-3338-Bulk-operations-Module-operations
Conflicts:
pandora_console/godmode/massive/massive_operations.php
Former-commit-id: b673fb9521259653d6f0386e6d9ab5add276380f
|
2019-02-04 11:00:50 +01:00 |
|
fermin831
|
d2a3d3bbbc
|
Added all users in global notifications config
Former-commit-id: d4bf0067f3ffe2e4fdef25158579716bdfd78d5d
|
2019-02-04 10:41:35 +01:00 |
|
Daniel Rodriguez
|
74d9b18c87
|
Merge branch 'cursed-format-change' into 'develop'
Cambio del formato de estilo visual del código
See merge request artica/pandorafms!2156
Former-commit-id: 9b05490414194e58adbcd6a79a20c93eff40c9a4
|
2019-02-04 10:18:05 +01:00 |
Alejandro Gallardo Escobar
|
4c735762dc
|
Merge branch 'develop' into cursed-format-change
Former-commit-id: a986a0245f7f0cce5ea7fc3c33503bc53e85242a
|
2019-02-04 09:11:39 +01:00 |