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

21373 Commits

Author SHA1 Message Date
fbsanchez 1d403ec2f8 SNMP Browser fix 2019-05-24 13:42:49 +02:00
Daniel Rodriguez d1d9307e85 Merge branch 'ent-4081-Quitar-ayudas-vacias-plantillas-informes' into 'develop' 
Removed empty help icons

See merge request artica/pandorafms!2452
 2019-05-24 12:59:53 +02:00
manuel 0ee2ed6f5e Removed empty help icons in modules 2019-05-24 12:59:25 +02:00
fbsanchez c5bd3204ab Minor style, avoided duplicated iface names with spaces 2019-05-24 11:42:46 +02:00
manuel 0319e4d4e6 Removed empty help icons 2019-05-24 11:11:30 +02:00
marcos.alconada 01d96728c8 changed PK to NULL 2019-05-24 11:03:09 +02:00
Alejandro Fraguas f5586d7b70 Merge branch 'ent-3630-7648-7712-campo-label-no-se-muestra-en-informes-de-graficas' into 'develop' 
fixed label reports and more fixed

See merge request artica/pandorafms!2413
 2019-05-24 10:47:15 +02:00
artica cc09c257bc Auto-updated build strings. 2019-05-24 00:01:06 +02:00
fbsanchez 9d7d58f43e Merge branch 'fix/newsletter_ent' into 'develop' 
Newsletter reminder settings ent

See merge request artica/pandorafms!2449
 2019-05-23 19:25:43 +02:00
fbsanchez 4400d9303f subscription manager udp 2019-05-23 19:22:05 +02:00
fbsanchez 211b05c9d6 minor fix in newsletter logic 2019-05-23 18:59:38 +02:00
fbsanchez 0235b4f396 Merge branch 'fix/uno' into 'develop' 
removed trace from user_edit

See merge request artica/pandorafms!2448
 2019-05-23 18:54:05 +02:00
fbsanchez 058c9d3806 Newsletter reminder settings ent 2019-05-23 18:54:04 +02:00
fbsanchez f46fdea220 Merge remote-tracking branch 'origin/develop' into fix/uno 2019-05-23 18:46:56 +02:00
fbsanchez 8f9c9fd156 removed trace from user_edit 2019-05-23 18:46:43 +02:00
Daniel Barbero Martin 1386a44e07 fixed errors label report 2019-05-23 17:52:28 +02:00
Daniel Rodriguez 51f846af05 Merge branch 'ent-3893-Errata-en-Bulk-operation-de-politicas' into 'develop' 
Fixed visual bug in policies operations actions

See merge request artica/pandorafms!2369
 2019-05-23 17:24:59 +02:00
Daniel Rodriguez 7c236149b0 Merge branch 'ent-3592-Se-eliminan-items-de-informes-aunque-se-cancele' into 'develop' 
Fixed bug in items reports deleted

See merge request artica/pandorafms!2208
 2019-05-23 17:18:00 +02:00
Alejandro Fraguas 7097481cca Merge branch 'ent-3974-Los-campos-de-module-plugin-no-se-guardan' into 'develop' 
fixed bug in macros of plugin modules

See merge request artica/pandorafms!2442
 2019-05-23 17:08:34 +02:00
fbsanchez 9e1de4cbb3 Merge branch 'ent-1668-update-manager' into 'develop' 
rb UM GCv

See merge request artica/pandorafms!2447
 2019-05-23 16:16:26 +02:00
fbsanchez 4ec6aadf7d rb UM GCv 2019-05-23 16:12:40 +02:00
fbsanchez f1c077b753 Merge branch 'ent-1668-update-manager' into 'develop' 
UM GCv

See merge request artica/pandorafms!2446
 2019-05-23 16:09:16 +02:00
fbsanchez 4abbbf6680 UM GCv 2019-05-23 15:55:07 +02:00
fbsanchez 5d4ba6cb01 Merge branch 'ent-1668-update-manager' into 'develop' 
summarized counts

See merge request artica/pandorafms!2445
 2019-05-23 15:47:25 +02:00
fbsanchez 08aa824f97 summarized counts 2019-05-23 15:38:45 +02:00
Alejandro Fraguas 09020c3b9c Merge branch 'fix/pandora_ha_paths' into 'develop' 
including several extra tokens in config

