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

33458 Commits

Author SHA1 Message Date
Daniel Maya 6bfdfa5a3b 10839 Fixed search 2023-03-30 14:09:02 +02:00
Matias Didier ca3ad36fb6 Merge branch 'ent-10378-guardar-estado-del-menu-lateral-al-hacer-acciones' into 'develop' 
Ent 10378 guardar estado del menu lateral al hacer acciones

See merge request artica/pandorafms!5640
 2023-03-30 11:44:26 +00:00
Daniel Maya 2035d9831b #10378 permanent closed menu 2023-03-30 13:02:36 +02:00
Jimmy Olano 766ecbc308 Merge branch 'ent-10298-cambios-en-script-de-arranque-y-pandora_ha-para-levantar-varias-instancias-del-server' into 'develop', JJOS. 
10298 adding multiconfig server support for init.d

See merge request artica/pandorafms!5584
 2023-03-30 09:37:27 +00:00
Matias Didier 6da2d233cc Merge branch 'ent-10633-pantalla-de-timeout' into 'develop' 
Ent 10633 pantalla de timeout

See merge request artica/pandorafms!5600
 2023-03-30 09:01:10 +00:00
Daniel Cebrian f442272177 Merge branch 'develop' into ent-10633-pantalla-de-timeout 2023-03-30 09:30:38 +02:00
Daniel Cebrian b9fc352578 merge develop into ent-10633-pantalla-de-timeout 2023-03-30 09:15:10 +02:00
artica 392139d22d Auto-updated build strings. 2023-03-30 01:00:16 +02:00
slerena d1e29075a3 Change header copyright and other details 2023-03-29 18:25:00 +00:00
slerena 68f417f3f3 Improved legibility for warning messages (warning class). 2023-03-29 18:24:18 +00:00
daniel d6fdfbc233 Merge branch 'ent-9662-second-round' into 'develop' 
Ent 9662 second round

See merge request artica/pandorafms!5634
 2023-03-29 15:30:12 +00:00
daniel 8458716ba9 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-29 17:27:57 +02:00
Pablo Aragon e067a176a4 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-29 17:09:49 +02:00
Pablo Aragon f26e70630a Blue background & Datatable fix 2023-03-29 17:09:41 +02:00
Jonathan ee0619cc4a Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-29 16:50:25 +02:00
Jonathan 8c3b5d650d tree view dashboard metaconsole 2023-03-29 16:50:17 +02:00
daniel 6a6c99dcab fixed styles 2023-03-29 16:31:25 +02:00
Rafael Ameijeiras b5c343f72a Merge branch '9909-14587-anadir-opcion-al-instalador-de-agente-online' into 'develop' 
9909 adding ssl dependencies and env variable to enable it on online agent installer

See merge request artica/pandorafms!5607
 2023-03-29 14:02:31 +00:00
Rafael Ameijeiras d3c9928c16 Merge branch 'ent-10707-cambios-instaladores-online' into 'develop' 
10707 adding arping to ubuntu and xtrabackup 8 to mysql8 installation

See merge request artica/pandorafms!5619
 2023-03-29 13:56:22 +00:00
Rafael Ameijeiras 46c13e0315 Merge branch 'ent-10205-falta-parametro-en-ayuda-plugin-bandwidth' into 'develop' 
Ent 10205 falta parametro en ayuda plugin bandwidth

See merge request artica/pandorafms!5635
 2023-03-29 13:50:14 +00:00
Pablo Aragon 168d03eecc New qrcode.js version & vcard 2023-03-29 15:35:18 +02:00
Pablo Aragon 2b121a2fd2 New qrcode.js version & vcard 2023-03-29 15:34:03 +02:00
daniel e7d08fe6d3 fixed styles 2023-03-29 14:48:47 +02:00
Matias Didier 4297481c35 Merge branch 'ent-10819-guardia-15316-alertas-en-vista-de-alertas-tienen-icono-de-politica-sin-estar-en-ellas' into 'develop' 
Ent 10819 guardia 15316 alertas en vista de alertas tienen icono de politica sin estar en ellas

See merge request artica/pandorafms!5633
 2023-03-29 12:32:44 +00:00
daniel e4383a0573 fixed styles 2023-03-29 14:07:56 +02:00
Jonathan a64f9e98b3 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-29 13:44:54 +02:00
Jonathan 49500af75f Visual console duplicate copy items border fix 2023-03-29 13:44:47 +02:00
daniel d2e642ca3e fixed styles 2023-03-29 13:37:13 +02:00
Daniel Maya 3af2637a7c #10819 Fixed img 2023-03-29 13:37:07 +02:00
Jonathan 962562f12f Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-29 13:35:03 +02:00
Jonathan d5ac49e9db Log viewer fix styles 2023-03-29 13:34:54 +02:00
daniel 6c189b8834 fixed styles 2023-03-29 13:31:15 +02:00
daniel 5d952a83fe fixed styles 2023-03-29 12:39:23 +02:00
Pablo Aragon 1a82056039 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-29 12:13:05 +02:00
Pablo Aragon 7ada30c9b1 10718 & 10821 2023-03-29 12:12:56 +02:00
Jonathan b9efc205df Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-29 11:03:06 +02:00
Jonathan 9a0dffbee3 Agents modules view fix filters 2023-03-29 11:02:57 +02:00
Daniel Maya aeb5f111db #10205 Added help -f 2023-03-29 10:35:25 +02:00
daniel 32bc7335ac fixed styles 2023-03-29 09:11:26 +02:00
daniel c610063244 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-29 08:33:02 +02:00
Jonathan a760bbfbc2 MIB Uploader fix delete icon 2023-03-29 08:22:35 +02:00
Jimmy Olano 5044c23ef3 Merge branch 'ent-9529-14208-definir-timezone-por-defecto-para-nuevos-usuarios' into 'develop', JJOS. 
Draft: Ent 9529 14208 definir timezone por defecto para nuevos usuarios

See merge request artica/pandorafms!5492
 2023-03-29 02:28:47 +00:00
artica 5113117a39 Auto-updated build strings. 2023-03-29 01:00:25 +02:00
Diego Muñoz-Reja 35a1c2332d Merge branch 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' into 'develop' 
implemented consoles management

See merge request artica/pandorafms!5558
 2023-03-28 15:33:37 +00:00
daniel 2c0c213a01 Merge branch 'ent-9662-second-round' into 'develop' 
Ent 9662 second round

See merge request artica/pandorafms!5631
 2023-03-28 15:30:54 +00:00
daniel 86e492f275 fixed styles 2023-03-28 17:26:14 +02:00
Daniel Maya eac71560cb #10819 Fixed policy alert img 2023-03-28 17:22:25 +02:00
Pablo Aragon dab2a29b6b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-28 17:07:19 +02:00
Pablo Aragon ce014e4c6b Datatables. Treeview graph meta 2023-03-28 17:07:06 +02:00
Alejandro Campos e909686ddc Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
 2023-03-28 14:09:33 +00:00