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

352 Commits

Author SHA1 Message Date
Alejandro Campos
e909686ddc Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
 2023-03-28 14:09:33 +00:00
Daniel Cebrian
9dea38f440 Merge branch 'develop' into ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos 2023-03-21 09:38:56 +01:00
Daniel Cebrian
ca78f069f6 #9624 added support sflow 2023-03-10 17:12:38 +01:00
alejandro.campos@artica.es
39a119d150 Merge remote-tracking branch 'origin/develop' into ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob 2023-03-10 13:29:20 +01:00
Daniel Cebrian
a4634717d8 Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-07 13:49:39 +01:00
Alejandro Campos
3ddb3c1034 Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
#   pandora_console/pandoradb.sql
 2023-03-03 08:12:57 +00: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
alejandro.campos@artica.es
6c64ccd6d6 implemented consoles management 2023-02-21 15:32:45 +01:00
Daniel Maya
320b87b77e menu bug fixes 2023-02-17 10:10:47 +01:00
Daniel Cebrian
1ab8767c34 #9073 added section welcome tips in menu 2023-02-15 08:56:03 +01:00
Daniel Maya
98f82b4ce8 #9662 Fixed discovery menu 2023-02-13 14:32:02 +01:00
Jose Gonzalez
d45a631ea5 Final merge with new menu 2023-02-13 10:37:37 +01:00
Jose Gonzalez
98736c1ab4 Merge 2023-02-13 10:24:07 +01:00
Daniel Maya
be3c7bca6c resolved conflict 2023-02-10 11:55:45 +01:00
Daniel Maya
758f906616 #9663 menu redesing 4 2023-02-07 15:22:51 +01:00
Jonathan
b88f26500b #9819 Change labels Accoustic console 2023-01-31 08:35:47 +01:00
Jonathan
624463d573 #9819 change setcion menu configuration sound 2023-01-30 08:27:03 +01:00
Calvo
ce224d67ba Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2023-01-13 09:08:17 +01:00
Daniel Cebrian
5fb435796b #10034 fixed option blank in ENTERPRISE ACL SETUP 2023-01-04 12:14:59 +01:00
Pablo Aragon
ab54a26815 9868 Remove footer and create About section 2022-12-29 16:21:36 +01:00
Calvo
2ad8fac652 Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-22 11:35:25 +01:00
KANAYAMA Akihiro
63e649be85 Removed unnecessary escape of ampersand. 2022-12-07 19:25:27 +09:00
jose.gonzalez@pandorafms.com
f2ebd96cc8 WIP: Created new way to do the menus 2022-10-20 09:43:02 +02:00
Calvo
da0dad0148 WIP:Move inventory to open 2022-09-14 18:12:39 +02:00
Daniel Barbero
da0998e7c7 Merge remote-tracking branch 'origin/develop' into ent-7749-mover-operaciones-masivas-sobre-servicios-a-wizard-de-servicios-en-nodo 
Conflicts:
	pandora_console/godmode/menu.php
 2022-09-06 07:52:19 +02:00
edu.corral
3d084c8da9 #9046 move edit os from setup to resources 2022-08-25 14:01:08 +02:00
Daniel Barbero Martin
e5d1145f0a move bulk operations services pandora_enterprise#7749 2022-07-27 11:37:23 +02:00
Daniel Barbero Martin
01ba149280 new console report pandora_enterprise#6367 2022-07-08 13:40:20 +02:00
Daniel Maya
e839d82e00 resolved conflict 2022-07-04 13:40:06 +02:00
José González
b03356cc3c Merge branch 'develop' into 'ent-9089-Mejoras-usabilidad-menu-gestion-eventos' 
# Conflicts:
#   pandora_console/godmode/menu.php
 2022-06-28 14:08:13 +00:00
José González
0784b25ea0 Update Warp strings 2022-06-10 12:56:45 +02:00
José González
815a737a69 Change strings for Update Manager references to WARP update 2022-06-10 10:17:23 +02:00
José González
4aea15228e Fix minor issue 2022-06-03 14:11:57 +02:00
José González
1be4948e2d Changed strings and improve code 2022-06-03 12:26:15 +02:00
fbsanchez
2d334f7860 Historical view for update manager 2022-03-30 14:41:47 +02:00
Jose Gonzalez
32a98ee5ae Regenerate DB Backup Manager 2022-01-05 11:08:49 +01:00
Jose Gonzalez
4924e0d6bc Updated audit logs view and added controller 2021-12-14 12:06:20 +01:00
Calvo
2562a44d94 Fix duplicated ACL setup update manager 2021-11-18 12:25:14 +01:00
Calvo
06fe1552bf Enterprise ACL step 2: Add options fix merge 2021-11-17 17:31:43 +01:00
Calvo
b6e34a2697 erge remote-tracking branch 'origin/develop' into ent-7839-revision-acl-enterprise-parte-2-introduccion-opciones 2021-11-15 18:14:18 +01:00
Daniel Rodriguez
eb9e73ecb0 Merge branch 'ent-7838-revision-acl-enterprise-parte-1-eliminacion-opciones' into 'develop' 
Deleted and reubicated acl options

See merge request artica/pandorafms!4340
 2021-11-15 11:24:50 +00: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
c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
fbsanchez
05a2db88a3 menu fix 2021-10-25 17:01:26 +02:00
Jose Gonzalez
8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
fbsanchez
3662d8b8a0 Added offline entry to menu in community ed 2021-08-11 14:12:49 +02:00
Calvo
9d04933ca2 Added missing sec related to GET params to ACL enterprise 2021-08-06 10:29:38 +02:00
Calvo
9b736d0c48 Deleted and reubicated acl options 2021-07-30 13:49:22 +02:00
Daniel Barbero Martin
64dd4f2c2b Wip command center, Plugins in meta 2021-06-15 17:24:03 +02:00
José González
69e1f1fb33 Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
#   pandora_console/include/styles/pandora.css
 2021-03-09 14:39:15 +00:00