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

313 Commits

Author SHA1 Message Date
Jonathan d892a0d759 Password mobile required 2023-03-06 08:57:47 +01:00
Jonathan d190c36a9e #10294 login user bloqued and attempts 2023-02-08 11:59:20 +01:00
alejandro.campos@artica.es 6243229345 changed wrong count 2022-11-29 11:54:25 +01:00
Daniel Barbero 3273fc23ed Merge remote-tracking branch 'origin/develop' into ent-4822-estado-de-consola-visual-mantenimiento 
Conflicts:
	pandora_console/extras/mr/58.sql
 2022-10-26 09:42:02 +02:00
Daniel Barbero 19cfc84a39 add mode maintenance VC pandora_enterprise#4822 2022-10-13 17:45:44 +02:00
Daniel Barbero 9e2c6edfeb new group by events for extraid pandora_enterprise#9425 2022-09-27 15:08:09 +02:00
Daniel Barbero Martin 57f82b0c31 fix 550 error evnts mobile php 7.2 pandora_enterprise#9307 2022-07-22 12:27:58 +02:00
Daniel Barbero Martin 44a2bb2bdb fix mobile index access user to node pandora_enterprise#9280 2022-07-19 10:13:43 +02:00
Diego Muñoz-Reja ab38cfa836 Merge branch 'ent-9274-error-500-vista-agente-al-entrar-por-consola-mobile-en-un-agente' into 'develop' 
fix agents mobile pandora_enterprise#9274

See merge request artica/pandorafms!5015
 2022-07-15 12:27:15 +00:00
Diego Muñoz-Reja 889d80fbdb Merge branch 'ent-8889-Redirecciones-usuarios-en-Carrefour' into 'develop' 
Ent 8889 redirecciones usuarios en carrefour

See merge request artica/pandorafms!4885
 2022-07-14 14:59:12 +00:00
Daniel Maya 0ff688f6fa #8889 Fixed url location 2022-07-14 16:50:26 +02:00
Daniel Barbero Martin 644164040f fix agents mobile pandora_enterprise#9274 2022-07-13 12:34:29 +02:00
Daniel Maya 547962c83a Merge branch 'develop' into ent-8763-g-sanchez-anadir-filtro-de-grupos-al-widget-de-vista-tactica 2022-06-29 17:27:25 +02:00
Daniel Barbero Martin 5328cf21c6 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-23 12:51:35 +02:00
Daniel Barbero Martin 6a614847a2 refactor events meta pandora_enterprise#9086 2022-06-23 11:49:04 +02:00
Daniel Barbero Martin 6f49f63353 fixed VC pandora_enterprise#8888 2022-06-16 14:09:30 +02:00
Daniel Barbero Martin d22c667776 fixed VC pandora_enterprise#8888 2022-06-15 19:50:19 +02:00
Daniel Barbero Martin b82b3c3fb1 refactor events meta pandora_enterprise#9086 2022-06-14 18:47:09 +02:00
Daniel Barbero Martin 8dbc860f4a refactor events meta pandora_enterprise#9086 2022-06-08 17:01:15 +02:00
Daniel Maya d6fc15f0bf #8763 Added filter groups 2022-06-06 11:14:09 +02:00
Daniel Barbero Martin ececdca0b6 Not orientation CV view mobile pandora_enterprise#8888 2022-05-13 12:54:58 +02:00
Daniel Maya 66a69aa548 #8889 Added external link for mobile 2022-05-13 09:51:43 +02:00
Daniel Barbero Martin 0d0db1ce9a fixed CV in console mobile metaconsole pandora_enterprise#8676 2022-03-22 12:01:42 +01:00
Daniel Barbero Martin 2c2a0b4d7a fixed CV in console mobile metaconsole pandora_enterprise#8676 2022-03-22 09:29:02 +01:00
Daniel Barbero Martin 76d8918a4e fixed CV in console mobile metaconsole #8676 2022-03-21 10:04:11 +01:00
Daniel Barbero Martin e5f8e32a9e fixed CV in console mobile metaconsole #8676 2022-03-18 13:07:29 +01:00
Daniel Barbero Martin 066568e1d4 fixed CV in console mobile metaconsole #8676 2022-03-16 17:50:46 +01:00
Daniel Barbero Martin 6c4d2f2b31 fixed CV in console mobile metaconsole #8676 2022-03-15 18:12:01 +01:00
Daniel Barbero Martin a310194f5d Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-15 11:47:55 +01:00
Daniel Barbero Martin 9e07afdab2 fixed CV in console mobile metaconsole #8676 2022-03-15 11:39:57 +01:00
José González 0dd6dc48b7 Solve generated issues 2022-03-14 11:51:49 +01:00
Daniel Barbero Martin 06ecbdb7a6 fixed CV in console mobile metaconsole #8676 2022-03-11 10:51:57 +01:00
Daniel Barbero Martin e1ab514757 fixed CV in console mobile metaconsole #8676 2022-03-10 16:56:00 +01:00
Daniel Barbero Martin 5b1353e493 fixed CV in console mobile #8676 2022-03-08 17:18:44 +01:00
José González 64ed03784b Fix several issues with mobile view 2022-02-24 11:04:18 +01:00
José González f6a8fdf085 Fixes with scroll in agents and modules 2022-02-23 18:04:23 +01:00
fbsanchez 4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
Daniel Rodriguez f771e2bf9e Merge branch 'ent-8422-Revision-completa-audit-logs' into 'develop' 
Ent 8422 revision completa audit logs

Closes pandora_enterprise#8422

See merge request artica/pandorafms!4669
 2022-02-10 14:20:42 +00:00
Daniel Maya 816bbf4d00 #8435 Added jquery mobile 1.5 2022-02-07 12:29:57 +01:00
fbsanchez e1776d7994 removed collation from filtering 2022-02-04 13:26:03 +01:00
fbsanchez 5b06942caf DANGER COMMIT, uses schema collation instead forced one 2022-02-01 15:18:45 +01:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
fbsanchez 28743dcb5d sizeof => count 2022-01-19 12:40:52 +01:00
Calvo f9dceb9e10 Fix not init color 2021-12-28 12:38:22 +01:00
Jose Gonzalez 98f519958c Fix merge 2021-11-23 12:25:58 +01:00
Daniel Rodriguez c02c03df02 Merge branch 'ent-8099-Vulnerabilidad-JQuery-mobile' into 'develop' 
Ent 8099 vulnerabilidad j query mobile

See merge request artica/pandorafms!4498
 2021-11-15 11:13:07 +00:00
Daniel Rodriguez 650607067e Merge branch 'ent-7688-conteo-monitores-vista-tactica' into 'develop' 
Include modules not init in total monitors count on tactical view

See merge request artica/pandorafms!4309
 2021-11-15 11:00:07 +00: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 932d42e8da Fixed colours 2021-11-04 15:44:40 +01:00
Daniel Maya 05bc15f74c #8099 Added jquery mobile 1.4.5 2021-10-25 11:09:24 +02:00