tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-27 15:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity
21,537 Commits 34 Branches 30 Tags
Commit Graph

21537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luis
c8297165e8 Undo undesired changes 2019-05-28 17:41:39 +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
Daniel Barbero Martin
3b943ae902 fixed errors disabled/enabled module from list agents because not write in conf 2019-05-28 17:11:14 +02:00
fbsanchez
99e485e96e toggle updated 2019-05-28 16:24:28 +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
Alejandro Fraguas
1df2bd3c21 Merge branch 'ent-4101-Cambios-vista-gráfica-de-módulo' into 'develop' 
Ent 4101 cambios vista gráfica de módulo

See merge request artica/pandorafms!2462
 2019-05-28 13:30:11 +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
9a12b34847 Updates styling 2019-05-28 12:13:29 +02:00
Alejandro Fraguas
a3591b799a Merge branch 'ent-3983-Informes-SLA-mensuales-de-keepalive-no-se-calculan-bien' into 'develop' 
fix minor bug in reporting functions

See merge request artica/pandorafms!2460
 2019-05-28 12:03:55 +02:00
fbsanchez
92ca217800 minor fixes in style view tasklist 2019-05-28 10:57:36 +02:00
fbsanchez
2cd19aa0cb updates styles 2019-05-28 10:47:31 +02:00
Alejandro Gallardo Escobar
5ea79cdfb8 Now only the Group item of the VC is cached by user 2019-05-28 10:39:34 +02:00
fbsanchez
bdd7cc1317 Flex agent view 2019-05-28 09:48:09 +02:00
Tatiana Llorente
a6c0a082a7 Merge branch 'ent-4104-Cambios-vista-gráfica-de-módulo' into ent-4101-Cambios-vista-gráfica-de-módulo 2019-05-28 08:55:15 +02:00
fbsanchez
8bfb1e6773 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-28 08:32:53 +02:00
artica
11e5a4ce18 Auto-updated build strings. 2019-05-28 00:01:07 +02:00
fbsanchez
e338d5ba95 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-27 22:40:11 +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
954dd0b43a UI_toggle updated 2019-05-27 19:08:41 +02:00
fbsanchez
5be124f315 Styles review 2019-05-27 19:00:48 +02:00
Luis Calvo
3736d84589 Edit ehorus user 2019-05-27 18:49:47 +02:00
alejandro-campos
58d0dc5dbc fix minor bug in reporting functions 2019-05-27 18:31:20 +02:00
Luis Calvo
588d19102f Resolve merge conflict 2019-05-27 18:30:24 +02:00
Alejandro Fraguas
f284112be2 Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews-2' into 'develop' 
changed PK to NULL

See merge request artica/pandorafms!2451
 2019-05-27 18:13:09 +02:00
fbsanchez
f0fb6d7fd9 wip styles 2019-05-27 18:03:56 +02:00
Daniel Rodriguez
61d3720787 Merge branch 'ent-4076-Quitar-ayudas-vacias-modulos' into 'develop' 
Removed empty help icons in modules

See merge request artica/pandorafms!2454
 2019-05-27 17:53:06 +02:00
marcos.alconada
91d388c8b3 Changed for create new user with advanced config enabled and forced automaticly disabled 2019-05-27 17:47:45 +02:00
Tatiana Llorente
2fd37b531e Visual changes in module graph - #4104 2019-05-27 17:37:57 +02:00
manuel
513a74d120 Removed empty help icons in local components 2019-05-27 17:13:25 +02:00
fbsanchez
556c07ad99 Minor changes in configurar_agente 2019-05-27 17:12:35 +02:00
Alejandro Gallardo Escobar
fb8bc48d64 Now the vc item's cache expires when the item is updated 2019-05-27 16:40:09 +02:00
Tatiana Llorente
1eb1120c6e Rename class events_show_more_table to table_modal_alternate - #4102 2019-05-27 16:18:10 +02:00
Alejandro Fraguas
54461fea93 Merge branch 'ent-3881-discovery-fase-4' into 'develop' 
Minor style, avoided duplicated iface names with spaces

See merge request artica/pandorafms!2453
 2019-05-27 16:08:45 +02:00
Tatiana Llorente
016a5b3745 Changed image for severity in modal events window - #4102 2019-05-27 15:51:03 +02:00
Tatiana Llorente
0b4a076798 Changed image for severity in modal events window - #4102 2019-05-27 15:49:10 +02:00
fbsanchez
0280547465 some changes 2019-05-27 15:41:23 +02:00
Daniel Barbero Martin
bc64589046 fixed error create modules 2019-05-27 15:27:46 +02:00
fbsanchez
9eecc414dd cps changes - switch core touched - test this commit carefully 2019-05-27 14:12:53 +02:00
fbsanchez
7347324601 Minor fixes - discovery styles 2019-05-27 13:19:08 +02:00
Alejandro Gallardo Escobar
f8a0fc67f9 Minor improvements 2019-05-27 12:10:05 +02:00
Ramon Novoa
36a12d16be Do not add disabled modules to the execution queue. 2019-05-27 11:55:42 +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
83602e07b9 Merge remote-tracking branch 'origin/develop' into ent-3881-discovery-fase-4 2019-05-27 11:06:29 +02:00
artica
de3464bd02 Auto-updated build strings. 2019-05-27 00:01:05 +02:00
artica
ba97da46c6 Auto-updated build strings. 2019-05-26 00:01:04 +02:00