tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,479 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

633 Commits

Author SHA1 Message Date
vgilc ca67f52fb4 Merge branch '2670-Nuevo-widget-dashboard-system-group-status' into 'develop' 
2670 nuevo widget dashboard system group status

See merge request artica/pandorafms!1795
 2018-10-02 17:25:19 +02:00
alejandro-campos 62548c7f94 Merge branch 'develop' into 2670-Nuevo-widget-dashboard-system-group-status 
Conflicts:
	pandora_console/include/styles/pandora.css
 2018-10-02 17:11:02 +02:00
alejandro-campos e5e81e55d7 edited css class ui-widget-content 2018-10-01 17:58:29 +02:00
vgilc f73b4a55e6 Merge branch '2741-Refactorizar_vista_module_groups' into 'develop' 
refactoriced view module_groups

See merge request artica/pandorafms!1788
 2018-10-01 10:59:09 +02:00
vgilc d933a966eb Merge branch '2478-Logo-meta' into 'develop' 
changed background of meta visual setup logo previews

See merge request artica/pandorafms!1641
 2018-09-28 10:50:13 +02:00
daniel 26c08d9309 refactoriced view module_groups 2018-09-20 15:51:36 +02:00
alejandro-campos 6d28b386d1 changed styles for system group status widget 2018-09-17 18:56:38 +02:00
alejandro-campos 89a4e3667f Added styles for new widget system group status 2018-09-13 19:08:45 +02:00
danielmaya 39673ed93a Added class modaldeletebutton in pandora.css 2018-09-07 14:15:21 +02:00
Alejandro Gallardo Escobar dd6b9aed81 Refactored the layer configuration of the GIS maps to fix some bugs 2018-08-13 12:42:30 +02:00
danielmaya cd26042fa9 Fixed event graph in cluster view 2018-07-31 15:41:15 +02:00
alejandro-campos cca29b2f85 changed background of meta visual setup logo previews 2018-07-26 18:14:43 +02:00
slerena 082e9c6185 Merge branch '1781-Animación-visual-para-ventanas-modales-de-ayuda-2' into 'develop' 
Add visual animation to popup modal windows - #1781

See merge request artica/pandorafms!1284
 2018-06-25 18:59:34 +02:00
daniel 05d8d0ccf5 fixed errors graph 2018-06-13 19:13:42 +02:00
daniel dd57ddbd3c Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
 2018-05-28 17:54:53 +02:00
fermin831 88e060893a Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts resolved:
	pandora_console/operation/events/events_rss.php
 2018-05-28 12:12:16 +02:00
manuel.montes b68948307b Fixed white-space / pre-wrap 2018-05-23 17:55:07 +02:00
Fermin 8f2302630c [Rebranding] Docs and Support login icons are configurables 2018-05-21 14:29:11 +02:00
daniel 123d49d604 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/styles/pandora.css
 2018-05-10 08:52:45 +02:00
fermin831 33abfa7f9d [Rebranding] Other general source files. Removed unreached code oon general/logon_ok.php 2018-05-09 18:50:45 +02:00
vgilc d746af9c28 Merge branch 'ent-1888-anadir-nueva-feature-para-poder-cambiar-los-eventos-a-estado-en-proceso' into 'develop' 
Ent 1888 anadir nueva feature para poder cambiar los eventos a estado en proceso

See merge request artica/pandorafms!1442
 2018-05-09 10:24:19 +02:00
