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

22053 Commits

Author SHA1 Message Date
artica ac85884e46 Auto-updated build strings. 2019-08-16 00:01:08 +02:00
artica 4e544e8433 Auto-updated build strings. 2019-08-15 00:01:16 +02:00
artica 7b78b5820e Auto-updated build strings. 2019-08-14 00:01:10 +02:00
artica c0588d95ca Updated version and build strings. 2019-08-13 12:27:44 +02:00
artica f1291bee4c Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2019-08-13 12:27:39 +02:00
Daniel Rodriguez d561f7862a Merge branch 'ent-4489-revision-comportamiento-pandora_server-e7' into 'develop' 
Ent 4489 revision comportamiento pandora server e7

See merge request artica/pandorafms!2644
 2019-08-13 12:24:02 +02:00
artica 411bb093b2 Merge remote-tracking branch 'remotes/origin/ent-4489-revision-comportamiento-pandora_server-e7' into develop 2019-08-13 10:53:45 +02:00
artica a8915e13ad Auto-updated build strings. 2019-08-13 00:01:08 +02:00
artica 5cecf1f899 Auto-updated build strings. 2019-08-12 00:01:07 +02:00
artica 390acf0459 Auto-updated build strings. 2019-08-11 00:01:09 +02:00
artica 4f25e42be1 Auto-updated build strings. 2019-08-10 00:01:17 +02:00
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
artica 21c81f6dfe Auto-updated build strings. 2019-08-08 00:01:08 +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
fbsanchez b07be3885d XML::SAX::ExpatXS thread protection 2019-08-07 12:41:15 +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
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 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
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