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

772 Commits

Author SHA1 Message Date
Daniel Rodriguez 979f11ca8f Merge branch 'ent-1668-update-manager' into 'develop' 
Ent 1668 update manager

See merge request artica/pandorafms!2420
 2019-05-22 15:25:49 +02:00
Luis Calvo e361c4243a Autorefresh bug fix 2019-05-21 12:16:06 +02:00
fbsanchez 5e9b2479eb Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager 2019-05-20 13:11:39 +02:00
fbsanchez 034480bf88 minor fixes 
Former-commit-id: ced1aad7a9835dab5b44817f191e33d2ca11cff3
 2019-05-16 12:28:46 +02:00
fbsanchez e7dbb55392 Minor fixes 
Former-commit-id: 51e446b36a4ad2b93a1a2e3ff76e89ea2a21db9b
 2019-05-16 12:00:49 +02:00
fbsanchez d871b599ef General fixes and UM comm updates 
Former-commit-id: b4c58f467f195627f96afe7f06b59004adeb83be
 2019-05-14 23:49:01 +02:00
fbsanchez 53e9113b7e UM notifications MR update 
Former-commit-id: d2aad195cb9bab4e1efa504cb4b4a583f262f0e3
 2019-05-14 17:15:28 +02:00
marcos.alconada bc849c16fb Only one image for welcome new board 
Former-commit-id: a8effda6019c394a9a2d15fbf4998490867b3b02
 2019-05-14 17:13:44 +02:00
marcos.alconada bad2a330fd Se muestra en la pantalla mediante html la imganen 
Former-commit-id: ddd86fc0b4768ed5c3750c304fded70de3389864
 2019-05-14 09:48:41 +02:00
fbsanchez ced1b32915 Configuration, Registration and newsletter wizards 
Former-commit-id: bbd367a10fd01c229c848b15572c4b1d6ccb75cf
 2019-05-13 17:55:41 +02:00
marcos.alconada ac60e296c1 Add new message to News board 
Former-commit-id: ad9170857d95fa2c211d09a5f59f6012739177c5
 2019-05-10 11:17:46 +02:00
marcos.alconada dcfb9c9b61 se actualiza en mensaje en la meta 
Former-commit-id: b20edf93845577c1fdd551211907a25888c6543a
 2019-04-24 17:45:01 +02:00
marcos.alconada de4ea8434a Se ajusta la ventana de usuario bloqueado 
Former-commit-id: dca9700142a5f4b539892f8727d8e5c83222312b
 2019-04-24 17:11:02 +02:00
marcos.alconada d7ca0f1134 Add strong 
Former-commit-id: 68b08a3a6f7dbdd4365b88faf9bfb678e506a5ac
 2019-04-24 16:51:41 +02:00
marcos.alconada 43d8a25c39 Add remaning attemps 
Former-commit-id: 07960eaa4b3281ee13f14b0fc5249b94ac0626fa
 2019-04-24 16:49:04 +02:00
Alejandro Fraguas 6594095de7 Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas' into 'develop' 
Ent 3707 nuevo diseño para las tablas

See merge request artica/pandorafms!2352

Former-commit-id: 684daf476bf288e294b67f97fc80fdf6a6ddcce4
 2019-04-17 10:19:42 +02:00
Tatiana Llorente 29c282dc79 Changed popup no access - #3625 
Former-commit-id: 0798f53d9074a580309aeb9f9577ec518efd9264
 2019-04-15 14:42:58 +02:00
Tatiana Llorente 6a9c972ed6 Changed popup no access - #3625 
Former-commit-id: c58c9f47bab666985ed4cfe0c9c5edf1ed057e76
 2019-04-12 13:54:48 +02:00
Luis Calvo 5998b30a16 Added css hint to discovery tasks when task list is empty 
Former-commit-id: 1da71cda1b1ed376bb6bae0281b0dd882dbfbeff
 2019-04-10 17:30:35 +02:00
Tatiana Llorente 3da2f267a2 New design for the tables - #3707 
Former-commit-id: 6b2550344a7748e210fdb81a26751e9e94cbbfa4
 2019-04-05 13:51:35 +02:00
Tatiana Llorente aa640efc44 Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas 
Former-commit-id: 43e5f9f044a351f1c6cf1c192b9f92cba6d1b0b3
 2019-04-05 13:19:42 +02:00
Daniel Maya 8923c53ec4 Fixed problem with fixed header 
Former-commit-id: 9bf6d824b94f301a804511c106f6465ce9dff0fa
 2019-04-03 16:48:28 +02:00
Tatiana Llorente 34598f391b Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas 
Former-commit-id: 8b576f68f26c1fe2b0d6c1f9029eac599f7a377f
 2019-03-27 17:05:50 +01:00
