fbsanchez
|
34cf0bd837
|
minor fix acl check in notifications
Former-commit-id: 3ee0004f0c8ab507ed2301b77117ca945fb4e826
|
2019-02-18 14:01:17 +01:00 |
|
alejandro-campos
|
2c97708373
|
Merge branch 'develop' into 3227-No-se-guarda-muestra-correctamente-certificado-ssl-en-setup-general
Former-commit-id: d6becbfc3aba9d5197b748647db5e93e3b58c348
|
2019-02-15 14:56:20 +01:00 |
|
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 |
|
fermin831
|
0ecf2bb9c4
|
Added pandora db messages purgue
Former-commit-id: 23d1f55ac6b7d6d5470fa25860b9bbb1575875df
|
2019-02-13 14:43:55 +01:00 |
|
fermin831
|
fe50d6caff
|
Open toasts and messages into new window
Former-commit-id: ff3d565247225032219d4bbb5fa903bdae7730e8
|
2019-02-13 11:09:15 +01:00 |
|
fermin831
|
cc2b2709f9
|
Show the notifications with AJAX
Former-commit-id: 73f407d13d3805dce879c1431311a4aaec00c152
|
2019-02-12 16:25:59 +01:00 |
|
fermin831
|
105341e553
|
Removed unwanted traces (again)
Former-commit-id: c6453610177b1894bc9d65c8297cd4f8ee01092d
|
2019-02-12 16:01:24 +01:00 |
|
fermin831
|
325f5e8775
|
Added onclik con notification toasts
Former-commit-id: 7d0c7a7cc9dacc0e52c7f362a3301ed87a7205d3
|
2019-02-12 15:27:14 +01:00 |
|
fermin831
|
36dd59b250
|
Added changes without delete install.php
Former-commit-id: 686b0dc8e519283508f8f83ff663f6d3b79e7b80
|
2019-02-12 13:29:43 +01:00 |
|
fermin831
|
af90734436
|
Revert "Merged from discovery and validated"
This reverts commit e744dd50ebec8dfc7a2250dfad764371b855fcc8 [formerly af2047a38913f2763b68a8ec15b8f0cd58b8e676].
Former-commit-id: b32e3295f770a72ee587754b0d63ac8df1fd70f8
|
2019-02-12 13:29:04 +01:00 |
|
fbsanchez
|
e744dd50eb
|
Merged from discovery and validated
Former-commit-id: af2047a38913f2763b68a8ec15b8f0cd58b8e676
|
2019-02-12 13:14:22 +01:00 |
|
fbsanchez
|
166c3bbe88
|
Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3371-sistema-de-notificaciones-pandora
Former-commit-id: d630994f964e43b28197f4d26469fa1484d08ac2
|
2019-02-12 12:41:11 +01:00 |
|
fbsanchez
|
42dc0c60be
|
supervisor
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
|
2019-02-12 11:41:21 +01:00 |
|
fermin831
|
17c012cd83
|
Added update ball notifications
Former-commit-id: 60c253a1b64d1084ae732e88e0a6fb1f98cf8a12
|
2019-02-11 14:44:14 +01:00 |
|
fermin831
|
a50a251b00
|
Added filter to get last messages by notification ball
Former-commit-id: 57619fe6cd46f3f723c5b2c3bdbe3aa9ba155a0c
|
2019-02-11 13:35:36 +01:00 |
|
Fermin
|
4b86683d23
|
Fixed style
Former-commit-id: bd4c0370bb3c63eddb9a7b36b0e8f6938c48b4ae
|
2019-02-08 11:39:17 +01:00 |
|
Fermin
|
80a5d0b0b9
|
Removed unused code and format some files
Former-commit-id: 5f8da31efc5241dd16002565fdb89d774072b7b3
|
2019-02-08 10:32:04 +01:00 |
|
fermin831
|
04b2cb8665
|
Use real ids instead fake ids
Former-commit-id: 2360a14d1865f918247d23b2f3181626052cad60
|
2019-02-07 18:04:14 +01:00 |
|
fermin831
|
7fa344c2a4
|
Change the global configuration notification to AJAX
Former-commit-id: a9017377c8ed6780170c0f418ec3e9bc39f7782c
|
2019-02-07 17:53:09 +01:00 |
|
Tatiana Llorente
|
4c2215a3db
|
Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
Conflicts:
pandora_console/install.php
Former-commit-id: bc20f50737c115ade0034b4ca9e6d4cab26d35e6
|
2019-02-07 08:59:45 +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 |
|
fermin831
|
6ddcfcbb19
|
Fixed code style lintern
Former-commit-id: d7757a56f8368761776f80f826600d601b56b6d9
|
2019-02-06 12:51:02 +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 |
|
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 |
|
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 |
|
fermin831
|
d2a3d3bbbc
|
Added all users in global notifications config
Former-commit-id: d4bf0067f3ffe2e4fdef25158579716bdfd78d5d
|
2019-02-04 10:41:35 +01:00 |
|
Alejandro Gallardo Escobar
|
d38236091b
|
Format fixes
Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e
|
2019-02-01 09:55:29 +01:00 |
|
fermin831
|
1c0a5ca247
|
Added pospone select (fixme)
Former-commit-id: 428b4424a15ef54c4d95a2eb4af07a334366577a
|
2019-01-31 20:11:43 +01:00 |
|
fermin831
|
75eaa875c9
|
Added checkboxes to notifications global configuration
Former-commit-id: 79df159f003292dfef697773fe8daa25b77f04c2
|
2019-01-31 19:43:13 +01:00 |
|
fermin831
|
01bc0775bc
|
Added notification global configuration (only enable and disable)
Former-commit-id: 850d4dd1d8e30fc66623308b8ab148eaeadb5015
|
2019-01-31 19:13:51 +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 |
|
alejandro-campos
|
c05b4c53e8
|
fix bug when updating path of ssl certificate in general setup
Former-commit-id: dfe466e64e18c7e3ea949f7786e0ef6343334260
|
2018-12-07 15:12:09 +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 |
|