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

5147 Commits

Author SHA1 Message Date
fbsanchez
fc0b605cee Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios 2021-06-21 12:13:46 +02:00
fbsanchez
1f34cf8596 Massive operation over service elements 2021-06-18 15:36:52 +02:00
marcos
56b6418716 add not condition filter 2021-06-17 15:04:21 +02:00
marcos
dff7220be9 add not condition filter 2021-06-17 14:59:43 +02:00
fbsanchez
94cd4c96dd Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/javascript/pandora_ui.js
 2021-06-14 17:37:01 +02:00
fbsanchez
cdad04f9cd Update the DB schema when upgrading from RPMs. 
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
 2021-06-14 11:56:42 +00:00
marcos
0cfb7c994f fixed merge conflict 2021-06-14 11:02:57 +02:00
marcos
ee4a3dc450 fixed merge conflict 2021-06-14 10:52:50 +02:00
marcos
5162864b28 fixed merge conflict 2021-06-14 09:03:17 +02:00
marcos
0ab343e672 merge conflict 2021-06-14 08:26:33 +02:00
fbsanchez
ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00
Marcos Alconada
665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
Daniel Barbero Martin
a9864f7d87 Wip command center, clean functions db 2021-06-10 08:45:50 +02:00
Daniel Rodriguez
4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'" 
This reverts merge request !4132
 2021-06-09 18:09:43 +02:00
Marcos Alconada
2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
alejandro.campos@artica.es
240efc4dcf truncate string 2021-06-08 16:48:01 +02:00
alejandro.campos@artica.es
fdc6d2f4c8 implemented capacity to handle string data for event data 2021-06-08 16:09:37 +02:00
Daniel Barbero Martin
8b7c5c08c6 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-07 08:32:15 +02:00
Calvo
2f3cae8d61 Fixedd XSS on load filter event name 2021-06-04 13:36:32 +02:00
Marcos Alconada
3bc2844b4d fixed visual error black theme 2021-06-04 11:03:35 +00:00
Daniel Rodriguez
d11ddfe059 Merge branch 'ent-7342-Bug-en-busqueda-de-usuarios' into 'develop' 
fixed bug in users search

See merge request artica/pandorafms!4085
 2021-06-04 07:49:56 +00:00
Daniel Barbero Martin
ca59034cf3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-04 08:13:20 +02:00
Jose Gonzalez
08c945d91d Fixed missed buttons, improve code and added go back button when create-update 2021-06-03 15:37:11 +02:00
Daniel Rodriguez
5040b4b265 Merge branch 'ent-7602-XSS-nombre-consolas-visuales' into 'develop' 
Improved code and fix xss vulnerability

Closes pandora_enterprise#7602

See merge request artica/pandorafms!4157
 2021-06-03 11:37:15 +00:00
Daniel Barbero Martin
ea90a61b06 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-02 18:27:15 +02:00
alejandro.campos@artica.es
9513386ff7 prevent nonadmin users from viewing admin users in pandora search 2021-06-02 12:47:55 +02:00
fbsanchez
70b8eb77a3 Remove service elements when removing items itselves and multiple fixes 2021-06-01 12:12:07 +02:00
Daniel Barbero Martin
d88520f752 Wip command center 2021-05-28 14:32:41 +02:00
Daniel Barbero Martin
8c7654cd2d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/godmode/setup/os.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/users/user_edit.php
 2021-05-28 08:26:19 +02:00
Daniel Rodriguez
3f8d3a883f Merge branch 'ent-7002-Revision-cabeceras-tabs' into 'develop' 
Ent 7002 revision cabeceras tabs

Closes pandora_enterprise#7002

See merge request artica/pandorafms!4094
 2021-05-27 16:21:48 +00:00
Luis
6681d9fd67 Integria tickets table visual fix 2021-05-27 16:21:17 +00:00
José González
3aee7e7c4d Improved code and fix xss vulnerability 2021-05-27 14:55:01 +02:00
marcos
c4c772032a add help string on status monitor not condition 2021-05-26 10:35:35 +02:00
José González
e7b59ab472 Added standarized headers 2021-05-26 10:16:23 +02:00
Daniel Barbero Martin
d91e7f6aba Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-26 08:28:42 +02:00
Daniel Rodriguez
96741c1864 Merge branch 'ent-7246-icono-vista-informes-y-custom-graphs' into 'develop' 
Fixed view icon on report and custom graphs

See merge request artica/pandorafms!4002
 2021-05-25 15:53:05 +00:00
Daniel Barbero Martin
6b248da428 Wip command center 2021-05-25 17:39:21 +02:00
José González
76628117fa Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs' 
# Conflicts:
#   pandora_console/operation/messages/message_edit.php
 2021-05-25 13:50:17 +00:00
Daniel Maya
e6713c2f2c #6917 metaconsole config changes 2021-05-25 09:58:18 +00:00
Daniel Barbero Martin
337450a1f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/ajax.php
	pandora_console/extras/delete_files/delete_files.txt
 2021-05-24 17:41:28 +02:00
Daniel Barbero Martin
0b36853553 Wip command center 2021-05-24 17:35:15 +02:00
Junichi Satoh
362855a24e Fixed to follow ACL with get_agents_group_json. 2021-05-24 18:56:18 +09:00
José González
d3bd24fc18 Fixed some errors and fixed issue finding policies 2021-05-24 11:01:50 +02:00
fbsanchez
538e7beb48 Public access using PublicLogin interface 2021-05-19 11:57:17 +02:00
fbsanchez
09ccaf254e Fixed public access and added PublicLogin interface, including code style fixex 2021-05-19 11:31:52 +02:00
Daniel Barbero Martin
3eba993c5c Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-19 08:36:26 +02:00
Daniel Barbero Martin
ec6cb4d532 fix category, Os, tags, user_edit synch 2021-05-18 10:57:21 +02:00
fbsanchez
9666b76fa9 Common requirements using base url 2021-05-18 10:56:40 +02:00
Daniel Rodriguez
b8fe685028 Merge branch 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' into 'develop' 
implemented user level authentication for integria ims integration

See merge request artica/pandorafms!4117
 2021-05-17 14:41:11 +00:00
alejandro.campos@artica.es
663d1dcf75 minor fix 2021-05-17 13:43:20 +02:00