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

567 Commits

Author SHA1 Message Date
fbsanchez
b701b2be32 Plugin sync 2021-06-16 15:53:05 +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
4db0f75763 Refresh & delete collections Async - synchronization 2021-06-14 14:54:07 +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
fbsanchez
9c314bcd39 Files reviewed & tested 2021-06-11 13:04:06 +02:00
fbsanchez
085e0ba300 Added Files class to handle zip/unzip/rmrf and more 2021-06-11 10:48:58 +02:00
Daniel Barbero Martin
ea90a61b06 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-02 18:27:15 +02:00
fbsanchez
f003c37b09 Changes in disabled method - Module class 2021-06-02 10:05:31 +02:00
fbsanchez
70b8eb77a3 Remove service elements when removing items itselves and multiple fixes 2021-06-01 12:12:07 +02:00
fbsanchez
a98a72354b Controlled unhandled exceptions in index and some fixes in Module class while item is being deleted 2021-06-01 10:04:53 +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
José González
e69f258f8a Fixed issue with webserver modules 2021-05-25 12:50:25 +02: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 Maya
9559a63c3b #7555 fixed module_search with filter 2021-05-19 17:11:41 +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
fbsanchez
3bb615a639 Added method getDBH DBmaintainer 2021-05-10 15:24:33 +02:00
fbsanchez
9d8079ad77 minor method Group 2021-04-21 10:26:33 +02:00
fbsanchez
37e3f68b18 minor fix 2021-04-20 14:08:27 +02:00
fbsanchez
36df48c621 Some improvements in Group class 2021-04-20 11:09:07 +02:00
Daniel Rodriguez
59ec6c850d Merge branch 'ent-6387-limitar-agentes-por-grupo' into 'develop' 
Added control for max agents in groups

Closes pandora_enterprise#6387

See merge request artica/pandorafms!3800
 2021-04-19 07:17:56 +00:00
Jose Gonzalez
a6936f16d5 Cleaned event create control for centralized management 2021-04-15 15:50:10 +02:00
Jose Gonzalez
ff177c544d Modified and adapted Event class 2021-04-15 12:00:00 +02:00
marcos
48cc1283cc add black theme to widget dashboard 2021-04-14 15:09:19 +02:00
marcos
b6ea565118 add black theme to widget dashboard 2021-04-14 12:07:38 +02:00
fbsanchez
5143bbdfdb networkmaps in dashboards MC 2021-04-06 16:47:32 +02:00
fbsanchez
1c94f619ef Custom graphs in widget in MC 2021-04-06 14:20:07 +02:00
fbsanchez
55e272c360 MC dashboards agent_module fixes 2021-04-06 12:53:12 +02:00
fbsanchez
700817acaf Merge branch 'develop' into 'ent-2685-7938-aadcm-dashboards-en-metaconsola' 
Conflicts:
   pandora_console/include/functions_html.php
 2021-03-31 10:12:36 +00:00
Daniel Rodriguez
04483fe9f3 Merge branch 'ent-7210-Bug-en-token-limit-de-widget-List-of-last-events' into 'develop' 
fixed minor error

See merge request artica/pandorafms!3958
 2021-03-29 07:15:32 +00:00
Daniel Rodriguez
316aa0a691 Merge branch 'ent-7222-Bug-en-widget-Defined-custom-graph' into 'develop' 
fixed minor error

See merge request artica/pandorafms!3960
 2021-03-26 11:39:14 +00:00
Daniel Barbero Martin
021675d825 fixed minor error 2021-03-26 11:28:34 +01:00
Daniel Barbero Martin
193d6bf2d2 fixed minor error 2021-03-26 10:37:44 +01:00
Daniel Barbero Martin
8e57e1645c fixed minor error 2021-03-26 10:34:07 +01:00
Daniel Rodriguez
6413f6d551 Merge branch 'ent-4755-base-de-datos-historico-revision' into 'develop' 
DBMainainer, fixed Websockets library placement

See merge request artica/pandorafms!3797
 2021-03-25 14:33:31 +00:00
fbsanchez
7b7ef3a757 minor improvement (err. messages) 2021-03-25 14:25:09 +01:00
fbsanchez
12767683dc minor fixes 2021-03-24 16:25:27 +01:00
fbsanchez
ac1c3398fe Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 2021-03-24 16:05:08 +01:00
fbsanchez
d312f764ed Hack to use old functions from PandoraDB 2021-03-24 13:43:14 +01:00
fbsanchez
0179e89740 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-24 13:16:54 +01:00
Daniel Rodriguez
ce2f4ec7cc Merge branch 'ent-7112-bugs-consola-visual-y-dashboards' into 'develop' 
Command center

See merge request artica/pandorafms!3887
 2021-03-24 11:43:52 +00:00
daniel
774fc9ebe5 Command center 2021-03-24 11:43:51 +00:00
fbsanchez
c3232b0f2a Merge remote-tracking branch 'origin/develop' into ent-7010-nexcon-mejoras-widget-de-eventos 
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php
 2021-03-24 09:55:31 +01:00
Daniel Rodriguez
a7b19bd347 Merge branch 'ent-6865-uniway-funcionalidad-password-en-grupos-no-compatible-con-discovery-plugins-xml' into 'develop' 
Ent 6865 uniway funcionalidad password en grupos no compatible con discovery plugins xml

See merge request artica/pandorafms!3761
 2021-03-22 12:39:59 +00:00
fbsanchez
e0aa1bfc68 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/styles/pandora.css
 2021-03-22 09:59:07 +01:00
Marcos Alconada
d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
fbsanchez
6df9870f92 Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 
Conflicts:
	pandora_console/include/functions_api.php
	visual_console_client/src/Item.ts
 2021-03-11 14:37:06 +01:00
fbsanchez
95f1a2abcc Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2021-03-11 10:00:17 +01:00
daniel
6db07e5fe0 fixed errors CV dashboards 2021-03-03 12:42:02 +00:00
fbsanchez
d96590aea5 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
 2021-03-02 09:40:15 +01:00