22577 Commits

Author SHA1 Message Date
Daniel Rodriguez
57fcfee36c Merge branch '4003-Arreglos-en-servicios' into 'develop'
4003 arreglos en servicios

See merge request artica/pandorafms!2621
2019-08-09 09:04:17 +02:00
Daniel Rodriguez
a1bac9d851 Merge branch '4439-bugs-vista-eventos' into 'develop'
Added text control to avoid show more of 255 chars in his field

See merge request artica/pandorafms!2619
2019-08-09 09:01:18 +02:00
Daniel Rodriguez
ff3134c55a Merge branch 'ent-4388-Nuevos-eventos' into 'develop'
Ent 4388 nuevos eventos

See merge request artica/pandorafms!2628
2019-08-09 09:00:57 +02:00
artica
992958f4b4 Auto-updated build strings. 2019-08-09 00:01:09 +02:00
alejandro-campos
0461cb04f7 fix graphs not showing in metaconsole monitors view 2019-08-08 15:18:15 +02:00
alejandro-campos
97353bbfed backup changes 2019-08-08 13:36:12 +02:00
Tatiana Llorente
77f57ae87f Don't allow access to update manager offline in community edition - #4484 2019-08-08 09:23:23 +02:00
artica
21c81f6dfe Auto-updated build strings. 2019-08-08 00:01:08 +02:00
Tatiana Llorente
7826ba79e6 Remove disabled modules to create service element - #4458 2019-08-07 14:23:10 +02:00
Jose Gonzalez
191db192c9 Solved issue with metaconsole 2019-08-07 14:14:14 +02:00
fbsanchez
32ad249024 XML::SAX::ExpatXS thread protection 2019-08-07 13:45:57 +02:00
fbsanchez
4e42db2981 XML::SAX::ExpatXS thread protection 2019-08-07 13:43:13 +02:00
fbsanchez
d902afc7db XML::SAX::ExpatXS thread protection 2019-08-07 13:18:44 +02:00
manuel
6c90a4dd53 Fixed bug in alerts details view 2019-08-07 13:04:37 +02:00
fbsanchez
b07be3885d XML::SAX::ExpatXS thread protection 2019-08-07 12:41:15 +02:00
Tatiana Llorente
c32c15ed94 Fixed bug create snmp filter - #4446 2019-08-07 09:35:08 +02:00
artica
871e0568d7 Auto-updated build strings. 2019-08-07 00:01:32 +02:00
Jose Gonzalez
3d03faed9a Solved some issues 2019-08-06 14:56:57 +02:00
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
Tatiana Llorente
4e927e1ee5 Fixed bad image for warning status - #4454 2019-08-01 10:36:15 +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