fbsanchez
|
750c64fbd7
|
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7
|
2019-03-13 09:52:00 +01:00 |
Alejandro Fraguas
|
cb1fc5dc67
|
Merge branch 'ent-3616-Pantalla-de-login' into 'develop'
Ent 3616 pantalla de login
See merge request artica/pandorafms!2248
Former-commit-id: c6e02af2b50a12933ec31cd5496fafb10a646c7a
|
2019-03-12 17:23:04 +01:00 |
manuel
|
8f9beccf76
|
Fixed url
Former-commit-id: 7bed92d53f59a0b01034d3630dcddce8a7bc5cfa
|
2019-03-11 12:47:27 +01:00 |
|
manuel
|
bf0e8633ff
|
Added button servers list in header
Former-commit-id: 96d9f7a49d617b0a9f04df601c41bbce71009e38
|
2019-03-11 12:36:52 +01:00 |
Tatiana Llorente
|
71afb7a741
|
New login page
Former-commit-id: 69408bda61a30561372a5ebaecc08fd04b434611
|
2019-03-11 10:07:22 +01:00 |
|
Tatiana Llorente
|
acc44ff9ce
|
Merge branch 'develop' into 'ent-3432-Nueva-cabecera-y-menu-lateral'
Conflicts:
pandora_console/install.php
Former-commit-id: 35214830b309620c88c44b32f93cfae93775e9a8
|
2019-03-06 09:18:38 +01:00 |
|
fbsanchez
|
70e4e86cdf
|
Merge remote-tracking branch 'origin/ent-3432-Nueva-cabecera-y-menu-lateral' into ent-3595-discovery-fase-2
Former-commit-id: ba98fda78052b11f7bb579cf84d5e29e557e68ac
|
2019-03-05 18:58:26 +01:00 |
|
fbsanchez
|
c03631ec9b
|
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 1e68380f62f61e9ac895a0c2bade2e6c8f5b589f
|
2019-03-05 18:56:14 +01:00 |
|
Tatiana Llorente
|
7be5d3e9e0
|
new header and menu
Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
|
2019-03-05 12:54:11 +01:00 |
|
fbsanchez
|
d89e3993e7
|
WIP first tasks
Former-commit-id: 4fbdab2389d5727c44693b129baa4ceadc6934ae
|
2019-03-04 20:02:35 +01:00 |
|
Tatiana Llorente
|
12a287f322
|
Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into ent-3432-Nueva-cabecera-y-menu-lateral
Conflicts:
pandora_console/godmode/setup/setup_visuals.php
pandora_console/install.php
Former-commit-id: 1c1a318ae74ab3a363a88d99cc079eea6e213171
|
2019-03-04 09:52:05 +01:00 |
|
Tatiana Llorente
|
36fa0fc41f
|
new header and menu
Former-commit-id: d1e8fbd044711f87b75177c32225be7847b60018
|
2019-03-04 08:39:56 +01:00 |
samucarc
|
7e53461b94
|
Added new alert when failed database
Former-commit-id: ee0e8efaf3f32b4c5a86d421873555969274ca43
|
2019-02-28 17:40:11 +01:00 |
|
fbsanchez
|
ec5c9d7c27
|
clippy returns
Former-commit-id: b9ed010f5af1002593471a0d0298848b3593e41e
|
2019-02-27 13:41:26 +01:00 |
|
Tatiana Llorente
|
34eedc5330
|
new header and menu
Former-commit-id: aac70c14548c725b68fa031202e0b8449b725f45
|
2019-02-26 11:20:17 +01:00 |
|
Tatiana Llorente
|
3e87c8e931
|
new header and menu
Former-commit-id: 975b72219cb07e0d4f9b332607e554bd65ea7cc3
|
2019-02-26 10:43:59 +01:00 |
|
Tatiana Llorente
|
4c92375a58
|
new header and menu
Former-commit-id: 3509107664a968fc358a8bb3e662f27b26b10c73
|
2019-02-25 12:23:15 +01:00 |
|
Tatiana Llorente
|
526311d1c6
|
new header and menu
Former-commit-id: 0748bc89d30e8ae4723026848d493d15d82af9cd
|
2019-02-25 11:54:46 +01:00 |
|
fbsanchez
|
b1aa0fe2f2
|
Merge from develop
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
|
2019-02-22 12:30:27 +01:00 |
|
fbsanchez
|
912f0baace
|
Discovery Tasks first tasks and some minor fixes
Former-commit-id: 4a37dc99f1b1a95217e9be207526d750133a14a6
|
2019-02-15 18:42:44 +01:00 |
|
fbsanchez
|
3e9e668e00
|
Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3431-discovery-host-devices
Former-commit-id: e20038920481419abfaeddc665b3369f90b49fef
|
2019-02-14 10:59:27 +01:00 |
|
fbsanchez
|
f75a292b34
|
minor fixes/updates in notifications UI
Former-commit-id: d4f5b7db1b5a6f0a023e33c4b8cd55db7765b11a
|
2019-02-13 16:40:37 +01:00 |
|
fbsanchez
|
ed63ef47fa
|
Moved ReconServer to DiscoveryServer
Former-commit-id: 5e18aa75d669f6b45d3b4e2648f31473fd206091
|
2019-02-13 14:56:10 +01:00 |
fermin831
|
8be28b5fed
|
Removed some header icons (it will be substituted by notifications)
Former-commit-id: 29929ee6f9785cf892b3a0afe7779531d5615e6c
|
2019-02-13 11:47:33 +01:00 |
|
fermin831
|
fe50d6caff
|
Open toasts and messages into new window
Former-commit-id: ff3d565247225032219d4bbb5fa903bdae7730e8
|
2019-02-13 11:09:15 +01:00 |
|
fermin831
|
48724fe033
|
Added onclick to notification-item's
Former-commit-id: 2e4833686b08b104b11ba9023f6eca38e0ed6bd9
|
2019-02-12 16:46:21 +01:00 |
|
fermin831
|
cc2b2709f9
|
Show the notifications with AJAX
Former-commit-id: 73f407d13d3805dce879c1431311a4aaec00c152
|
2019-02-12 16:25:59 +01:00 |
|
fermin831
|
3c3d9daa09
|
Removed unwanted traces
Former-commit-id: 23e41d90e1ee5d94758c050de942b6f8fb779613
|
2019-02-12 15:29:28 +01:00 |
|
fermin831
|
325f5e8775
|
Added onclik con notification toasts
Former-commit-id: 7d0c7a7cc9dacc0e52c7f362a3301ed87a7205d3
|
2019-02-12 15:27:14 +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
|
9a3140baf2
|
notifications. Up to date
Former-commit-id: 80b94d79e7ad393fcaea63cbbd7f734a805da751
|
2019-02-12 12:27:32 +01:00 |
|
fbsanchez
|
42dc0c60be
|
supervisor
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
|
2019-02-12 11:41:21 +01:00 |
|
fermin831
|
c355a581ff
|
Added toasts to notifications
Former-commit-id: 7429bf8d9c4f4e8bb16549172a59c33d22185821
|
2019-02-11 17:53:37 +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 |
|
fermin831
|
e6dc69e3be
|
Added last_id to notification ball
Former-commit-id: f7095e633ce5799cf79bd20393e13e5b6233bf4c
|
2019-02-11 13:05:31 +01:00 |
|
Fermin
|
d5d58e5b2b
|
Added outter shadow to notifications messages box
Former-commit-id: 1eed4b4f2ef7d58dbab73ccb2628bb0ef9ffc7ca
|
2019-02-08 18:53:28 +01:00 |
|
Fermin
|
0124bd0a17
|
Added real notifications (not AJAX jet)
Former-commit-id: 5d0dee32c4fb96ad8dcb4f3f70049e1d1c4936fc
|
2019-02-08 14:23:05 +01:00 |
|
fbsanchez
|
681ad67028
|
ConsoleSuperviso - mailing support and minor fixes
Former-commit-id: 86db19d675aa2b7ea37af2839764245fde9ee3c4
|
2019-02-07 18:00:51 +01:00 |
|
samucarc
|
b96bf0e4b0
|
Fixed conflict
Former-commit-id: 9db99a8652b794c3e98c0372de6a43066886c5e4
|
2019-02-07 17:33:43 +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 |
|
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
|
397f2964da
|
Added messages notification ball
Former-commit-id: c44a99cf63bc7451890389e4d234fd8aa7b62cbc
|
2019-01-31 15:16:56 +01:00 |
artica
|
b3da2803a4
|
Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
|
2019-01-30 16:18:44 +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 |
|
samucarc
|
0d48b4573a
|
Fixed Label in the Console Menu
Former-commit-id: eb73f14fa5631dd481b36711ea0bb62943ec43e5
|
2019-01-14 18:54:43 +01:00 |
Alejandro Gallardo Escobar
|
027043f9f3
|
Revert "included file required by update_manager_get_current_package function in footer file"
This reverts commit 94493e18ce.
|
2018-12-03 11:54:17 +01:00 |
vgilc
|
0014c4df9e
|
Merge branch '2849-Cambio-de-hora' into 'develop'
Changed date in footer - #2849
See merge request artica/pandorafms!1847
|
2018-11-30 13:22:25 +01:00 |
|
vgilc
|
472995ce63
|
Merge branch '2889-PHP-Fatal-error-al-pulsar-ayudas' into 'develop'
included file required by update_manager_get_current_package function in footer file
See merge request artica/pandorafms!1852
|
2018-11-30 13:12:04 +01:00 |