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

378 Commits

Author SHA1 Message Date
Jonathan 4154f5b0c4 #13545 Change permisions menu servers just PM 2024-04-15 12:43:39 +02:00
Jonathan 7a553a2ae9 #13294 acl add files_repo 2024-04-12 09:21:22 +02:00
Jonathan 4bf872cdc2 #13377 change name setings menu 2024-04-08 14:35:06 +02:00
Rafael Ameijeiras 9ef311cd84 Merge branch 'ent-13150-ocultar-seccion-de-omnishell' into 'develop' 
Ent 13150 ocultar seccion de omnishell

See merge request artica/pandorafms!7075
 2024-03-27 08:40:53 +00:00
Jonathan 1bd402d04c #13119 load_modal oncloseescape option & remove x welcomewindow 2024-03-25 12:20:39 +01:00
Jonathan 5848142fcb Merge branch 'develop' into ent-12997-eliminar-sistema-de-skins 2024-03-25 10:44:04 +01:00
Jonathan 752aa71ecf #13150 hide omnishell 2024-03-25 09:20:00 +01:00
Daniel Cebrian 62dc85248e Merge branch 'develop' into ent-12905-deprecar-eliminar-discovery-legacy 2024-03-19 17:32:47 +01:00
Jonathan 9fc77e69b2 Merge branch 'develop' into ent-12997-eliminar-sistema-de-skins 2024-03-19 10:51:15 +01:00
Daniel Maya 64d2c52d95 #12714 Fixed traslations 2024-03-12 10:01:07 +01:00
Jonathan d7fb3c937d #12997 remove skins section 2024-03-11 16:58:42 +01:00
Daniel Cebrian 57a7774075 Merge branch 'develop' into ent-12905-deprecar-eliminar-discovery-legacy 2024-03-04 10:11:42 +01:00
daniel 9771639318 Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 
Conflicts:
	pandora_console/extras/mr/68.sql
	pandora_console/pandoradb.sql
 2024-02-27 17:27:10 +01:00
Daniel Cebrian 0dd3d14d30 #12905 deprecated discovery legacy 2024-02-21 17:33:48 +01:00
Jonathan e6e98aeb39 Merge branch 'develop' into ent-12695-16818-eliminar-warnings-en-console-log 2024-02-15 09:08:25 +01:00
Enrique Martin cb63c27d2a Merge branch 'ent-12687-sistema-import-export-prd' into 'develop' 
Ent 12687 sistema import export prd

See merge request artica/pandorafms!6874
 2024-02-14 12:11:16 +00:00
Jonathan 2246fd8049 #12695 WIP warnings 2024-02-07 16:39:33 +01:00
daniel 8cfb04d243 new api 2.0 2024-02-07 08:53:54 +01:00
Jonathan b026a248e3 #12805 ipam change permisions AW/PM 2024-01-31 15:40:44 +01:00
Daniel Maya 95f8519d5d #12687 Added import/export prd 2024-01-22 17:22:23 +01:00
Pablo Aragon 40d1efac11 12320-Welcome wizard new styles, fix in Configuration->Configuration Wizard 2024-01-11 11:39:14 +01:00
Alejandro Campos c700633fce Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo' 
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
 2023-12-18 10:54:27 +00:00
daniel 3cb4b5cce4 Merge remote-tracking branch 'origin/develop' into ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/67.sql
	pandora_console/operation/menu.php
 2023-12-14 11:21:51 +01:00
Rafael Ameijeiras d072187a2c Merge branch 'ent-12605-vista-de-agentes-error-500-en-develop' into 'develop' 
fix error 500 and warnings pandora_enterprise#12605

See merge request artica/pandorafms!6738
 2023-12-11 14:27:39 +00:00
Rafael Ameijeiras ce298c1e8f Merge branch 'ent-12353-URL-de-Pandora-RC-en-Pandora-FMS-continua-siendo-ehorus-en-el-Setup' into 'develop' 
change url pandorarc name

