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

1095 Commits

Author SHA1 Message Date
Pablo Aragon 8ad672a376 13495-Show Setup icon in VC 2024-04-26 08:16:22 +02:00
Pablo Aragon ee349358c6 13601-Show servers icon in header only for PM users 2024-04-24 09:46:22 +02:00
Pablo Aragon 220dfb3ad3 Merge branch 'develop' into ent-13185-ligera-modificacion-en-el-header 2024-04-10 14:37:10 +02:00
Pablo Aragon 49f5a5277c 13148-Empty views - Some fix 2024-04-08 16:29:03 +02:00
Pablo Aragon a1e9c20f0b 13148-Empty views 2024-04-04 18:35:56 +02:00
Pablo Aragon 2be2bff6ae Merge branch 'develop' into ent-13185-ligera-modificacion-en-el-header 2024-04-02 08:06:06 +02:00
Pablo Aragon 294c7f60fa Merge branch 'develop' into ent-13146-queda-fea-eso-en-el-filtro-de-notificaciones 2024-03-26 13:51:16 +01:00
Pablo Aragon f8ca5501d6 13185-Change header and menu. WIP 2024-03-26 10:21:51 +01:00
Pablo Aragon c2d00123e5 13146-Change header notifications styles 2024-03-25 13:29:49 +01:00
Jonathan 1bd402d04c #13119 load_modal oncloseescape option & remove x welcomewindow 2024-03-25 12:20:39 +01:00
Daniel Cebrian 1125f64e89 #12994 fixed message error sql in history db 2024-03-07 13:28:34 +01:00
alejandro.campos@artica.es 4fbcb2318c fix error when there are no servers 2024-02-26 15:48:47 +01:00
Rafael Ameijeiras 0cce999c95 Merge branch 'ent-12695-16818-eliminar-warnings-en-console-log' into 'develop' 
Ent 12695 16818 eliminar warnings en console log

See merge request artica/pandorafms!6919
 2024-02-22 16:21:32 +00:00
daniel 45ffdb1cc5 fix visual errors not working servers pandora_enterprise#12178 2024-02-12 10:34:43 +01:00
Jonathan 2246fd8049 #12695 WIP warnings 2024-02-07 16:39:33 +01:00
Jonathan 727ee659ae #12791 fix wizard welcome 2024-01-30 15:37:04 +01:00
Jonathan 3026c9d50d #12786 fix wizard open out of index 2024-01-23 16:27:07 +01:00
Matias Didier a2efb36f36 Merge branch 'ent-12622-token-enable-feedback-desactivado-no-hace-que-desaparezca-del-menu-de-ayuda' into 'develop' 
Ent 12622 token enable feedback desactivado no hace que desaparezca del menu de ayuda

See merge request artica/pandorafms!6768
 2024-01-18 08:41:58 +00:00
Rafael Ameijeiras 5bdf1b0766 Merge branch 'ent-12398-actualizar-los-enlaces-de-ayuda-movidos-en-el-12287-2' into 'develop' 
Ent 12398 actualizar los enlaces de ayuda movidos en el 12287 2

See merge request artica/pandorafms!6758
 2023-12-21 12:00:44 +00:00
daniel 855fc32a7d Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/include/javascript/pandora.js
	pandora_console/include/styles/pandora.css
 2023-12-19 09:39:24 +01:00
Jonathan 7ae77773e6 #12597 popup open 2023-12-18 11:28:09 +01:00
Jonathan fe9b35ed77 #12622 help only when feedback enable 2023-12-13 16:51:14 +01:00
daniel cc12c77008 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/include/styles/pandora.css
 2023-12-13 10:39:48 +01:00
Jonathan c593161525 #12398 change urls wiki 2023-12-12 12:22:51 +01:00
Rafael Ameijeiras d072187a2c Merge branch 'ent-12605-vista-de-agentes-error-500-en-develop' into 'develop' 
fix error 500 and warnings pandora_enterprise#12605

See merge request artica/pandorafms!6738
 2023-12-11 14:27:39 +00:00
