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

22358 Commits

Author SHA1 Message Date
manuel 324690ddad Fixed pagination bug 2019-08-06 14:52:43 +02:00
Luis Calvo 47e8a618c2 Fixed alert actions bug 2019-08-06 14:41:54 +02:00
marcos.alconada 9cfa8be1e9 font size for jap and chinese adjusted agents 2019-08-06 14:35:15 +02:00
Jose Gonzalez 6ca2caa511 Added hint and solved other issues when events has a lot of characters 2019-08-06 11:06:11 +02:00
artica 5aa9320ae3 Auto-updated build strings. 2019-08-06 00:01:22 +02:00
alejandro-campos b43c489b1a Merge branch 'ent-4388-Nuevos-eventos' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4388-Nuevos-eventos 2019-08-05 16:24:00 +02:00
alejandro-campos 225491feb1 fix minor visual bug in event list 2019-08-05 16:23:37 +02:00
alejandro-campos 28cf43498e lint change 2019-08-05 14:18:23 +02:00
alejandro-campos 9b8e3c540c created integria integration setup 2019-08-05 13:42:01 +02:00
Kike 889ddef9f6 Set execution permissions for installer 2019-08-05 13:09:27 +02:00
Kike d1613a47e0 Changed Dockerfile 2019-08-05 12:33:02 +02:00
Alejandro Campos 12eacc1933 Merge branch 'develop' into 'ent-4388-Nuevos-eventos' 
# Conflicts:
#   pandora_console/extras/mr/31.sql
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2019-08-05 09:26:18 +02:00
artica 2133551889 Auto-updated build strings. 2019-08-05 00:01:08 +02:00
artica 914a41ab8d Auto-updated build strings. 2019-08-04 00:01:08 +02:00
artica e417b775c7 Auto-updated build strings. 2019-08-03 00:01:10 +02:00
fbsanchez 2c6c8afe2d Merge branch 'fix/Core-fix-server-parser-failed' into 'develop' 
Fallback to Perl parser if ExpatXS is not installed

See merge request artica/pandorafms!2631
 2019-08-02 14:15:45 +02:00
Daniel Rodriguez 06591680de Merge branch 'ent-4408-csv-meta-custom-field-views' into 'develop' 
Added title in custom field

See merge request artica/pandorafms!2613
 2019-08-02 14:12:21 +02:00
fbsanchez 45f7c89b5e Fallback to Perl parser if ExpatXS is not installed 2019-08-02 14:11:28 +02:00
fbsanchez f38962de8d Merge branch '4319-parser-xml' into 'develop' 
Changed from XML::Parser to XML::SAX::ExpatXS

See merge request artica/pandorafms!2576
 2019-08-02 13:55:05 +02:00
Daniel Rodriguez 7ff5e23792 Merge branch 'ent-4460-Eliminar-antigua-integracion-con-integria' into 'develop' 
removed all deprecated references to integria from code and db data

See merge request artica/pandorafms!2626
 2019-08-02 12:28:03 +02:00
Alejandro Fraguas f5349e7723 Merge branch 'ent-4424-error-acceso-con-sin-acl-enterprise' into 'develop' 
Fixed agent detail events permission

See merge request artica/pandorafms!2620
 2019-08-02 11:06:42 +02:00
alejandro-campos 41029196d8 fix minor visual bug in events table 2019-08-02 10:04:10 +02:00
artica 3a654c7f79 Auto-updated build strings. 2019-08-02 00:01:11 +02:00
Tatiana Llorente c591dd4260 Show html tags in instructions - #4352 2019-08-01 13:11:50 +02:00
artica 28e562a2f7 Auto-updated build strings. 2019-08-01 00:01:09 +02:00
alejandro-campos a36a293f19 added changes to pandora migrate and MR 2019-07-31 17:18:52 +02:00
alejandro-campos 927b1fa37f removed all deprecated references to integria from code and db data 2019-07-31 16:46:26 +02:00
Alejandro Fraguas b47e66d35b Merge branch 'ent-3747-deshabilitar-alertas-con-eventos-en-proceso' into 'develop' 
'in-process' events can now inhibit alerts.

See merge request artica/pandorafms!2624
 2019-07-31 11:58:48 +02:00
fbsanchez 75a9306312 Merge branch 'fix/ui_get_full_url' into 'develop' 
minor fix adding slash if not found

See merge request artica/pandorafms!2623
 2019-07-31 11:05:29 +02:00
fbsanchez 1e73105fc9 minor fix adding slash if not found 2019-07-31 10:59:51 +02:00
artica 6713f51414 Updated version and build strings. 2019-07-31 09:25:59 +02:00
Ramon Novoa eaa7edd89f 'in-process' events can now inhibit alerts. 
Ref pandora_enterprise#3747
 2019-07-31 09:07:47 +02:00
artica 9995d8b654 Auto-updated build strings. 2019-07-31 00:01:13 +02:00
fbsanchez 380574b863 Ondemand based on environment XML parser 2019-07-30 19:46:16 +02:00
fbsanchez f97429fb46 Merge remote-tracking branch 'origin/develop' into 4319-parser-xml 2019-07-30 19:34:46 +02:00
Alejandro Fraguas 68c45a9f4f Merge branch 'ent-2441-despliegue-de-agentes-desde-pandora' into 'develop' 
Ent 2441 despliegue de agentes desde pandora

See merge request artica/pandorafms!2596
 2019-07-30 18:52:47 +02:00
alejandro-campos b4bd7f0f63 fixed problems in event view and event view custom fields 2019-07-30 16:10:34 +02:00
fbsanchez 755b0bbf7d Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-30 12:53:23 +02:00
alejandro-campos f5f2f8be18 updated chrome events extension 2019-07-30 11:46:54 +02:00
artica 8734697169 Auto-updated build strings. 2019-07-30 00:01:11 +02:00
fbsanchez d85b0141e4 minor warning based on different configurations 2019-07-29 19:09:13 +02:00
Jose Gonzalez dd77429aea Solved issue with status names 2019-07-29 17:22:16 +02:00
Luis Calvo f6f96523a0 Added html enconde 2019-07-29 16:57:39 +02:00
Jose Gonzalez 719f56efec Modified SQL queries for avoidance of case sensitive 2019-07-29 16:32:50 +02:00
Luis Calvo 00662058f3 Fixed agent detail events permission 2019-07-29 15:16:24 +02:00
Alejandro Fraguas f0c83c0daf Merge branch 'ent-4089-contenedor-docker-con-agente-software-de-pandora' into 'develop' 
Script to build agent docker

See merge request artica/pandorafms!2618
 2019-07-29 13:17:49 +02:00
Kike ec46e5a548 Changed variables names 2019-07-29 10:42:49 +02:00
Kike 525d328b67 Included agent_name as agent_alias in Dockerfile 2019-07-29 10:04:10 +02:00
Jose Gonzalez 243c298ff8 Added text control to avoid show more of 255 chars in his field 2019-07-29 08:59:56 +02:00
artica 4d9d0deab7 Auto-updated build strings. 2019-07-29 00:01:08 +02:00