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

36 Commits

Author SHA1 Message Date
José González 6bf82accad Subquery needed for avoid duplicates 2022-03-28 17:19:36 +02:00
fbsanchez 5b06942caf DANGER COMMIT, uses schema collation instead forced one 2022-02-01 15:18:45 +01:00
Alejandro Campos 6d1e7121d7 Merge branch 'develop' into 'ent-8200-Conteos-incorrectos-vista-tactica-en-FENIX-en-v758' 
# Conflicts:
#   pandora_console/include/functions_tactical.php
 2021-11-19 08:59:19 +00:00
Daniel Rodriguez 04e6e875b3 Merge branch 'ent-8168-La-vista-tactica-de-metaconsola-no-tiene-en-cuenta-el-propagate-ACL-de-los-grupos' into 'develop' 
fixed propagation in agents count

See merge request artica/pandorafms!4529
 2021-11-18 16:36:55 +00:00
alejandro.campos@artica.es 649fc829fb included secondary groups in tactical count queries 2021-11-18 13:35:27 +01: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
alejandro.campos@artica.es 1fe0523a6a fixed propagation in agents count 2021-11-11 11:07:24 +01:00
alejandro.campos@artica.es e83485ce8c fixed several counts 2021-11-08 18:01:09 +01:00
Daniel Maya b5e5294053 #8184 Fixed tactical get data with secondary group 2021-10-29 11:38:08 +02:00
Calvo a8c0ba8e78 Include modules not init in total monitors count on tactical view 2021-07-19 13:20:00 +02:00
alejandro.campos@artica.es 1c8e73df9d fixed count in several views 2021-04-21 17:11:32 +02:00
Luis Calvo f8d9c00183 Fixed alert detail filter and tactical view counter for disabled alers/agents/modules 2021-03-04 20:15:40 +01:00
Daniel Rodriguez 55f9ab6d57 Merge branch 'ent-5113-Metaconsola-vista-tactica-alertas-disparadas' into 'develop' 
fixed triggered alerts count

See merge request artica/pandorafms!3716
 2021-03-01 10:29:31 +00:00
Daniel Rodriguez 77dfba453a Merge branch 'ent-6505-FENIX-Conteo-vista-tactica-modulos-Performance-vs-Total' into 'develop' 
fixed count in tactical view

See merge request artica/pandorafms!3671
 2021-01-25 10:12:43 +01:00
Jose Gonzalez 579b8d4965 Solve issue and added correct headers 2021-01-14 19:08:01 +01:00
Jose Gonzalez 0ec39bd135 Merge remote-tracking branch 'origin' into ent-6503-vista-tactica-numero-alertas 2021-01-14 13:39:45 +01:00
José González 02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php
 2020-12-23 06:48:22 +01:00
alejandro-campos 4d8a686ae7 fixed triggered alerts count 2020-12-11 11:40:01 +01:00
Jose Gonzalez 20492e5c58 Modified query for show only available alerts 2020-11-30 14:45:13 +01:00
alejandro-campos 46cefd425d fixed count in tactical view 2020-11-30 13:22:45 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Luis Calvo 78df603c07 Fixed alert count bug on tactical view 2020-11-11 17:07:03 +01:00
Daniel Maya 8572540f9a Ent 3977 conteo módulos de agente con grupos secundarios 2020-01-07 10:57:44 +01:00
alejandro-campos 058abdd552 Add condition in tactical view to exclude disabled alerts from count of triggered alerts 2019-06-26 17:17:56 +02:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
fermin831 c88e6e703a [Secondary groups] Fixed duplicated agents in group view and agent detail 2018-04-04 11:17:08 +02:00
daniel 5d61ff5056 fixed error in ACL 2018-01-12 14:17:48 +01:00
Daniel Maya d75511ba92 Fixed module counter 2017-07-03 12:58:36 +02:00
daniel 528a2bc957 fixed error count agents disabled 2016-12-21 09:29:45 +01:00
Arturo Gonzalez 921a79bd30 Fixed error when a user havent profiles and is acl strict. Ticket #3555 2016-05-25 16:04:06 +02:00
Arturo Gonzalez a82966af5a Fixed problems with strict acl in tactical view. Ticket#3440 2016-03-03 09:33:54 +01:00
Arturo Gonzalez 2479852e39 Fixed php error in tactical view when user hace strict acl. Ticket#3411 2016-03-01 13:48:03 +01:00
mdtrooper a1c28937bd Fixed the tactical with empty (in acl) users. TICKET: #3148 2016-01-22 13:10:45 +01:00
Arturo Gonzalez 612fa259f4 Fixed facke data in tactical view meta. Ticket#3072 2015-12-30 16:04:38 +01:00
Arturo Gonzalez 2711d1229c Fixed some things. Ticket#3072 2015-12-29 09:47:10 +01:00
m-lopez-f 858e3ea202 Fixed problems with performance. Tiquet: #2970 
(cherry picked from commit a57f62e5bf)
 2015-11-18 16:32:20 +01:00