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

660 Commits

Author SHA1 Message Date
daniel 335abb9abc fixed error css 
Former-commit-id: d2be8c4cf4306cb51c9b3854cbe06d4c80119d8b
 2019-01-25 09:54:53 +01:00
daniel fb46197c1f fixed minor error button 
Former-commit-id: 4b57425285d33d181390090fbdd3c36882ab4fcf
 2019-01-23 15:30:46 +01:00
vgilc 1b4cd37d5f Merge branch 'ent-2997-color-cloud-vc-items' into 'develop' 
Add the Color Cloud item to the Visual Console

See merge request artica/pandorafms!2075

Former-commit-id: e40e442631628db94c8f21c52cd8c04a0adbb6d6
 2018-12-12 17:43:39 +01:00
tatiana.llorente@artica.es f98b3e2ea5 Fixed error in submit - #3153 
Former-commit-id: a1c21457db7a4d4d6297fd0935b8beada7cde63c
 2018-12-10 15:18:53 +01:00
Alejandro Gallardo Escobar b0998003a3 Added a new icon 
Former-commit-id: b4eb7f9aaf16d9ea3b0bb0339c1a70ee162aa259
 2018-12-10 09:19:26 +01:00
tatiana.llorente@artica.es 2cb494bfe7 Show popup before drop database - #3153 2018-12-04 15:41:36 +01:00
vgilc d2c048b2dc Merge branch '2890-Texto-en-Active-incident-on-this-agent' into 'develop' 
Added css rule for links in the th tables with databox class- #2890

See merge request artica/pandorafms!1844
 2018-11-30 13:11:45 +01:00
daniel a5346a7ae3 fixed error login double 2018-11-21 17:38:11 +01:00
daniel 34ea7cfbcb fixed position select autocomplete agent jqui 2018-11-15 15:19:43 +01:00
tatiana.llorente@artica.es a6b8929a37 Added jquery-ui styles to css - #2784 2018-11-13 16:48:06 +01:00
tatiana.llorente@artica.es 719e502a27 Revert "Added jquery-ui styles to css - #2784" 
This reverts commit fdda5793d2.
 2018-11-13 16:34:27 +01:00
tatiana.llorente@artica.es fdda5793d2 Added jquery-ui styles to css - #2784 2018-11-13 16:27:57 +01:00
daniel 1c1df4b5f7 fixed errors css jqueryui 2018-11-07 17:09:42 +01:00
daniel 267f83cc4c add datatabes 2018-11-07 13:25:02 +01:00
daniel 7d54858b45 delete files dont use 2018-11-07 13:24:07 +01:00
tatiana.llorente@artica.es 233b9c2c70 Well centered message modal window - #2768 2018-11-02 13:07:38 +01:00
vgilc 17286414c7 Merge branch '2619_Group_View' into 'develop' 
Added warning and normal status agents in group view

See merge request artica/pandorafms!1799
 2018-10-29 09:16:33 +01:00
vgilc 1973a5fe54 Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop' 
WUX-UX integration

See merge request artica/pandorafms!1890
 2018-10-26 14:42:23 +02:00
fbsanchez 172ac187a2 estilos popup 2018-10-25 15:58:06 +02:00
fbsanchez 85051924b7 estilos popup 2018-10-25 14:01:12 +02:00
vgilc 4dd2cd434c Merge branch '2726-Botones-background-en-Visual-consoles' into 'develop' 
Changed colors for buttons - #2726

See merge request artica/pandorafms!1797
 2018-10-25 12:05:56 +02:00
vgilc cf9bf2b4e2 Merge branch '2768-Mensajería-interna' into 'develop' 
Fixed borders of tables with classes databox and data - #2768

See merge request artica/pandorafms!1786
 2018-10-25 11:54:50 +02:00
tatiana.llorente@artica.es 8f2472dcf8 Added css rule for links in the th tables with databox class- #2890 2018-10-09 12:38:59 +02:00
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
samucarc 638c4f8bc7 Added warning and normal status agents in group view 2018-09-21 15:10:30 +02:00
tatiana.llorente@artica.es 028cca0d66 Changed colors for buttons - #2726 2018-09-21 12:59:15 +02:00
daniel 26c08d9309 refactoriced view module_groups 2018-09-20 15:51:36 +02:00
tatiana.llorente@artica.es e49c0e3ae7 Fixed a minor mistake in thead - #2768 2018-09-20 12:18:31 +02:00
tatiana.llorente@artica.es bc38468e6c Fixed borders of tables with classes databox and data - #2768 2018-09-20 11:50:47 +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