tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-29 21:58:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
33,445 Commits 34 Branches 30 Tags
Commit Graph

1190 Commits

Author SHA1 Message Date
Daniel Barbero
209681e4c2 ADD failover option availability_graph 2019-07-02 11:50:58 +02:00
Tatiana Llorente
1aa0131a81 Merge branch 'develop' into 'ent-4195-Status-sets-Visual' 
Conflicts:
   pandora_console/include/styles/pandora.css
 2019-07-02 11:42:19 +02:00
Daniel Barbero Martin
0064bc0cba fixed errors 2019-07-01 17:07:39 +02:00
Alejandro Fraguas
cda9cd6fe1 Merge branch 'ent-4234-Ventana-popup-que-muestra-graficas-no-tiene-en-cuenta-los-unknown-y-no-cabe' into 'develop' 
Changed size for modal window for module graph- #4234

See merge request artica/pandorafms!2536
 2019-06-26 13:43:57 +02:00
Tatiana Llorente
ea9540ddce Changed size for modal window for module graph- #4234 2019-06-25 09:19:47 +02:00
Tatiana Llorente
43b83af2c6 Changed default images status set for css - #4195 2019-06-24 11:59:17 +02:00
fbsanchez
526ebdebd9 ajax comments 2019-06-20 21:11:56 +02:00
fbsanchez
9fa9a346ca Merge remote-tracking branch 'origin/develop' into ent-4238-eventos-csv-e-historico 2019-06-20 19:23:39 +02:00
fbsanchez
8671c7c88c events qa adjustments 2019-06-20 19:23:13 +02:00
Daniel Rodriguez
265202f1ed Merge branch 'ent-4136-button-styles' into 'develop' 
Review 1

See merge request artica/pandorafms!2470
 2019-06-20 16:35:12 +02:00
fbsanchez
2c5cd007d2 reset form on load filter none 2019-06-20 14:18:49 +02:00
fbsanchez
44d8b977cb event advanced filter fixes 2019-06-19 16:52:14 +02:00
Alejandro Gallardo Escobar
c87919af94 Bugfix 2019-06-19 15:17:13 +02:00
fbsanchez
8b8d17f089 event ajax validation little improvement 2019-06-18 18:35:34 +02:00
fbsanchez
24025ebb74 Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-18 17:48:03 +02:00
fbsanchez
c3ebe88178 style review 2019-06-18 17:40:31 +02:00
fbsanchez
22272225b8 massive operations over events 2019-06-18 14:26:55 +02:00
fbsanchez
dc81d168e0 event filters group selectors 2019-06-18 11:00:48 +02:00
fbsanchez
457c1c9edf wip event view 2019-06-17 18:33:39 +02:00
fbsanchez
ab7d72a1c9 wip event vwr ui-box close tick 2019-06-17 17:02:33 +02:00
Luis Calvo
6b2bb1a138 Merge remote-tracking branch 'origin/develop' into ent-2707-System-Uptime-data-show-bug 2019-06-17 16:59:33 +02:00
Luis Calvo
3daddc94d9 Fixed, only evaluate unit 2019-06-17 10:29:28 +02:00
fbsanchez
36a1387632 WIP event show info 2019-06-14 19:23:04 +02:00
Luis Calvo
6f15e97a49 Modified module show data Sys Uptime format 2019-06-14 16:13:01 +02:00
fbsanchez
ecc2fef8f6 event validation/in process 2019-06-13 12:30:09 +02:00
fbsanchez
4bb300889d Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-12 13:17:36 +02:00
fbsanchez
48e6fef0b7 Event filters 2019-06-11 12:58:18 +02:00
Tatiana Llorente
334e66aaf1 Export csv from custom field view meta - #3474 2019-06-06 10:39:09 +02:00
fbsanchez
6ed2a0636e styles review 2019-06-04 22:34:17 +02:00
fbsanchez
a1be1e7332 styles review 2019-06-04 22:16:58 +02:00
fbsanchez
974db824a8 style review 2019-06-03 19:13:29 +02:00
fbsanchez
7a09a80ace style review 2019-06-03 14:30:23 +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
Daniel Maya
76e6588b7a fixed cache in label, icon, clock, box and line 2019-05-29 13:54:14 +02:00
fbsanchez
37af0ad612 Styles 2019-05-29 12:06:05 +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
fbsanchez
22de7964c2 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 08:52:34 +02:00
Alejandro Gallardo Escobar
f5d5cbf5b8 VC item cache improvements. 
-Added a default value to the configuration.
-Changed the control to edit the cache expiration.
- Added the cache to more items.
 2019-05-28 18:34:07 +02:00
fbsanchez
445db7c43b module list agent view 2019-05-28 16:20:24 +02:00
fbsanchez
9a12b34847 Updates styling 2019-05-28 12:13:29 +02:00
fbsanchez
f57915285f review styles agent view 2019-05-27 22:36:55 +02:00
fbsanchez
5be124f315 Styles review 2019-05-27 19:00:48 +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
Tatiana Llorente
0b4a076798 Changed image for severity in modal events window - #4102 2019-05-27 15:49:10 +02:00
Daniel Maya
4c874e152c Merge 2019-05-23 10:43:32 +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
Daniel Maya
c2b8ad22d3 Added cache_expiration in builder items 2019-05-09 12:44:58 +02:00
Tatiana Llorente
ef45fc3ca6 Merge remote-tracking branch 'origin/develop' into ent-3617-Gráfica-de-módulos 2019-05-09 10:44:31 +02:00
Daniel Rodriguez
8f6c8a9932 Merge branch 'ent-3613-Ventana-modal-de-vista-de-Eventos' into 'develop' 
Ent 3613 ventana modal de vista de eventos

See merge request artica/pandorafms!2387
 2019-05-08 19:07:39 +02:00