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

26149 Commits

Author SHA1 Message Date
daniel 65ed10be1a restyling 2023-02-24 13:43:34 +01:00
Jose Gonzalez 9e4b68c0d3 Fixed treeview alerts button 2023-02-24 13:43:10 +01:00
Jose Gonzalez 377d005800 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 13:38:05 +01:00
Jose Gonzalez a6f1037c9a Minor fixes or improvements 2023-02-24 13:37:47 +01:00
Jonathan 967ac6dad3 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 13:21:05 +01:00
Jonathan 0a5571cd4d SNMP browser icons 2023-02-24 13:21:00 +01:00
daniel fcf380851b restyling 2023-02-24 13:09:03 +01:00
daniel 41f6ea0d6e restyling 2023-02-24 12:16:30 +01:00
Daniel Cebrian b367284d72 Merge branch 'develop' into 'ent-10259-control-de-configuracion-en-tagent_acess' 
# Conflicts:
#   pandora_console/include/class/ConsoleSupervisor.php
 2023-02-24 11:09:16 +00:00
Jose Gonzalez ec3e99e459 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 12:07:48 +01:00
Daniel Cebrian c7e53f5a1a #10259 resolve conflics 2023-02-24 12:07:37 +01:00
Jose Gonzalez 70216262a9 Minor fixes 2023-02-24 12:05:53 +01:00
Jonathan 84e3f11b7b Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 12:00:12 +01:00
Jonathan c56aac317a SNMP console view fix 2023-02-24 12:00:02 +01:00
Diego Muñoz-Reja 76dbaf46d2 Merge branch 'ent-10321-limitacion-del-numero-de-eventos' into 'develop' 
Ent 10321 limitacion del numero de eventos

See merge request artica/pandorafms!5513
 2023-02-24 10:06:44 +00:00
Jose Gonzalez 29f21f5f7a Fix action_buttons height 2023-02-24 10:51:59 +01:00
daniel afbbb57a53 restyling 2023-02-24 10:48:30 +01:00
daniel 3575e199b0 restyling 2023-02-24 10:46:46 +01:00
Jose Gonzalez 6d8b3c9b66 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 10:37:06 +01:00
Jose Gonzalez 55c048b66f Change CSV icon 2023-02-24 10:36:53 +01:00
Jonathan 5e25f96c76 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 10:30:55 +01:00
Jonathan 4be8bbd9be SNMP trap generatos create view 2023-02-24 10:30:51 +01:00
Jose Gonzalez d80dd284ab Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 10:20:11 +01:00
Jose Gonzalez 6a5c2c58c7 Fix tree view 2023-02-24 10:19:56 +01:00
daniel 6381aaa9a8 restyling 2023-02-24 10:18:52 +01:00
Pablo Aragon a28eb59ce0 10454-Fix filters 2023-02-24 10:06:32 +01:00
Pablo Aragon a9d49dea3b 10454-Fix filters 2023-02-24 10:04:23 +01:00
Jonathan b8d0e9dda8 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 09:51:59 +01:00
Jonathan c4a0dc1934 SNMP views 2023-02-24 09:51:55 +01:00
artica 4fdd5296a0 Auto-updated build strings. 2023-02-24 01:02:05 +01:00
daniel b34515d03c restyling 2023-02-23 17:57:48 +01:00
Jonathan 831579f9c8 Conflicto solution 2023-02-23 17:10:44 +01:00
Jonathan a09c423284 SNMP views fix 2023-02-23 17:09:58 +01:00
Jose Gonzalez 344261eafa Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-23 16:48:02 +01:00
Jose Gonzalez 65c2d09194 Icons added 2023-02-23 16:47:51 +01:00
daniel 1be0fb94b0 restyling 2023-02-23 16:30:18 +01:00
Jose Gonzalez fbca56500a TreeView minor fixes 2023-02-23 16:24:20 +01:00
daniel 929680eb17 restyling 2023-02-23 16:00:13 +01:00
daniel fa81a4e744 restyling 2023-02-23 15:44:01 +01:00
Jose Gonzalez f08fc6a8b7 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-23 14:31:59 +01:00
Jose Gonzalez f45a777e5b Added save-load icons 2023-02-23 14:30:57 +01:00
Jose Gonzalez d7c70bd8a8 Tree view fixes 2023-02-23 14:30:31 +01:00
daniel 598a1b1456 restyling 2023-02-23 12:34:41 +01:00
daniel e672ba141b restyling 2023-02-23 11:00:38 +01:00
Pablo Aragon c1342fb6a1 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-23 10:32:18 +01:00
Pablo Aragon c30dda1718 10519-New login meta 2023-02-23 10:32:01 +01:00
daniel ff9ee7a4f0 restyling 2023-02-23 10:24:03 +01:00
Jonathan 0fbf50673a Dashboard multiselect height + delete size modal 2023-02-23 10:11:35 +01:00
artica 1babcb408d Auto-updated build strings. 2023-02-23 01:01:56 +01:00
Jose Gonzalez 6180a42413 More pandora_black fixes 2023-02-22 21:19:28 +01:00
daniel e514a0efb5 fixed styles 2023-02-22 17:41:19 +01:00
Jose Gonzalez 0380e8a10c Ticket 10394 Black theme fixes 2023-02-22 16:24:11 +01:00
Matias Didier f371747619 Merge branch 'ent-9479-gestion-de-modulos-desde-metaconsola-sustitucion-del-wizard' into 'develop' 
Ent 9479 gestion de modulos desde metaconsola sustitucion del wizard