Jonathan 28dc5cada0 #12596 new dialog on baner open version 2023-12-11 12:21:33 +01:00
daniel 1d36d8a436 fix error 500 and warnings pandora_enterprise#12605 2023-12-05 09:14:02 +01:00
daniel f6f0f15731 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/graphs/fgraph.php
	pandora_console/include/lib/Dashboard/Widgets/single_graph.php
	pandora_console/include/styles/pandora.css
 2023-11-28 08:29:10 +01:00
Matias Didier 7bc998d230 Merge branch 'ent-12206-limitacion-cambio-de-contrasena-de-usuarios' into 'develop' 
Ent 12206 limitacion cambio de contrasena de usuarios

See merge request artica/pandorafms!6542
 2023-11-27 12:12:10 +00:00
daniel 868700f9f1 add sliced mode simple graph reports and CV pandora_enterprise#9640 2023-10-25 15:55:54 +02:00
Daniel Cebrian b1b7a1e57d #10194 fixed acl in view 2023-10-19 16:18:36 +02:00
Daniel Cebrian d54a6faede #10194 adjust bars 24 hrs in events and changed numbers 2023-10-16 20:47:47 +02:00
miguel angel rasteu 041a13cb49 #12206 User password change limitation to local 2023-10-09 16:03:04 +02:00
Daniel Cebrian 7c201d2855 #10194 new structure for general tactical view 2023-09-21 17:58:18 +02:00
Jonathan 192ec72b32 #12038 header link setup 2023-09-21 10:06:08 +02:00
Jonathan 23756e8495 #12038 header link setup 2023-09-21 08:46:09 +02:00
Pablo Aragon ba964dfb16 11817-Remove Network maps from autorefresh user list 2023-08-29 08:52:50 +02:00
miguel angel rasteu ebd98b479d #11051 Fix conflict css 2023-08-21 09:01:05 +02:00
miguel angel rasteu 970cc997cc #11051 Fix conflict 2023-08-21 08:25:53 +02:00
Rafael Ameijeiras 1f9cd3a773 Merge branch 'ent-11316-simplificar-vistas-de-soporte' into 'develop' 
Ent 11316 Simplificar vistas de soporte

See merge request artica/pandorafms!6173
 2023-08-21 06:16:41 +00:00
Jorge Rincon 3b50481c28 Merge branch develop into ent-11543-pantalla-de-login-en-modo-blanco 2023-08-18 09:49:27 +02:00
Daniel Cebrian 26a09987c0 #11316 fixed modal in black theme and header welcome in header 2023-08-18 08:48:33 +02:00
Rafael Ameijeiras 976f07c1e9 Merge branch 'ent-11459-Mientras-dura-el-mergeo-en-Metaconsola-en-nodos-no-aparece-el-mensaje-indicando-que-no-estan-disponibles' into 'develop' 
limited access to nodes when merging

See merge request artica/pandorafms!6129
 2023-08-18 06:48:25 +00:00
Rafael Ameijeiras 81f7591cb6 Merge branch 'ent-11795-stored-cross-site-scripting-via-site-news-page' into 'develop' 
Ent 11795 stored cross site scripting via site news page

See merge request artica/pandorafms!6290
 2023-08-18 06:44:33 +00:00
Daniel Cebrian 74ed3d6c2b Merge branch 'develop' into ent-11316-simplificar-vistas-de-soporte 2023-08-18 08:26:45 +02:00
Jonathan 7eb8dccc44 #11836 text-warp to white-space 2023-08-04 14:04:08 +02:00
Jonathan e5f72058a7 #11836 fix style for error on #11219 2023-08-04 13:46:57 +02:00
Jonathan 2a4500bd16 #11836 fix style for error on #11219 2023-08-04 13:46:15 +02:00
Daniel Maya ae22b99835 Merge branch 'develop' into ent-11739-compatibilidad-php-8-2-second 2023-08-02 09:10:04 +02:00
Daniel Maya aef7f0edd0 #11739 Fixed deprecated functions 4 2023-08-01 14:51:31 +02:00