Tatiana Llorente 845cb85c55 New design for tables - #3707 
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
 2019-03-27 17:03:55 +01:00
alejandro-campos 082e5f06d6 fix pandora logo image path 
Former-commit-id: 92bc151f8e988758af7381ca95b8055ec7a23d5e
 2019-03-27 16:26:47 +01:00
fbsanchez fb818064ed minor fix menu 
Former-commit-id: 6d0ca2d3d86af083c91a098326dc073d90187ab0
 2019-03-27 14:39:02 +01:00
fbsanchez ca5c214472 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 
Former-commit-id: 8952ebd872b4030cb8e1bd4ad3f0425afd13fd09
 2019-03-26 19:30:55 +01:00
fbsanchez ba0ddfb826 style revission 
Former-commit-id: d223662de64194115cf56264ceda987e732eb79a
 2019-03-26 19:29:48 +01:00
Daniel Barbero Martin 4cd06539a2 fixed minor error refresh header 
Former-commit-id: 5fd75dd4fe634760c37fb06a16cc127c9cbfc71d
 2019-03-26 18:37:49 +01:00
Daniel Barbero Martin 004fec7454 Revert "fixed minor error header disabled" 
This reverts commit 2cf945a5e3 [formerly 87ac8d400ac83f316bf8efb1fca6afe2d60e6c8c].


Former-commit-id: 3129ccb02e68230c537e25bc5bd939c400c2ae66
 2019-03-26 18:35:56 +01:00
Daniel Barbero Martin 2cf945a5e3 fixed minor error header disabled 
Former-commit-id: 87ac8d400ac83f316bf8efb1fca6afe2d60e6c8c
 2019-03-26 17:59:00 +01:00
fbsanchez 511295f1c6 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 
Former-commit-id: f43d6ace220a8058f91d115386bdf56e59550cbe
 2019-03-26 16:32:19 +01:00
fbsanchez 436e60c736 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 
Former-commit-id: 49dc95bbeca973fe13b0c82dc205778294c6066f
 2019-03-25 20:14:24 +01:00
alejandro-campos 9947fb8f34 remove console.log 
Former-commit-id: 12feadfc9094d8507e5e7df595e7667a67964362
 2019-03-25 19:42:12 +01:00
alejandro-campos 079f578830 fix bad behavior of pandoras side menu on page load 
Former-commit-id: b1d4eb3e2464fa441f16190d29b2d57cfaa9e3c5
 2019-03-25 19:37:45 +01:00
Daniel Rodriguez 3ef49d14f9 Merge branch 'ent-3669-Cambios-en-cabecera' into 'develop' 
Ent 3669 cambios en cabecera

See merge request artica/pandorafms!2287

Former-commit-id: 8fd555ba5167fe268dccf0801366e6ad4fb58cd0
 2019-03-25 17:57:47 +01:00
Daniel Barbero Martin 4ea17bb0c6 fixed reload page twice 
Former-commit-id: 5944f47d1e0d2e5997deb6afcab6744a514216f7
 2019-03-25 12:53:50 +01:00
Tatiana Llorente fe7103ba9c Changes in header 
Former-commit-id: 3c69b91277f0078a65764c297126d3ebb0dfc11c
 2019-03-25 12:41:39 +01:00
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
Alejandro Gallardo Escobar df8042abb1 Fixed the error message of the password recovery 
Former-commit-id: 3bc9b4044bbe56ec5a1c1f4cbdb3f56db5680abb
 2019-02-12 17:45:25 +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
daniel 1b78c1a78d fixed error log js and warning php visual style 2018-11-23 09:21:22 +01:00
daniel a3aa84bf92 fixed errors in session with send mail alerts graph API 2018-11-21 15:16:52 +01:00
daniel 494b858a20 fixed errors session_start 2018-11-21 13:08:58 +01:00
daniel d12a25866d fixed translate php7 warning 2018-11-15 15:33:46 +01:00
daniel b78c52caa4 fixed error Acess for Access 2018-11-15 13:22:54 +01:00
daniel 6174e622c8 create alert php7 2018-11-14 18:15:48 +01:00
daniel 1c1df4b5f7 fixed errors css jqueryui 2018-11-07 17:09:42 +01:00
vgilc 1973a5fe54 Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop' 
WUX-UX integration

See merge request artica/pandorafms!1890
 2018-10-26 14:42:23 +02:00
vgilc 7a4b7d4289 Merge branch '2221-Actualizacion_de_Pandora_a_version_7_de_PHP' into 'develop' 
2221 actualizacion de pandora a version 7 de php

See merge request artica/pandorafms!1875
 2018-10-26 14:41:15 +02:00
Junichi Satoh 91ed413b0a Fixed language selection problem at initial setup. 2018-10-26 17:34:49 +09: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