See merge request artica/pandorafms!6649
 2023-12-11 08:24:46 +00:00
Alejandro Campos 0bdc6978e6 Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo' 
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
 2023-12-05 15:30:06 +00:00
alejandro.campos@artica.es d601103df3 fix url 2023-12-05 11:49:43 +01:00
daniel 1d36d8a436 fix error 500 and warnings pandora_enterprise#12605 2023-12-05 09:14:02 +01:00
daniel 5bd689500c move extension translate_string and file_repo pandora_enterprise#12333 2023-11-28 11:06:39 +01:00
daniel 3f3e8e42bc move extension translate_string and file_repo pandora_enterprise#12333 2023-11-28 08:13:00 +01:00
Rafael Ameijeiras 707f85ed7f Merge branch 'ent-11511-cambiar-el-apartado-de-tools-a-seccion-management' into 'develop' 
Ent 11511 cambiar el apartado de tools a seccion management

See merge request artica/pandorafms!6403
 2023-11-27 14:36:38 +00:00
alejandro.campos@artica.es a1916dc4b9 implement demo data load 2023-11-24 12:56:21 +01:00
alejandro.campos@artica.es d6bffbade1 implement demo data load 2023-11-20 16:52:49 +01:00
alejandro.campos@artica.es 1fd45fb95f implement demo data feature 2023-10-26 19:05:07 +02:00
Daniel Rodriguez 1f8554e8d1 Merge branch 'ent-11914-editor-de-alertas-de-logs' into 'develop' 
Ent 11914 editor de alertas de logs

See merge request artica/pandorafms!6505
 2023-10-23 12:34:32 +00:00
Rafael Ameijeiras dda7c2a0c0 Merge branch 'ent-12205-interfaz-configuracion-ehorus-pandora-rc-a-nivel-de-usuario-ha-desaparecido' into 'develop' 
Ent 12205 interfaz configuracion ehorus pandora rc a nivel de usuario ha desaparecido

See merge request artica/pandorafms!6544
 2023-10-11 07:18:34 +00:00
alejandro.campos@artica.es 10d94daf30 Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual 2023-10-10 11:09:53 +02:00
miguel angel rasteu 133826b498 #12205 Fix ehorus conf interfaz 2023-10-10 09:57:09 +02:00
Daniel Maya 030ffc55f9 resolved conflict 2023-10-06 09:15:38 +02:00
Calvo bfe9bcaac0 Merge remote-tracking branch 'origin/develop' into ent-11607-migracion-de-discovery-bajo-demanda 2023-09-29 15:18:08 +02:00
alejandro.campos@artica.es 85598d5012 Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual 2023-09-28 16:36:59 +02:00
alejandro.campos@artica.es 3f2caf9404 some gotty changes 2023-09-27 18:28:12 +02:00
Daniel Maya d096fa263d #11914 Added log_alerts 2023-09-27 11:05:06 +02:00
alejandro.campos@artica.es 19a9f82fe1 gotty changes 2023-09-25 19:08:24 +02:00
Calvo a2baea5710 Migration legacy apps to discovery 2.0 2023-09-14 12:24:12 +02:00
miguel angel rasteu bf4ef92610 #11511 Move tools from operation to management 2023-09-04 13:44:44 +02:00
daniel 1a1087e311 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/66.sql
 2023-09-04 08:16:48 +02:00
Gorka Sanchez 0d4a097a48 Merge branch 'ent-10622-anadir-acciones-sobre-alertas-y-alertas-externas-en-politicas-de-manera-masiva' into 'develop' 
Ent 10622 anadir acciones sobre alertas y alertas externas en politicas de manera masiva

See merge request artica/pandorafms!6331
 2023-08-31 06:48:45 +00:00
daniel 98a5355c94 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 13:33:35 +02:00
Jonathan df91ea25b5 #10622 massive policies alerts and external 2023-08-11 09:18:50 +02:00