See merge request artica/pandorafms!5509
 2023-02-22 15:09:19 +00:00
Pablo Aragon ac4a76d653 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-22 15:02:14 +01:00
Pablo Aragon d414bb2600 10454-Fix event view - td styles 2023-02-22 15:02:08 +01:00
Jose Gonzalez 095caf6fa9 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-22 14:20:20 +01:00
Jose Gonzalez ec58cb4593 Plugins view 2023-02-22 14:19:57 +01:00
Pablo Aragon 1e384fd054 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-22 13:08:27 +01:00
Pablo Aragon 2081459556 10454-Fix event view 2023-02-22 13:08:15 +01:00
daniel 8230ae616b Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/godmode/users/user_list.php
	pandora_console/operation/events/events.php
 2023-02-22 12:35:34 +01:00
Jose Gonzalez 370ee54d9f Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-22 12:16:14 +01:00
Jose Gonzalez fd0c181820 Margin reversed 2023-02-22 12:16:04 +01:00
Jose Gonzalez bbde3e4181 Minor fixes 2023-02-22 12:15:17 +01:00
Daniel Cebrian 2980e180d8 Merge branch 'develop' into 'ent-10307-14480-anadir-informacion-del-usuario-al-poner-un-evento-in-process' 
# Conflicts:
#   pandora_console/include/functions_events.php
 2023-02-22 10:45:38 +00:00
Matias Didier cbbb874d7b Merge branch 'ent-10416-no-aplica-los-filtros-de-eventos-desde-servicio' into 'develop' 
Ent 10416 no aplica los filtros de eventos desde servicio

See merge request artica/pandorafms!5551
 2023-02-22 10:36:00 +00:00
Matias Didier c8109dadd3 Merge branch 'ent-9523-derivado-del-trabajo-q-a-765-fe-de-errata-en-titulo-de-ventana-emergente-para-informacion-de' into 'develop' 
Ent 9523 derivado del trabajo q a 765 fe de errata en titulo de ventana emergente para informacion de

See merge request artica/pandorafms!5496
 2023-02-22 10:15:26 +00:00
Pablo Aragon e7d6afd636 10488-Fix views reports 2023-02-22 10:35:33 +01:00
Pablo Aragon 95fb797a7e 10488-Fix views reports 2023-02-22 10:33:45 +01:00
Jose Gonzalez 8df0c8a66d Fonts changed at Sancho request 2023-02-22 09:39:13 +01:00
Daniel Cebrian 2b7b49db20 #10493 fixed pagination in tags 2023-02-22 09:29:55 +01:00
Daniel Cebrian 2f1060af56 #10493 fixed pagination in collection 2023-02-22 09:05:27 +01:00
Jonathan 4d5891cd02 Select2 z-index for dialogs 2023-02-22 08:56:37 +01:00
Jonathan 28d964651f Modal report issue change email input style 2023-02-22 08:12:45 +01:00
Jonathan fe0bfbe9d6 Close mesage image fix 2023-02-22 08:08:11 +01:00
artica 53ca822779 Auto-updated build strings. 2023-02-22 01:02:03 +01:00
Jonathan 05c2232daa Modals dashboard view fix 2023-02-21 17:07:03 +01:00
Daniel Cebrian dfadbb0f80 #10493 added pagination in group module 2023-02-21 16:51:05 +01:00
Matias Didier 8b8414be52 Merge branch 'ent-10305-ultima-ejecucion-de-pandora-db-en-vista-about-da-53-anos-como-dato' into 'develop' 
Ent 10305 ultima ejecucion de pandora db en vista about da 53 anos como dato

