artica
|
1134c041f2
|
Auto-updated build strings.
|
2020-01-30 00:01:08 +01:00 |
Jose Gonzalez
|
3c5554b985
|
Deleted stderr for curl testing
|
2020-01-29 17:32:04 +01:00 |
fbsanchez
|
668027e794
|
Merge remote-tracking branch 'origin/develop' into ent-5333-7076-encoding-iso-8859-15-enc-genera-badxml
|
2020-01-29 16:31:14 +01:00 |
|
fbsanchez
|
c8c2141f83
|
Added enc_dir to Encoding_Path (ExpatXS)
|
2020-01-29 16:31:08 +01:00 |
vgilc
|
f8b12d2fdb
|
Merge branch 'subida-mr-35' into 'develop'
Next mr
See merge request artica/pandorafms!3036
|
2020-01-29 15:55:09 +01:00 |
Daniel Maya
|
baecac1efb
|
Next mr
|
2020-01-29 15:51:39 +01:00 |
Daniel Rodriguez
|
1d57bb74fd
|
Merge branch 'ent-3843-mala-traduccion-en-ingles-y-castellano-en-configuracion-visual' into 'develop'
Ent 3843 mala traduccion en ingles y castellano en configuracion visual
See merge request artica/pandorafms!3035
|
2020-01-29 14:22:06 +01:00 |
marcos
|
0ed4937368
|
add traductions
|
2020-01-29 13:48:48 +01:00 |
|
Daniel Rodriguez
|
783331d18b
|
Merge branch 'ent-5381-9482-problemas-windows-server-con-742fix' into 'develop'
Fix Windows strftime reference
See merge request artica/pandorafms!3032
|
2020-01-29 13:20:51 +01:00 |
Ramon Novoa
|
dac5b6b6b3
|
Unify file transfer, secondary mode and XML buffer criteria.
Ref pandora_enterprise#5360
|
2020-01-29 13:08:00 +01:00 |
|
Daniel Rodriguez
|
747b482864
|
Merge branch '5055-API-Nuevo-automatismo-para-generacion-graficas' into 'develop'
Solved issue with logger message when default path was assumed
See merge request artica/pandorafms!3033
|
2020-01-29 13:04:01 +01:00 |
|
Jose Gonzalez
|
d1e545da24
|
Solved issue with logger message when default path was assumed
|
2020-01-29 11:46:31 +01:00 |
Alejandro Fraguas
|
0cf42f2d74
|
Merge branch 'new-vc-line-element' into 'develop'
New vc line element
See merge request artica/pandorafms!2795
|
2020-01-29 11:04:23 +01:00 |
Daniel Barbero Martin
|
dc6f1e3049
|
fixed errors VC
|
2020-01-29 10:56:29 +01:00 |
|
Daniel Barbero Martin
|
2bbc5d18b5
|
fixed errors VC
|
2020-01-29 10:15:31 +01:00 |
artica
|
2f6fed368d
|
Updated version and build strings.
|
2020-01-29 10:13:37 +01:00 |
|
Daniel Barbero Martin
|
3bd3ca00bf
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-29 08:20:11 +01:00 |
|
artica
|
395920f8eb
|
Auto-updated build strings.
|
2020-01-29 00:01:09 +01:00 |
|
fbsanchez
|
77863ae150
|
Fix Windows strftime reference
|
2020-01-28 20:15:53 +01:00 |
|
Daniel Barbero Martin
|
e49ed85d03
|
fixed errors VC
|
2020-01-28 18:29:32 +01:00 |
|
Daniel Barbero Martin
|
5906273271
|
fixed errors VC
|
2020-01-28 17:52:40 +01:00 |
|
Daniel Barbero Martin
|
3f5e418d98
|
fixed errors VC
|
2020-01-28 16:42:51 +01:00 |
|
Daniel Rodriguez
|
914a796ce1
|
Merge branch '5055-API-Nuevo-automatismo-para-generacion-graficas' into 'develop'
Changed pandora server start for control if is needed add parameters.
See merge request artica/pandorafms!3017
|
2020-01-28 13:41:42 +01:00 |
|
Daniel Barbero Martin
|
73dcabc48d
|
fixed errors VC
|
2020-01-28 12:44:37 +01:00 |
|
Daniel Barbero Martin
|
0ad6e7842f
|
fixed errors VC
|
2020-01-28 12:12:07 +01:00 |
|
Daniel Barbero Martin
|
f459c6fb79
|
fixed errors VC
|
2020-01-28 11:05:15 +01:00 |
|
marcos
|
d5016d4943
|
Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens
|
2020-01-28 10:08:01 +01:00 |
alejandro-campos
|
d79137148c
|
fix bug in group alert report data visualization
|
2020-01-28 10:06:46 +01:00 |
|
Daniel Barbero Martin
|
e2d610f22c
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-28 09:13:29 +01:00 |
|
artica
|
71cc1f4951
|
Auto-updated build strings.
|
2020-01-28 00:01:07 +01:00 |
|
Daniel Barbero Martin
|
0dabab11cf
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
Conflicts:
pandora_console/install.php
|
2020-01-27 16:19:32 +01:00 |
|
Jose Gonzalez
|
c8194166ef
|
Added console_api_pass write for pandora_server.conf
|
2020-01-27 16:19:27 +01:00 |
|
Daniel Barbero Martin
|
6ddb501b08
|
fixed errors VC
|
2020-01-27 16:15:54 +01:00 |
|
alejandro-campos
|
5913f815d1
|
Added possibility to display comments with line breaks in event detail
|
2020-01-27 13:37:34 +01:00 |
|
Daniel Barbero Martin
|
570ebd9a0a
|
fixed errors VC
|
2020-01-27 13:16:01 +01:00 |
|
Daniel Rodriguez
|
ba7936f084
|
Merge branch 'ent-4697-cicd-pandorafms' into 'develop'
Resolved deprecated options rpm spec
See merge request artica/pandorafms!2989
|
2020-01-27 12:55:12 +01:00 |
|
fbsanchez
|
50a2d74adb
|
Merge remote-tracking branch 'origin/develop' into ent-4697-cicd-pandorafms
Conflicts:
pandora_server/pandora_server.spec
|
2020-01-27 12:38:19 +01:00 |
ismael.moreno
|
5017c56454
|
Fixed multifile search
|
2020-01-27 12:01:52 +01:00 |
|
Daniel Maya
|
1998db3317
|
Fixed date in availability graph
|
2020-01-27 11:52:13 +01:00 |
rafael
|
e2bd041ba2
|
adding .htaccess files
|
2020-01-27 11:03:42 +01:00 |
|
Daniel Rodriguez
|
28392b71ef
|
Merge branch 'ent-5066-9061-Crear-Failover-en-Informe-de-disponibilidad' into 'develop'
availability failover
See merge request artica/pandorafms!3015
|
2020-01-27 10:48:50 +01:00 |
|
Daniel Maya
|
c0d6ae1496
|
Fixed label Failover
|
2020-01-27 09:32:22 +01:00 |
|
Daniel Barbero Martin
|
8ee038667c
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-27 08:22:36 +01:00 |
|
artica
|
e35edd92b3
|
Auto-updated build strings.
|
2020-01-27 00:01:09 +01:00 |
|
artica
|
5dbb80287e
|
Auto-updated build strings.
|
2020-01-26 00:01:10 +01:00 |
|
Daniel Barbero Martin
|
19964c8463
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-25 11:57:19 +01:00 |
|
Daniel Barbero Martin
|
5ff10ac514
|
fixed errors VC
|
2020-01-25 11:57:04 +01:00 |
|
artica
|
b4b1fbb3c1
|
Auto-updated build strings.
|
2020-01-25 00:01:10 +01:00 |
|
Daniel Barbero Martin
|
06a3318fb6
|
fixed errors VC
|
2020-01-24 15:14:07 +01:00 |
|
Daniel Barbero Martin
|
5ec8c68aed
|
fixed errors VC
|
2020-01-24 15:13:42 +01:00 |