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 |
|
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 |
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 |
|
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 |
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 |
|
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 Maya
|
edbde3fecb
|
Fixed url in user_edit
|
2019-05-21 17:14:29 +02:00 |
manuel
|
ada49966e0
|
Merge branch 'develop' into ent-3468-Ayudas_online
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
|
2019-05-21 10:05:06 +02:00 |
Alejandro Gallardo Escobar
|
2c8dd3b5e5
|
Merge remote-tracking branch 'origin/develop' into ent-3975-mejorar-la-actualizacion-de-los-datos-y-elementos-de-la-consola-visual
|
2019-05-17 14:16:23 +02:00 |
|
Alejandro Gallardo Escobar
|
34218fa7eb
|
Improved the management of the async requests of the visual console client
|
2019-05-17 14:09:30 +02:00 |
|
Luis Calvo
|
a0faffe161
|
Form eHorus user login with title
Former-commit-id: 7b55f446802bb9c24602d2e626789a3365599835
|
2019-05-16 18:59:17 +02:00 |
|
Luis Calvo
|
0cd60d0431
|
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
Former-commit-id: fb3ba4cbda0daa688550708e4bc99e6512eea413
|
2019-05-16 18:11:33 +02:00 |
|
Daniel Maya
|
b508e40a73
|
Changed simple quote in alerts
Former-commit-id: 48f06d79b9f6e93ba2164d8da6240f28cc4f785c
|
2019-05-14 11:11:27 +02:00 |
|
Luis Calvo
|
ce34adb9d8
|
Fixed errors and corrected style
Former-commit-id: 645c76e98d2ba8b417048722001193bc3197bb0a
|
2019-05-13 17:28:23 +02:00 |
|
manuel
|
20dace7de8
|
Merge branch 'develop' into ent-3468-Ayudas_online
Conflicts:
pandora_console/godmode/agentes/agent_manager.php
Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
|
2019-05-13 16:20:12 +02:00 |
|
Luis Calvo
|
27096276ec
|
agent view user acces ehorus
Former-commit-id: 66739ce807d5bd5f2e46ce9fd1aa0cc72afbb4bc
|
2019-05-13 15:00:29 +02:00 |