Commit Graph

3496 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar 0c21a2956c Bugfix 2019-06-04 17:34:40 +02:00
Alejandro Gallardo Escobar 795542b311 Added a mode to enable the edit mode of the visual console client items 2019-06-04 17:21:54 +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 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
fbsanchez 3c730fbedf BC updated 2019-05-29 17:10:21 +02:00
fbsanchez 47c9220cbb clippy positions and control overflow 2019-05-29 17:02:01 +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
fbsanchez f58d1bc6ee Styling review 2019-05-29 15:14:13 +02:00
fbsanchez 8bd4a2f8f7 Style align-top 2019-05-29 13:20:31 +02:00
fbsanchez 3046cc5224 Style align-top 2019-05-29 13:13:24 +02:00
fbsanchez 7da60b447a Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 13:06:53 +02:00
fbsanchez 505229abe4 minor style change - box 2019-05-29 13:03:58 +02:00
Daniel Rodriguez ad1251052e Merge branch 'ent-4105-fallo-desplegable-snmp-wizard' into 'develop'
SNMP Browser fix

See merge request artica/pandorafms!2455
2019-05-29 12:50:09 +02:00
fbsanchez 49dee1e2bc Next contact to seconds 2019-05-29 12:42:55 +02:00
fbsanchez 5131c24772 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 12:24:28 +02:00
fbsanchez 37af0ad612 Styles 2019-05-29 12:06:05 +02:00
fbsanchez c8649a8dc4 Styles 2019-05-29 11:21:57 +02:00
Daniel Maya 552467286c Merge branch 'develop' into 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual'
# Conflicts:
#   pandora_console/extras/mr/28.sql
2019-05-29 11:10:31 +02:00
Luis Calvo 27963c4370 Fixed minor bug 2019-05-29 09:51:26 +02:00
fbsanchez 22de7964c2 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 08:52:34 +02:00
fbsanchez d64e2cfb8c Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-28 18:05:33 +02:00
Luis Calvo 58a0ef1bf7 Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings 2019-05-28 18:03:55 +02:00
Luis Calvo 77dbb53db4 Fixed minor bug 2019-05-28 18:03:40 +02:00
fbsanchez 70469c4909 Event list agent view 2019-05-28 18:03:01 +02:00
Luis Calvo e993dcc3a5 Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings 2019-05-28 17:37:20 +02:00
Luis Calvo 6fdd88ab65 Fixed errors on eHorus user level conf 2019-05-28 17:19:13 +02:00
fbsanchez 445db7c43b module list agent view 2019-05-28 16:20:24 +02:00
Tatiana Llorente d68bb176cf Merge branch 'develop' into 'ent-4102-Cambios-vista-detalle-de-evento'
Conflicts:
   pandora_console/include/styles/pandora.css
2019-05-28 15:56:16 +02:00
fbsanchez c57949079b RC1 agent view 2019-05-28 13:32:17 +02:00
fbsanchez 348f0c2a65 agent view styling 2019-05-28 13:27:17 +02:00
Luis Calvo 5966367f8f eHorus user level login conf added in user editor 2019-05-28 13:14:42 +02:00
fbsanchez 2cd19aa0cb updates styles 2019-05-28 10:47:31 +02:00
fbsanchez bdd7cc1317 Flex agent view 2019-05-28 09:48:09 +02:00
fbsanchez f57915285f review styles agent view 2019-05-27 22:36:55 +02:00
fbsanchez f1499082fa agent view rebuilt 2019-05-27 21:30:46 +02:00
fbsanchez 5be124f315 Styles review 2019-05-27 19:00:48 +02:00
Luis Calvo 588d19102f Resolve merge conflict 2019-05-27 18:30:24 +02:00
Tatiana Llorente 2fd37b531e Visual changes in module graph - #4104 2019-05-27 17:37:57 +02:00
Tatiana Llorente 1eb1120c6e Rename class events_show_more_table to table_modal_alternate - #4102 2019-05-27 16:18:10 +02:00
fbsanchez 9eecc414dd cps changes - switch core touched - test this commit carefully 2019-05-27 14:12:53 +02:00
Alejandro Gallardo Escobar ce8ba54e09 Merge remote-tracking branch 'origin/develop' into ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual 2019-05-27 11:31:24 +02:00
fbsanchez 1d403ec2f8 SNMP Browser fix 2019-05-24 13:42:49 +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 058c9d3806 Newsletter reminder settings ent 2019-05-23 18:54:04 +02:00
Daniel Maya 4c874e152c Merge 2019-05-23 10:43:32 +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