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

719 Commits

Author SHA1 Message Date
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Jose Gonzalez 17c0e78d06 Improve TreeView 2023-01-26 13:25:24 +01:00
Daniel Cebrian 593673c85d #10138 added background image 2023-01-25 08:50:44 +01:00
Daniel Cebrian bbd41a6cfb #10138 changed url images 2023-01-19 09:19:25 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Jose Gonzalez 60685cdccc Table fixes 2023-01-10 10:18:37 +01:00
Jose Gonzalez 8421fb49ca Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-01-04 15:54:16 +01:00
Pablo Aragon ab54a26815 9868 Remove footer and create About section 2022-12-29 16:21:36 +01:00
Jose Gonzalez ffa4ec756c Agent Group icons adding 2022-12-20 17:22:35 +01:00
Daniel Barbero 105109f0fb add icon datamatrix widget pandora_enterprise#8619 2022-12-19 09:37:01 +01:00
jose.gonzalez@pandorafms.com 2b896bcd17 Minor fixes over module data tables 2022-12-16 12:55:56 +01:00
jose.gonzalez@pandorafms.com d43ae677a3 Changed icons and minor fixes 2022-12-15 12:41:38 +01:00
jose.gonzalez@pandorafms.com 6c5f531bc4 Added images 2022-12-14 09:09:11 +01:00
jose.gonzalez@pandorafms.com 1cfdf881bb Images 2022-11-30 10:30:36 +01:00
jose.gonzalez@pandorafms.com dccd950e9e Changes 2022-11-30 10:14:42 +01:00
jose.gonzalez@pandorafms.com a688182062 Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2022-11-22 17:47:02 +01:00
jose.gonzalez@pandorafms.com 197aced536 Inputs update and several style improvements 2022-11-10 15:06:39 +01:00
jose.gonzalez@pandorafms.com f543f73c2c Minor fixes and added new icons 2022-11-07 14:03:34 +01:00
jose.gonzalez@pandorafms.com 6a21fcd6a9 SVG files 2022-10-21 13:33:49 +02:00
Daniel Barbero 370852066f Merge remote-tracking branch 'origin/develop' into ent-8620-copiando-a-grafana-3-grouped-meter-graphs-como-widget-en-dashboard 
Conflicts:
	pandora_console/include/functions_modules.php
 2022-10-14 11:46:20 +02:00
Daniel Barbero ab59537d42 new widget grouped meter graphs pandora_enterprise#8620 2022-10-10 13:29:40 +02:00
Daniel Maya c58cf09d62 #9252 Added images of spain, europe and world 2022-09-26 12:45:35 +02:00
Daniel Barbero Martin 033027f360 modal sound events pandora_enterprise#9095 2022-07-04 17:09:30 +02:00
Daniel Barbero Martin 2dc16a2a19 modal sound events pandora_enterprise#9095 2022-07-01 13:08:39 +02:00
Daniel Barbero Martin b82ea58efd new icons widgets dashboards pandora_enterprise#8621 2022-06-27 16:00:36 +02:00
Daniel Barbero Martin f1ac9cefd8 new icons widgets dashboards pandora_enterprise#8621 2022-06-27 09:47:33 +02:00
Daniel Barbero Martin a5e845e98f new icons widgets dashboards pandora_enterprise#8621 2022-06-27 09:45:21 +02:00
Daniel Barbero Martin 24305b40b0 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 
Conflicts:
	pandora_console/include/javascript/pandora.js
	pandora_console/include/lib/Dashboard/Widget.php
	pandora_console/include/styles/dashboards.css
 2022-06-27 08:38:50 +02:00
Daniel Rodriguez 7af375567d Merge branch 'ent-9197-Problema-cabecera-menu' into 'develop' 
Change collapsed filename

See merge request artica/pandorafms!4977
 2022-06-23 12:29:26 +00:00
José González 82480fa503 Updated logo 2022-06-22 16:46:24 +02:00
José González 5e09b99504 Change collapsed filename 2022-06-22 16:00:04 +02:00
Daniel Barbero Martin 962f223670 new images update manager online pandora_enterprise#9192 2022-06-22 12:21:51 +02:00
José González dc599d2fe6 Handle header image with community and with black theme 2022-06-13 16:23:37 +02:00
José González ad00594b1d Set new brand and color for header 2022-06-07 17:21:13 +02:00
Daniel Barbero Martin 9d2c179423 add new widget color tabs module pandora_enterprise#8621 2022-05-19 18:00:49 +02:00
Daniel Maya 4699ec7a3f #8928 Added img 2022-05-10 13:44:10 +02:00
Daniel Barbero Martin 502b5ab0db add new report custom render pandora_enterprise#8540 2022-04-04 14:40:20 +02:00
Daniel Barbero Martin 4f46da6633 Merge remote-tracking branch 'origin/develop' into ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma 
Conflicts:
	pandora_console/include/styles/pandora.css
 2022-01-18 10:17:19 +01:00
Daniel Barbero Martin f705cc0fba wip chart histogram list modules #8222 2021-12-14 13:21:34 +01:00
fbsanchez f852df2f1c Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-14 11:03:04 +01:00
fbsanchez 5c25fa8406 mr updates and a pretty icon 2021-12-09 15:07:35 +01:00
fbsanchez 0cca3a35d5 some icons 2021-11-10 17:14:23 +01:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Jose Gonzalez 932d42e8da Fixed colours 2021-11-04 15:44:40 +01:00
marcos 96638189f2 new integriaims logo 2021-10-07 16:46:49 +02:00
Jose Gonzalez 6deaee84ac Merge 2021-10-04 10:00:15 +02:00
Daniel Rodriguez 7904c61df5 Merge branch 'ent-7273-Consola-Visual-nuevo-elemento-Gráfica-básica' into 'develop' 
Ent 7273 consola visual nuevo elemento gráfica básica

See merge request artica/pandorafms!4304
 2021-10-01 12:48:09 +00:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
Jose Gonzalez 1a884a9df6 Merge remote-tracking branch 'origin' into ent-7662-rebranding-meta 2021-09-28 11:33:48 +02:00