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

142 Commits

Author SHA1 Message Date
José González fc4b702db0 Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs' 
# Conflicts:
#   pandora_console/godmode/alerts/configure_alert_template.php
 2022-02-08 11:35:01 +00:00
Jose Gonzalez d81e6571ec New audit logs 2022-02-01 13:39:18 +01:00
Daniel Maya 8a868c9fde Fixed GIs map 2022-01-26 17:15:39 +01:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55: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 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
Marcos Alconada c57ca2a2b8 fixed error with creation and updating gis maps 2021-04-27 11:44:55 +00:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
alejandro-campos 731d486455 changed behavior of All group and fixed acl vulnerability 2021-01-20 18:22:43 +01:00
alejandro-campos 366d02f203 Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-14 09:22:06 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
 2020-12-14 11:10:35 +01:00
Luis 50b1fa3c56 Changed check connection method to ajax. Check deleted from login 2020-12-03 12:27:55 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Luis 2f2556ef79 Ent 6680 ventana de perdida de conexion incorrecta 2020-11-04 16:41:25 +01:00
alejandro-campos cd52b30eb5 visual fixes 2020-10-22 15:47:39 +02:00
alejandro-campos def59508ae changed behavior of all group acl check and fixed acl vulnerabilities 2020-10-22 12:00:44 +02:00
Luis Calvo d346c76322 Connection error dialog working 2020-06-19 23:03:37 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00
Tatiana Llorente c652f758f4 Changed label agent version for agents with satellite os 2019-11-12 13:06:59 +01:00
manuel ada49966e0 Merge branch 'develop' into ent-3468-Ayudas_online 
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
 2019-05-21 10:05:06 +02:00
Daniel Maya b508e40a73 Changed simple quote in alerts 
Former-commit-id: 48f06d79b9f6e93ba2164d8da6240f28cc4f785c
 2019-05-14 11:11:27 +02:00
manuel 6bd8221bc0 changed helps 
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
 2019-04-29 14:36:02 +02:00
Tatiana Llorente f497d3bd2e Added class to action buttons and moved checkbox to the left side 
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
 2019-04-02 13:42:30 +02:00
Tatiana Llorente 26451c41a1 New design for the tables - #3707 
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
 2019-03-29 11:05:52 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
vgilc 74f4c58693 Merge branch '2584_Visual_en_Mapas_GIS' into 'develop' 
Fixed minor visual error in GIS Map

See merge request artica/pandorafms!1971

Former-commit-id: 6cdaa62ad743a06e6e7f2d0e4026a04f953fcb16
 2018-12-21 10:33:17 +01:00
daniel 494b858a20 fixed errors session_start 2018-11-21 13:08:58 +01:00
samucarc 43629d5c2a Fixed minor visual error in GIS Map 2018-11-14 12:10:38 +01:00
Alejandro Gallardo Escobar 8601e38eed Minor visual improvements for the GIS views 2018-09-13 16:38:17 +02:00
danielmaya 66c8404fcf Fixed agent view in public Visual Console 2018-09-04 11:08:10 +02:00
Alejandro Gallardo Escobar 7da4557abc Added the feature of the new map items (groups) and fixed more bugs 2018-08-17 11:07:42 +02:00
fermin831 e19f116637 Fixed add particular agents to GIS layers 2018-06-22 13:33:04 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
Alejandro Gallardo Escobar e77b9f35b6 Improved the help of the WMS server connection creation 2018-05-08 17:29:58 +02:00
Alejandro Gallardo Escobar e1319cb584 Improved the GIS map screen 2018-05-08 10:07:33 +02:00
Alejandro Gallardo Escobar cc06dfe876 Added a new GIS map source type called WMS 2018-04-27 12:17:42 +02:00
Alejandro Gallardo Escobar 1fbc8f01cc Added the alerts fired to the popup of the agent selected into the GIS map 2018-04-10 11:04:29 +02:00
Alejandro Gallardo Escobar 1dc8fec69a Added the number of not validated & critical events to the popup of the agent selected into the GIS map 2018-04-09 13:47:29 +02:00
Daniel Maya 5df61b95b9 Fixed issue in public console 2017-08-07 11:30:49 +02:00
vgilc 9c534ce2dc Merge branch '1127-Elementos-desplazados-en-mapas-GIS-con-Google-maps-dev' into 'develop' 
Expand layer

See merge request !685
 2017-07-28 10:24:44 +02:00
Daniel Maya b4765a0a9a Expand layer 2017-07-21 12:19:56 +02:00
Daniel Maya 5fd6c03917 Change agent name by alias in gis map 2017-07-19 12:32:45 +02:00
fermin831 1cf87e7753 Fixed PHP 5.3 compatibility on GIS maps 2017-03-03 10:50:17 +01:00
Arturo Gonzalez 8bae65b4a2 Fixed gis map agents name when refresh map. Ticket #395 2017-03-01 09:20:28 +01:00
Alejandro Gallardo Escobar 3d8af42834 Changed the agent name by its alias 2017-02-22 16:43:28 +01:00
fermin831 d16138c68e Modified GIS Maps to print OpenMaps on empty google license 2017-02-21 18:48:50 +01:00
Arturo Gonzalez af3d8d8d24 Removed reference to fail gis map connection. Ticket #3967 2016-10-20 12:16:51 +02:00
m-lopez-f 581d3835db Fixed acl's permmissions. Ticket #3912 2016-09-08 16:06:12 +02:00
mdtrooper f253a16d9b Rewrote some parts the GIS to adapt from pandora v3 to newest versions. TICKET: #3170 2016-01-19 13:21:18 +01:00
m-lopez-f c20ba9023f Delete check f acl in gis map. Tiquet: #2989 
(cherry picked from commit 9455d54a76)
 2015-11-25 16:47:19 +01:00