See merge request artica/pandorafms!5501
 2023-02-21 15:31:31 +00:00
Daniel Cebrian f9c3524be8 #10493 fixed pagination in profiles 2023-02-21 16:05:24 +01:00
Daniel Cebrian 2b185b5754 #10493 fixed pagination in alerts 2023-02-21 15:44:41 +01:00
Jose Gonzalez 7a2cb912b2 Workaround for Status icon 2023-02-21 14:16:37 +01:00
Jose Gonzalez 1d566b4d18 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-21 14:15:05 +01:00
Jose Gonzalez 2fd52eff48 Sprint 2025Feb Improve UI-UX and Resources views 2023-02-21 14:14:13 +01:00
Pablo Aragon 80818d7b6e 10489-Fix alerts edition and event response 2023-02-21 13:18:44 +01:00
Pablo Aragon 57a6bf97b0 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-21 11:28:36 +01:00
Pablo Aragon 7ac794f5ff 10469-Fix omnishell view 2023-02-21 11:28:26 +01:00
Jonathan 005fbd27c1 Tree view meta fix 2023-02-21 11:20:17 +01:00
Rafael Ameijeiras 776f0a69f5 Merge branch 'ent-10459-no-aplica-la-politica-de-contrasenas-en-el-cambio-de-password-usuario-admin' into 'develop' 
Draft: Ent 10459 no aplica la politica de contrasenas en el cambio de password usuario admin

See merge request artica/pandorafms!5549
 2023-02-21 09:03:33 +00:00
Rafael Ameijeiras 0fa39af4a9 Merge branch 'ent-10483-falla-el-csrf-en-login-despues-de-hacer-logout' into 'develop' 
Draft: Ent 10483 falla el csrf en login despues de hacer logout

See merge request artica/pandorafms!5550
 2023-02-21 09:02:40 +00:00
artica 490d3db086 Auto-updated build strings. 2023-02-21 01:01:52 +01:00
Jimmy Olano 016a4b7975 Merge branch 'ent-10267-limitar-bloque-de-pagina-en-la-vista-de-eventos' into 'develop' 
Ent 10267 limitar bloque de pagina en la vista de eventos

See merge request artica/pandorafms!5484
 2023-02-20 23:00:29 +00:00
Jose Gonzalez 13aa4e77f1 Fix minor issues 2023-02-20 17:49:02 +01:00
Jose Gonzalez 3ba9b752fe Clean unused items 2023-02-20 17:43:42 +01:00
Jose Gonzalez 82ab2af20a Fix header title and subtitle 2023-02-20 17:26:58 +01:00
Jose Gonzalez 7a1d7f9087 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-20 17:23:01 +01:00
Jose Gonzalez 91393d7ce5 Ticket 10431 Header icons added 2023-02-20 17:22:42 +01:00
Jimmy Olano 34f66ae6f8 Merge branch 'ent-10283-arreglar-layout-de-filtro-de-la-vista-de-consola-de-traps' into 'develop' 
Ent 10283 arreglar layout de filtro de la vista de consola de traps

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/10283

See merge request artica/pandorafms!5495
 2023-02-20 16:11:29 +00:00
Daniel Maya a615d2d98f #9662 minor fixed 2023-02-20 17:08:36 +01:00
Daniel Maya c6e32e278b #9662 fixed favourites 2023-02-20 16:41:54 +01:00
Rafael Ameijeiras 8d13e873cc Merge branch 'ent-10217-disable-admin-s-account-via-cross-site-request-forgery' into 'develop' 
Ent 10217 disable admin s account via cross site request forgery

See merge request artica/pandorafms!5503
 2023-02-20 15:03:42 +00:00