See merge request artica/pandorafms!2368
 2019-05-23 11:58:15 +02:00
fbsanchez 1529a04507 Merge branch 'ent-1668-update-manager' into 'develop' 
fixed: um url relative

See merge request artica/pandorafms!2444
 2019-05-23 11:33:46 +02:00
fbsanchez 0ee42fbafe fixed: um url relative 2019-05-23 11:23:42 +02:00
Daniel Maya 4c874e152c Merge 2019-05-23 10:43:32 +02:00
fbsanchez dd8af874fa Merge branch 'ent-1668-update-manager' into 'develop' 
license forms sync MC-N

See merge request artica/pandorafms!2441
 2019-05-23 10:36:43 +02:00
Daniel Maya 2de2d1f482 Added expiration and deleted old cache data in pandora_db 2019-05-23 10:35:03 +02:00
fbsanchez 7b5ae40868 multiple fixes 2019-05-23 10:27:50 +02:00
artica 4c3dea3ba4 Auto-updated build strings. 2019-05-23 00:01:07 +02:00
alejandro-campos 0728c73844 fixed bug in macros of plugin modules 2019-05-22 19:14:01 +02:00
fbsanchez 2cfe4378c2 license forms sync MC-N 2019-05-22 18:50:51 +02:00
Daniel Rodriguez dfb7067db2 Merge branch 'ent-1668-update-manager' into 'develop' 
minor fix MC environments

See merge request artica/pandorafms!2439
 2019-05-22 16:54:33 +02:00
Daniel Rodriguez 8b511c2ca3 Merge branch 'ent-3984-7962-ldap-bug-en-token-force-automatically-create-profile-user' into 'develop' 
Changed condition for ldap Force automatically create profile user

See merge request artica/pandorafms!2422
 2019-05-22 16:15:06 +02:00
fbsanchez 86cb526893 minor fix MC environments 2019-05-22 15:40:17 +02:00
artica 892dcc750f Updated version and build strings. 2019-05-22 15:29:49 +02:00
Daniel Rodriguez 979f11ca8f Merge branch 'ent-1668-update-manager' into 'develop' 
Ent 1668 update manager

See merge request artica/pandorafms!2420
 2019-05-22 15:25:49 +02:00
Alejandro Fraguas 88234503c0 Merge branch 'ent-4078-7999-Error-al-actualizar-los-cambios-en-la-vista-de-usuario' into 'develop' 
Fixed url in user_edit

See merge request artica/pandorafms!2436
 2019-05-22 14:14:15 +02:00
marcos.alconada 07b42f7241 Changed for metaconsole 2019-05-22 13:57:31 +02:00
Alejandro Fraguas 5b286b4f67 Merge branch 'ent-3975-mejorar-la-actualizacion-de-los-datos-y-elementos-de-la-consola-visual' into 'develop' 
Mejorar la actualizacion de los datos y elementos de la consola visual

See merge request artica/pandorafms!2429
 2019-05-22 13:06:18 +02:00
Daniel Rodriguez c50eb57499 Merge branch 'ent-4016-error-en-valor-de-diagnostic-info' into 'develop' 
Added new min value for InnoDB file per table( 0 to 1)

See merge request artica/pandorafms!2416
 2019-05-22 12:05:29 +02:00
alejandro-campos e82916001b allow fetching of event id in metaconsole event table when getting target of an event response in metaconsole having server_id=0 2019-05-22 10:18:44 +02:00
artica ba9edc0378 Auto-updated build strings. 2019-05-22 00:01:07 +02:00
Daniel Rodriguez 85a3437124 Merge branch 'ent-3964-autorefresco-no-funciona-733-734-v2' into 'develop' 
Ent Autorefresco no funciona en la version 733, 734 (v2)

See merge request artica/pandorafms!2435
 2019-05-21 17:41:10 +02:00
Daniel Rodriguez f6171de522 Merge branch 'ent-3468-Ayudas_online' into 'develop' 
helpers

See merge request artica/pandorafms!2381
 2019-05-21 17:28:27 +02:00
Daniel Maya edbde3fecb Fixed url in user_edit 2019-05-21 17:14:29 +02:00
Luis Calvo e361c4243a Autorefresh bug fix 2019-05-21 12:16:06 +02:00