fbsanchez 3dd4dd51cb Specified more accurate class for label styling 2018-05-04 12:26:18 +02:00
fermin831 675e8deb47 Added function display_confirm_dialog with custom dialog 2018-04-25 12:32:58 +02:00
daniel 3fbd9adc38 fixed graph 2018-04-24 13:19:24 +02:00
fbsanchez dcaae924fc Decreased limit to reduceText call in some graphs 2018-04-03 16:41:21 +02:00
fbsanchez 526bd5f8c5 Merge remote-tracking branch 'origin/develop' into 2096-shorten_labels_in_hbars 2018-03-23 11:08:48 +01:00
fbsanchez 835e791ef1 Fixed label shortener in hbar 2018-03-21 13:40:15 +01:00
fermin831 1001240cf4 [SNMP] Fixed translation of custom mibs, added custom description data and change style of OID details 2018-03-15 16:03:46 +01:00
enriquecd b51dc73cd6 Change cluster view design - #1877 2018-02-14 18:37:27 +01:00
enriquecd c889776f44 Add visual animation to popup modal windows - #1781 2018-02-08 16:51:58 +01:00
enriquecd a04f941a55 Merge branch 'develop' into 1403-Añadir-relojes-a-consolas-visuales-com1 
Conflicts:
	pandora_console/include/styles/pandora.css
 2018-02-07 17:02:15 +01:00
enriquecd ae471bb9f2 Merge remote-tracking branch 'origin/clusters' into 1748-Sistema-de-gestión-de-Clusters 2018-02-07 13:52:44 +01:00
enriquecd ab24c3bf80 Merge branch 'develop' into 1571-Auditoría-del-sistema-información-de-los-cambios-4850-com1 
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
 2018-02-06 10:46:59 +01:00
danielmaya aea9d6ae36 resolved conflicts with containers and added mr12 2018-02-06 09:21:07 +01:00
enriquecd d59289db62 Change builder style - #1748 2018-02-02 14:56:33 +01:00
enriquecd 768e6e605f Fix bugs - #1748 2018-02-02 13:05:36 +01:00
enriquecd 2b446a681d Popup when click modules in cluster view, new images, filter modules - #1748 2018-01-30 17:38:29 +01:00
enriquecd 74b4f2a5f3 Add optional token animation and vissual effects in visual styles configuration view - #1724 2018-01-08 13:01:29 +01:00
vgilc 78899cc1c7 Merge branch '1708-CARREFOUR_Cambio_de_comportamiento_en_Consolas_Visuales_favoritas' into 'develop' 
add new funtionality view favourite console visual

See merge request artica/pandorafms!1211
 2018-01-02 10:31:31 +01:00
daniel 0b5678fba6 add new funtionality view favourite console visual 2017-12-28 15:13:06 +01:00
enriquecd 5747299d8e Add visual effect to login page - #1724 2017-12-21 13:45:57 +01:00
enriquecd 521eb8f4cb Add clocks to visual console - #1403 2017-12-01 12:14:56 +01:00
vgilc df5722e499 Merge branch '1500-Fuente-erronea-en-el-boton-del-wizar-de-instalación-de-Pandora' into 'develop' 
Change font family to install wizard button - #1500

See merge request artica/pandorafms!964
 2017-11-29 16:57:03 +01:00
enriquecd afd84ce74d Change system audit log extended info to table format with change info - #1571 2017-11-24 10:59:44 +01:00
danielmaya 897d7bf258 Added type graph selection in container graph 2017-11-23 18:01:32 +01:00
enriquecd 1e138f240f Change pandora black styles - #1394 2017-11-03 10:27:01 +01:00
Arturo Gonzalez 5a59f9e2a5 Merge branch 'develop' into 1378-donut-graph-in-visual-console-dev 2017-10-26 14:20:35 +02:00
vgilc 86b4fc433c Merge branch '1388-Meter-un-par-de-saltos-de-tamaño-de-fuente-mas-elementos-consola-visual' into 'develop' 
Add new font sizes for visual console - #1388

See merge request artica/pandorafms!874
 2017-10-26 13:39:59 +02:00
vgilc e8a14b6981 Merge branch '1416-new-h-and-v-bar-charts-in-visual-console-dev' into 'develop' 
1416 new h and v bar charts in visual console dev

See merge request artica/pandorafms!956
 2017-10-26 13:30:52 +02:00
enriquecd 4f62a02ca1 Change font family to install wizard button - #1500 2017-10-24 18:16:32 +02:00