tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-24 03:08:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
32,402 Commits 34 Branches 30 Tags
Commit Graph

17573 Commits

Author SHA1 Message Date
Daniel Barbero Martin
8e7ed75b3e refactor events meta pandora_enterprise#9086 2022-06-16 11:31:07 +02:00
José González
bad0335502 Changed styles 2022-06-16 11:14:29 +02:00
Daniel Rodriguez
52cfd6b70a Merge branch 'ent-8899-13499-problema-con-conexion-db-hist-con-contrasenas-con-caracteres-especiales' into 'develop' 
Ent 8899 13499 problema con conexion db hist con contrasenas con caracteres especiales

See merge request artica/pandorafms!4852
 2022-06-16 09:03:28 +00:00
Daniel Rodriguez
fa28b5b7e1 Merge branch 'ent-9000-cambio-update-manager-a-warp-update' into 'develop' 
Ent 9000 cambio update manager a warp update

See merge request artica/pandorafms!4957
 2022-06-16 08:43:12 +00:00
Daniel Barbero Martin
acef7e6f63 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/operation/events/events.php
 2022-06-16 09:09:49 +02:00
Daniel Maya
bb01bfe2d0 #8899 Fixed history_db_enabled 2 2022-06-16 08:44:09 +02:00
Daniel Rodriguez
74e2dcad26 Merge branch 'ent-9064-Cambiar-logo-en-CSS-blanco-estándar' into 'develop' 
Set new brand and color for header

See merge request artica/pandorafms!4944
 2022-06-16 06:43:21 +00:00
Daniel Rodriguez
d57394c0b9 Merge branch 'ent-8856-no-funciona-crear-componentes-en-metaconsola-api-2' into 'develop' 
Ent 8856 no funciona crear componentes en metaconsola api 2

See merge request artica/pandorafms!4955
 2022-06-16 06:42:38 +00:00
Daniel Rodriguez
ffdc8ee656 Merge branch 'ent-9032-Mejora-visual-eventos-largos-destrozan' into 'develop' 
Improve event names

See merge request artica/pandorafms!4951
 2022-06-16 06:41:07 +00:00
artica
592d09d34a Auto-updated build strings. 2022-06-16 01:00:17 +02:00
Daniel Barbero Martin
d22c667776 fixed VC pandora_enterprise#8888 2022-06-15 19:50:19 +02:00
Daniel Barbero Martin
1bf1a83782 Merge remote-tracking branch 'origin/develop' into ent-8888-consolas-visuales-vista-movil-carrefour 2022-06-15 19:49:31 +02:00
Daniel Barbero Martin
8ad6d350af refactor events meta pandora_enterprise#9086 2022-06-15 13:06:10 +02:00
Daniel Maya
9a7e0e3228 #8899 Fixed history_db_enabled 2022-06-15 09:37:29 +02:00
Daniel Barbero Martin
080c10aad7 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-15 08:50:00 +02:00
artica
3ee1ba0bbc Auto-updated build strings. 2022-06-15 01:00:16 +02:00
Daniel Barbero Martin
b82b3c3fb1 refactor events meta pandora_enterprise#9086 2022-06-14 18:47:09 +02:00
Daniel Barbero Martin
3b3e964cf9 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-14 07:57:18 +02:00
artica
c7b8c55284 Auto-updated build strings. 2022-06-14 01:00:42 +02:00
Daniel Barbero Martin
5968febd04 Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2022-06-13 17:10:19 +02:00
Daniel Barbero Martin
90013603a7 refactor events meta pandora_enterprise#9086 2022-06-13 17:06:09 +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
8e4cffbc0a Several style refactory 2022-06-13 12:34:16 +02:00
Daniel Rodriguez
871e1cc0c0 Merge branch 'ent-9066-Mala-traducción-al-castellano-Menú-colapsado' into 'develop' 
Fixed languages files

See merge request artica/pandorafms!4943
 2022-06-13 09:42:45 +00:00
Daniel Rodriguez
38de162f94 Merge branch 'ent-9031-Mejora-visual-Cajas-de-busqueda-avanzada-de-ver-eventos' into 'develop' 
Ent 9031 mejora visual cajas de busqueda avanzada de ver eventos

See merge request artica/pandorafms!4925
 2022-06-13 09:22:54 +00:00
Daniel Barbero Martin
5680b82563 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-13 08:16:40 +02:00
artica
85f31c5ab4 Auto-updated build strings. 2022-06-13 01:00:16 +02:00
artica
62bcc9e267 Auto-updated build strings. 2022-06-12 01:00:15 +02:00
artica
46897aff83 Auto-updated build strings. 2022-06-11 01:00:50 +02:00
José González
3ec50f10b4 Update warp strings 2022-06-10 12:57:45 +02:00
José González
022d28981d Update styles 2022-06-10 12:57:04 +02:00
José González
0784b25ea0 Update Warp strings 2022-06-10 12:56:45 +02:00
José González
bb17645c88 Fix 2022-06-10 10:40:28 +02:00
José González
815a737a69 Change strings for Update Manager references to WARP update 2022-06-10 10:17:23 +02:00
artica
32c62e9f93 Auto-updated build strings. 2022-06-10 01:00:21 +02:00
edu.corral
ae657ee018 8856 meta api functions 2022-06-09 17:22:00 +02:00
Daniel Maya
2cfb4e53c2 #9033 Fixed group events 2022-06-09 14:59:43 +02:00
Daniel Rodriguez
50442faf26 Merge branch 'ent-9108-No-funciona-widget-Odometro-en-version-Open' into 'develop' 
Ent 9108 no funciona widget odometro en version open

See merge request artica/pandorafms!4938
 2022-06-09 12:50:39 +00:00
José González
bce182f2b2 Improve event names 2022-06-09 11:02:11 +02:00
Daniel Rodriguez
336bc74d49 Merge branch 'ent-9021-proteccion-en-cascada-bucle-padre-hijo' into 'develop' 
Ent 9021 proteccion en cascada bucle padre hijo

See merge request artica/pandorafms!4921
 2022-06-09 07:34:40 +00:00
Daniel Rodriguez
ad9a864b1c Merge branch 'ent-9116-13158-Nuevos-fallos-componentes-locales-con-politicas-con-macro' into 'develop' 
fixed macro default value not loading

See merge request artica/pandorafms!4941
 2022-06-09 07:32:18 +00:00
artica
9d28c67a1c Auto-updated build strings. 2022-06-09 01:00:21 +02:00
Daniel Barbero Martin
8dbc860f4a refactor events meta pandora_enterprise#9086 2022-06-08 17:01:15 +02:00
Daniel Maya
3e15ed2726 #8302 Added show_empty_groups 2022-06-08 15:17:03 +02:00
Daniel Maya
90d4cfa0db #8252 Move up and down fields 2022-06-08 13:24:27 +02:00
Daniel Rodriguez
1eea27e1f3 Merge branch 'ent-9040-Mejoras-en-la-vista-de-agents-alerts' into 'develop' 
Ent 9040 mejoras en la vista de agents alerts

See merge request artica/pandorafms!4933
 2022-06-08 09:11:19 +00:00
Daniel Barbero Martin
951a1703bf Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/include/functions_reporting.php
 2022-06-08 08:15:49 +02:00
artica
8a5847a225 Auto-updated build strings. 2022-06-08 01:00:24 +02:00
Daniel Barbero Martin
ee2810e680 refactor events meta pandora_enterprise#9086 2022-06-07 17:25:51 +02:00
José González
ad00594b1d Set new brand and color for header 2022-06-07 17:21:13 +02:00