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

29002 Commits

Author SHA1 Message Date
Daniel Rodriguez 0a93d93701 Merge branch 'ent-8111-12549-R-WORKS-X-Frame-Options-Header-en-php' into 'develop' 
Ent 8111 12549 r works x frame options header en php

See merge request artica/pandorafms!4479
 2021-11-15 10:05:30 +00:00
Daniel Rodriguez 6b68203811 Merge branch 'ent-4711-Posibilidad-de-ordenar-tickets-en-integracion-con-Integria' into 'develop' 
add sorting capability to integriaims ticket list

See merge request artica/pandorafms!4474
 2021-11-15 10:04:01 +00:00
artica 203aa3ef8a Auto-updated build strings. 2021-11-15 01:00:15 +01:00
artica bb771ec140 Auto-updated build strings. 2021-11-14 01:00:16 +01:00
artica 94fadddc80 Auto-updated build strings. 2021-11-13 01:00:19 +01:00
alejandro.campos@artica.es 406a8b702b visual fixes 2021-11-12 13:30:33 +01:00
Daniel Barbero Martin 0caeee185e WIP new report alert fired actions 2021-11-12 13:21:05 +01:00
Daniel Barbero Martin e70ecd461e WIP new report alert fired actions 2021-11-12 13:11:49 +01:00
alejandro.campos@artica.es e3ba62b6b6 remove quotes from strings 2021-11-12 10:16:18 +01:00
artica bfa8dc4473 Auto-updated build strings. 2021-11-12 01:00:07 +01:00
Calvo 5a341c1067 Remove sections from ACL enterprise setup 2021-11-11 17:29:16 +01:00
alejandro.campos@artica.es 293cb43544 fixed missing name and current value in snmp interface wizard when using satellite 2021-11-11 15:32:48 +01:00
alejandro.campos@artica.es 49d9271b4e fixed missing name and current value in snmp interface wizard when using satellite 2021-11-11 15:25:44 +01:00
alejandro.campos@artica.es 6b724b7747 fixed missing name and current value in snmp interface wizard when using satellite 2021-11-11 15:20:21 +01:00
alejandro.campos@artica.es 1fe0523a6a fixed propagation in agents count 2021-11-11 11:07:24 +01:00
artica b5cc63c159 Auto-updated build strings. 2021-11-11 01:00:19 +01:00
artica 3069c89e6e Auto-updated build strings. 2021-11-10 01:00:15 +01:00
artica 707bee66c1 Auto-updated build strings. 2021-11-09 01:01:01 +01:00
alejandro.campos@artica.es e83485ce8c fixed several counts 2021-11-08 18:01:09 +01:00
Calvo 94d1964166 Fix server name item on reporting buider 2021-11-08 13:27:32 +01:00
Daniel Barbero Martin 2d4c949113 add metaconsole calendars special days alerts 2021-11-08 13:07:31 +01:00
Daniel Barbero Martin 900a37ad5d Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-08 08:54:41 +01:00
Junichi Satoh 9c2aae2a44 Fixed special multibyte characters treatment. 
They were not converted to html entities when storing to DB.
 2021-11-08 10:00:43 +09:00
artica df48e7f73d Auto-updated build strings. 2021-11-08 01:00:17 +01:00
artica b2db6064bf Auto-updated build strings. 2021-11-07 01:00:17 +01:00
artica 3e9bc55e68 Auto-updated build strings. 2021-11-06 01:00:21 +01:00
Calvo 61bdc1f4e0 Fix ACL grous AW creation 2021-11-05 15:21:04 +01:00
vgilc 6081384ef9 Merge branch 'ent-7582-anadir-selector-horas-eventos-2' into 'develop' 
Fix mr pandoradb migrate

See merge request artica/pandorafms!4522
 2021-11-05 11:33:00 +00:00
Daniel Barbero Martin ea747f25f3 Fix mr pandoradb migrate 2021-11-05 12:29:34 +01:00
Daniel Barbero Martin 72f2caacd9 title en ticks bullet charts 2021-11-05 11:22:25 +01:00
Daniel Barbero Martin c3e2b4361f Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-05 10:00:15 +01:00
artica 9c290d917e Auto-updated build strings. 2021-11-05 01:00:12 +01:00
alejandro.campos@artica.es 546fcaa28f fixed general search 2021-11-04 18:07:39 +01:00
José González 97da9cfc49 Merge branch 'revert-9a0ea482' into 'develop' 
Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"

See merge request artica/pandorafms!4519
 2021-11-04 15:43:28 +00:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
José González 9a0ea482eb Merge branch 'ent-7662-rebranding-meta' into 'develop' 
Added rebranding features

Closes pandora_enterprise#7662

See merge request artica/pandorafms!4302
 2021-11-04 15:27:57 +00:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Jose Gonzalez 932d42e8da Fixed colours 2021-11-04 15:44:40 +01:00
Daniel Barbero Martin cd163a96ef wip special days alerts 2021-11-04 13:07:17 +01:00
Daniel Barbero Martin c3f4addb0e wip special days alerts 2021-11-04 12:33:40 +01:00
Daniel Barbero Martin 93aad130cb wip special days alerts 2021-11-04 10:20:03 +01:00
Daniel Barbero Martin f521dec4e2 wip special days alerts 2021-11-04 10:10:11 +01:00
Daniel Barbero Martin bd75912a0d wip special days alerts 2021-11-04 09:55:37 +01:00
Daniel Barbero Martin e8c6342af4 Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-04 08:15:01 +01:00
artica 4ebb817d90 Auto-updated build strings. 2021-11-04 01:00:54 +01:00
Daniel Barbero Martin fdca5e4a78 wip special days alerts 2021-11-03 17:30:54 +01:00
vgilc 89e1f4ed92 Merge branch 'ent-8218-Actualizar-cadenas-español' into 'develop' 
Ent 8218 actualizar cadenas español

See merge request artica/pandorafms!4518
 2021-11-03 13:04:12 +00:00
Daniel Maya 7b2cd564c4 #8218 Added mo and po fr 2021-11-03 13:33:29 +01:00
Daniel Barbero Martin 53361484fd Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-03 11:16:46 +01:00
vgilc b18c9dceac Merge branch 'ent-8223-Subir-version-y-mr' into 'develop' 
updated mr and version

See merge request artica/pandorafms!4517
 2021-11-03 10:10:09 +00:00