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

28335 Commits

Author SHA1 Message Date
artica e7a204d6d8 Auto-updated build strings. 2021-06-13 01:00:16 +02:00
artica 8272eb4f5b Auto-updated build strings. 2021-06-12 01:00:21 +02:00
José González 6db03d943d Merge branch 'develop' into 'ent-7594-custom-profile-acl-enterprise' 
# Conflicts:
#   pandora_console/index.php
 2021-06-11 13:57:10 +00:00
José González b3aa47877d Fixed issue with meta 2021-06-11 15:54:04 +02:00
fbsanchez 86f2beb587 Agent collection synchronization aysnc some improvements 2021-06-11 13:55:18 +02:00
fbsanchez 9c314bcd39 Files reviewed & tested 2021-06-11 13:04:06 +02:00
fbsanchez 085e0ba300 Added Files class to handle zip/unzip/rmrf and more 2021-06-11 10:48:58 +02:00
Daniel Rodriguez 81c2ebc43b Merge branch 'ent-7678-treeview-modules-no-funciona' into 'develop' 
Fix treeview modules sql inner condition

See merge request artica/pandorafms!4195
 2021-06-11 08:44:44 +00:00
Daniel Rodriguez 0adcf5aac2 Merge branch 'ent-7671-cambiar-enlaces-a-documentacion' into 'develop' 
add new link documentation

See merge request artica/pandorafms!4188
 2021-06-11 08:32:06 +00:00
artica 602dc211e8 Merge remote-tracking branch 'origin/develop' 2021-06-11 10:28:41 +02:00
Daniel Rodriguez d0c122c193 Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop' 
Ent 7519 cambio de fuentes en la consola a nivel global

See merge request artica/pandorafms!4194
 2021-06-11 08:24:27 +00:00
alejandro.campos@artica.es 98f0bc9fac fixed xss vulnerability 2021-06-11 08:54:00 +02:00
alejandro.campos@artica.es cb5905b000 fixed xss vulnerability 2021-06-11 08:52:10 +02:00
Daniel Barbero Martin 75b889875e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-11 08:41:23 +02:00
artica 876e776d29 Auto-updated build strings. 2021-06-11 01:00:09 +02:00
fbsanchez ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00
fbsanchez f6f0d35a5f Collections Async synchronization Meta <=> Nodes 2021-06-10 21:36:54 +02:00
Calvo e0b3536d1b Fix treeview modules sql inner condition 2021-06-10 18:00:53 +02:00
marcos 1165ea11b9 cambio de fuentes css 2021-06-10 17:42:39 +02:00
artica a11a948159 Merge remote-tracking branch 'origin/develop' 2021-06-10 17:13:42 +02:00
artica ace916bc8e Updated version and build strings. 2021-06-10 17:12:11 +02:00
Daniel Rodriguez e0464c70a9 Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop' 
Ent 7519 cambio de fuentes en la consola a nivel global

See merge request artica/pandorafms!4192
 2021-06-10 14:48:21 +00:00
marcos 45667da362 cambio de fuentes css 2021-06-10 16:21:06 +02:00
marcos e75abd1d2f cambio de fuentes css 2021-06-10 16:13:45 +02:00
Daniel Barbero Martin b4e1c9d61f Wip command center, api call node 2021-06-10 14:15:36 +02:00
marcos 4502550353 Merge remote-tracking branch 'origin/develop' into ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global 2021-06-10 13:40:37 +02:00
Daniel Rodriguez 168e191734 Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop' 
Ent 7519 cambio de fuentes en la consola a nivel global

See merge request artica/pandorafms!4191
 2021-06-10 08:19:12 +00:00
Marcos Alconada 665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
marcos e0a7a8a8ee cambio de fuentes css 2021-06-10 09:20:26 +02:00
Daniel Barbero Martin 9e27843b19 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 08:51:48 +02:00
Daniel Barbero Martin a9864f7d87 Wip command center, clean functions db 2021-06-10 08:45:50 +02:00
artica 5ad364cc4a Auto-updated build strings. 2021-06-10 01:00:20 +02:00
fbsanchez 5b9098b7b0 Allow API access to nodes registered into the MC 2021-06-09 19:23:17 +02:00
Daniel Rodriguez 2aac302edd Merge branch 'revert-d58e9f63' into 'develop' 
Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'"

See merge request artica/pandorafms!4189
 2021-06-09 16:13:01 +00:00
Daniel Rodriguez 4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'" 
This reverts merge request !4132
 2021-06-09 18:09:43 +02:00
marcos 50282dccf4 add new link documentation 2021-06-09 16:55:25 +02:00
Daniel Rodriguez d58e9f634a Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop' 
Ent 7519 cambio de fuentes en la consola a nivel global

See merge request artica/pandorafms!4132
 2021-06-09 13:59:29 +00:00
Marcos Alconada 2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
Daniel Rodriguez 95832cd071 Merge branch 'ent-7652-iconos-para-black-theme' into 'develop' 
changed icons for black theme

See merge request artica/pandorafms!4186
 2021-06-09 13:12:47 +00:00
Marcos Alconada 8814b1f971 changed icons for black theme 2021-06-09 13:12:47 +00:00
Daniel Rodriguez 73f54c3375 Merge branch 'ent-7661-Error-500-al-editar-las-opciones-avanzadas-de-un-informe' into 'develop' 
fixed bug

See merge request artica/pandorafms!4185
 2021-06-09 12:37:59 +00:00
rafael.ameijeiras 0cf63c3aa0 handeling user with not enougth permissions on the other scripts 2021-06-09 13:23:01 +02:00
rafael.ameijeiras c707a57634 handeling user with not enougth permissions 2021-06-09 13:16:27 +02:00
Daniel Rodriguez 79499204ce Merge branch 'ent-fix-planned-downtime' into 'develop' 
Fixed problems in planned downtime

See merge request artica/pandorafms!4181
 2021-06-09 10:49:48 +00:00
alejandro.campos@artica.es 13850e52d5 fixed bug 2021-06-09 10:41:45 +02:00
Daniel Barbero Martin e54fde338d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-09 08:22:04 +02:00
artica 2953870e4f Auto-updated build strings. 2021-06-09 01:00:20 +02:00
marcos 9023adb98c cambio de fuentes css 2021-06-08 17:53:33 +02:00
marcos 91e0750885 cambio de fuentes css 2021-06-08 17:05:36 +02:00
alejandro.campos@artica.es 240efc4dcf truncate string 2021-06-08 16:48:01 +02:00