Commit Graph

21527 Commits

Author SHA1 Message Date
Daniel Rodriguez d0e99e1018 Merge branch 'ent-3576-ldap-advanced-remote-user-unchecked' into 'develop'
Fixed ldap adv. perms continues apliying when autocreate remote is unselected

See merge request artica/pandorafms!2221
2019-06-03 15:09:15 +02:00
Daniel Rodriguez 909fa354b4 Merge branch '4091-bug-en-permisos-al-crear-usuario-con-ldap-advanced' into 'develop'
Changed for create new user with advanced config enabled and forced automaticly disabled

See merge request artica/pandorafms!2459
2019-06-03 14:51:06 +02:00
fbsanchez 31257c02a4 style review 2019-06-03 14:50:22 +02:00
fbsanchez 7a09a80ace style review 2019-06-03 14:30:23 +02:00
fbsanchez 551a21ed86 Next contact fixes 2019-06-03 13:11:00 +02:00
fbsanchez 13086b596c Next contact 2019-06-03 13:04:49 +02:00
Alejandro Fraguas 45c58a7c72 Merge branch 'ent-4041-7980-bug-parametro-event_storm_protection' into 'develop'
Variability event_storm_protection check is added with empty data

See merge request artica/pandorafms!2428
2019-06-03 11:58:52 +02:00
fbsanchez b4dcf4a6f1 style review 2019-06-03 11:55:56 +02:00
fbsanchez ddf3b7a258 Review 1 2019-06-03 11:21:44 +02:00
fbsanchez 9de5dadbf2 style review 2019-06-03 11:16:51 +02:00
marcos.alconada 9b1e5a64b8 changes of core.pm reverted 2019-06-03 10:57:24 +02:00
marcos.alconada 2c0e8273a2 changes of core.pm reverted 2019-06-03 10:56:58 +02:00
marcos.alconada 87a9ce2d46 changes of core.pm reverted 2019-06-03 10:56:16 +02:00
Daniel Maya 419b3f4fb1 Fixed module_manager with Agent limit surpassed or license expired 2019-06-03 10:47:54 +02:00
fbsanchez 88b0802472 style review 2019-06-03 10:46:52 +02:00
fbsanchez eb5ee75d33 Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor 2019-06-03 09:18:49 +02:00
artica a11b674467 Auto-updated build strings. 2019-06-03 00:01:06 +02:00
artica cfc8d7d177 Auto-updated build strings. 2019-06-02 00:01:05 +02:00
artica f06d160141 Auto-updated build strings. 2019-06-01 00:01:06 +02:00
Ramon Novoa 841d176aa0 Fix the regexp for IPv4 addresses. 2019-05-31 15:39:22 +02:00
ismael.moreno 1aa6d8c298 Change module type ifOperStatus on Interface Wizard 2019-05-31 10:39:48 +02:00
Alejandro Fraguas 4c85066ecd Merge branch 'ent-3670-0-rebelde-en-autoconfigurador-de-agentes' into 'develop'
Resolved

See merge request artica/pandorafms!2245
2019-05-31 10:08:02 +02:00
fbsanchez 69054571ab Style review 2019-05-31 09:50:59 +02:00
artica 2f734f2454 Auto-updated build strings. 2019-05-31 00:01:07 +02:00
fbsanchez 40cca5e1e3 BIG style change, erased all important flags 2019-05-30 18:21:13 +02:00
Luis Calvo cdbd5b3487 Fixed bug in meta user_edir form url 2019-05-30 17:23:32 +02:00
Ramon Novoa e72a55b4f3 Unified SNMP version 3 code. 2019-05-30 16:58:36 +02:00
Daniel Rodriguez 2c36631130 Merge branch 'ent-3518-password-recovery-email-bad-message' into 'develop'
Fixed the error message of the password recovery

See merge request artica/pandorafms!2172
2019-05-30 15:35:18 +02:00
Daniel Rodriguez 16d34bf584 Merge branch 'ent-3643-mensaje-duplicado-con-info-de-la-db_history-en-performance' into 'develop'
ticket resolved, duplicated sentece

See merge request artica/pandorafms!2239
2019-05-30 15:33:27 +02:00
Daniel Rodriguez 6b4f1466f7 Merge branch 'ent-3825-local-components-salen-con-intervalos-inversos' into 'develop'
Changed check value on JS

See merge request artica/pandorafms!2340
2019-05-30 15:32:16 +02:00
fbsanchez e37d120115 Review 1 2019-05-30 13:58:57 +02:00
fbsanchez 76bb85b914 Merge branch 'fix/styles-help-icons' into 'develop'
Fixed login button style and removed help icons from agent_management

See merge request artica/pandorafms!2469
2019-05-30 11:35:10 +02:00
fbsanchez 94153b823f Help links 2019-05-30 11:25:09 +02:00
fbsanchez 30320b7897 Fixed login button style and removed help icons from agent_management 2019-05-30 11:12:37 +02:00
Tatiana Llorente 44803b6403 Merge remote-tracking branch 'origin/develop' into ent-3614-Vista-de-Servicios
Conflicts:
	pandora_console/include/styles/pandora.css
2019-05-30 11:09:15 +02:00
Tatiana Llorente 445cc8aab0 New styles for Services table view - #3614 2019-05-30 10:58:59 +02:00
artica bfef8e61ea Auto-updated build strings. 2019-05-30 00:01:06 +02:00
Alejandro Fraguas bc279e99b0 Merge branch 'fix/styles' into 'develop'
Fix/styles

See merge request artica/pandorafms!2461
2019-05-29 18:31:43 +02:00
fbsanchez 48094ffb2e greater icons 2019-05-29 18:24:45 +02:00
fbsanchez c2346842c9 ui_toggle revierw 2019-05-29 18:13:21 +02:00
fbsanchez f16f35ad10 Changes styles 2019-05-29 17:49:09 +02:00
fbsanchez 121ae89b1d dyn style ui_print_help_tip 2019-05-29 17:34:11 +02:00
Daniel Rodriguez 5872a3ed56 Merge branch 'ent-fixed-mr' into 'develop'
fixed mr 28

See merge request artica/pandorafms!2467
2019-05-29 17:12:06 +02:00
fbsanchez 3c730fbedf BC updated 2019-05-29 17:10:21 +02:00
Daniel Maya 30b8872ab3 fixed mr 28 2019-05-29 17:06:25 +02:00
fbsanchez 47c9220cbb clippy positions and control overflow 2019-05-29 17:02:01 +02:00
fbsanchez 8c0bfd72a8 avoid icon overlap report view lsit 2019-05-29 16:52:38 +02:00
fbsanchez 53f6649a57 tip img sty 2019-05-29 16:49:51 +02:00
fbsanchez e9198af17c multiple changes 2019-05-29 16:45:53 +02:00
Alejandro Fraguas 2e3338b595 Merge branch 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual' into 'develop'
Ent 3961 añadir caché para los elementos de la consola visual

See merge request artica/pandorafms!2443
2019-05-29 15:48:45 +02:00