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

508 Commits

Author SHA1 Message Date
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
Rafael Ameijeiras c5687ee1fd Merge branch 'ent-12511-error-handeling-en-los-clusters-no-es-del-todo-correcto' into 'develop' 
fix error empty clusters pandora_enterprise#12511

See merge request artica/pandorafms!6719
 2023-12-13 16:32:17 +00:00
miguel angel rasteu 77fd03d58a #11495 Fix agent name in module selection 2023-12-12 10:15:37 +01:00
miguel angel rasteu 94256559f1 #11495 Fix agent name in metaconsole module selector 2023-12-11 16:46:19 +01: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
daniel db89c72be5 fix error empty clusters pandora_enterprise#12511 2023-11-29 16:00:46 +01:00
Rafael Ameijeiras 60d9fffe22 Merge branch 'ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente' into 'develop' 
Ent 12137 propuesta de refactoring visual de vista ppal de agente

See merge request artica/pandorafms!6520
 2023-11-29 14:26:53 +00:00
alejandro.campos@artica.es 7240bbf934 implement demo data load 2023-11-29 09:00:45 +01:00
Matias Didier d544ef4ac5 Merge branch 'ent-8686-13248-anadir-buscador-de-grupos-en-agent-management-tree-group-de-metaconsola' into 'develop' 
Ent 8686 13248 anadir buscador de grupos en agent management tree group de metaconsola

See merge request artica/pandorafms!6539
 2023-11-27 12:24:22 +00:00
miguel angel rasteu cac31cc482 #12137 Resolve conflicts 2023-11-27 13:05:43 +01:00
alejandro.campos@artica.es a1916dc4b9 implement demo data load 2023-11-24 12:56:21 +01:00
Daniel Cebrian b241200be6 #12251 check if enterprise is installed in open 2023-11-14 10:46:06 +01:00
Daniel Cebrian e38246521d #12251 added info in security in agent contact 2023-11-14 09:33:04 +01:00
miguel angel rasteu 88f1b964e3 Merge branch 'develop' into ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente 2023-11-02 15:22:57 +01:00
alejandro.campos@artica.es 1fd45fb95f implement demo data feature 2023-10-26 19:05:07 +02:00
miguel angel rasteu 049e25f866 #8686 Add filter in managemnet tree group 2023-10-06 13:51:18 +02:00
Alejandro Campos 0f381b0db7 Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada' 
# Conflicts:
#   pandora_console/extras/mr/66.sql
 2023-10-03 13:11:09 +00:00
miguel angel rasteu 384a66dc0d #12137 Fix refact 2023-10-03 09:35:10 +02:00
miguel angel rasteu 340288d785 #12137 visual refactoring for main agent view 2023-10-02 15:25:24 +02:00
Daniel Rodriguez 05cd8142bf Merge branch 'ent-11471-integracion-pandora-integria' into 'develop' 
wip integration integriaIMS pandora_enterprise#11471

Closes pandora_enterprise#11471

See merge request artica/pandorafms!6131
 2023-09-28 10:05:15 +00:00
daniel 91393c9e39 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/include/styles/pandora.css
 2023-09-25 17:06:08 +02:00
daniel f46626e120 refactor cluster view pandora_enterprise#12032 2023-09-21 10:21:45 +02:00
alejandro.campos@artica.es ae74caf7b1 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:52:56 +02:00
Jorge Rincon 764d5908bb Merge branch 'develop' into ent-10065-post-filtros-de-eventos-privados 2023-09-11 10:58:37 +02:00
alejandro.campos@artica.es 318fa38721 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-07 17:44:51 +02:00
alejandro.campos@artica.es f8911bcf9c implemented os version management 2023-09-06 17:00:16 +02:00
daniel a7baab0aba Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-24 12:07:32 +02:00
rafael 27e37f6897 11944 adding patch 773.2 changes on develop 2023-08-24 12:04:27 +02:00
daniel dca15b5637 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-23 18:54:01 +02:00
Pablo Aragon 45c15acf8e 11930-Remove in pandora_db.pl integrity & functions_agents.php 2023-08-23 14:46:55 +02:00
Pablo Aragon 120298e6a3 11930-Remove in pandora_db.pl integrity & functions_agents.php 2023-08-23 14:00:35 +02:00
daniel 7f82273dc4 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/65.sql
 2023-08-09 08:59:01 +02:00
Daniel Maya 0534f59f92 #10147 optimize group search 2023-08-04 15:08:57 +02:00
daniel 3e2c2990df Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-20 08:28:36 +02:00
daniel 5cf31fc77e ITSM fixed pandora_enterprise#11471 2023-07-19 11:36:03 +02:00
Rafael Ameijeiras ab94dbba4c Merge branch 'ent-9785-14479-widgets-en-dashboard-no-se-actualizan-de-forma-recursiva-con-el-borrado-de-agentes' into 'develop' 
Clean deleted agents from dashboards, reports, etc

See merge request artica/pandorafms!6171
 2023-07-18 08:01:49 +00:00
Rafael Ameijeiras f5f86c9fa2 Merge branch 'ma2sim-develop-patch-81134' into 'develop' 
Change return value of function agents_get_agent_id_by_alias when alias is ''

See merge request artica/pandorafms!5498
 2023-06-29 08:35:28 +00:00
Matias Didier 3bbb0cb233 Merge branch 'ent-11404-15690-ordenar-interfaces-correctamente' into 'develop' 
Ent 11404 15690 ordenar interfaces correctamente

See merge request artica/pandorafms!6008
 2023-06-26 12:05:29 +00:00
Rafael Ameijeiras d37c0f3d79 Merge branch 'ent-11599-item-grouped-group-report-muestra-la-informacion-de-todos-los-nodos-en-metaconsola' into 'develop' 
Ent 11599 Item "Grouped group report" muestra la información de todos los nodos en metaconsola

See merge request artica/pandorafms!6126
 2023-06-26 07:50:29 +00:00
Calvo 40ea25eeea Clean deleted agents from dashboards, reports, etc 2023-06-22 18:52:06 +02:00
Daniel Cebrian 9e6130ddfb #11599 fixed grouped reports in meteaconsole 2023-06-16 10:23:37 +02:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
miguel angel rasteu eba2e0d9f1 #11404 Fix order sql query 2023-05-31 15:39:06 +02:00
Daniel Cebrian 90f0c3771f #10324 fixed deleted element fav menu 2023-03-13 17:21:28 +01:00
Daniel Cebrian 3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +01:00
daniel 5d7738a05e Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/operation/events/events.php
 2023-03-03 08:20:44 +01:00
Daniel Cebrian 08fb4e3396 #10324 fixed delete element in favmenu 2023-02-27 10:07:35 +01:00