Commit Graph

93 Commits

Author SHA1 Message Date
alejandro.campos@artica.es 8b57e1dfb4 fixed permissions in selectors 2022-06-01 14:00:33 +02:00
fbsanchez deb46436d3 Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas
Conflicts:
	pandora_console/extras/mr/52.sql
2022-02-23 12:11:44 +01:00
Calvo 5ba7b47b85 Merge remote-tracking branch 'origin/develop' into ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad 2022-02-18 09:26:55 +01:00
fbsanchez 9ba2eb0c74 Merge remote-tracking branch 'origin/develop' into ent-8161-deshabilitar-reglas-de-autoconfiguracion-en-nodos-a-demanda
Conflicts:
	pandora_console/extras/mr/52.sql
	pandora_console/pandoradb.sql
2022-02-10 18:52:51 +01:00
José González fc4b702db0 Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs'
# Conflicts:
#   pandora_console/godmode/alerts/configure_alert_template.php
2022-02-08 11:35:01 +00:00
Calvo 11dc743dac Planned downtime copy. 2022-01-28 10:59:08 +01:00
Calvo 0b119af949 WIP:Planned downtime copy. 2022-01-27 18:24:14 +01:00
Calvo a92fe64b64 WIP:Planned downtime copy. 2022-01-27 18:23:07 +01:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
Daniel Rodriguez 0f82255904 Merge branch 'ent-8421-extension-antigua-backups' into 'develop'
Ent 8421 extension antigua backups

Closes pandora_enterprise#8421

See merge request artica/pandorafms!4614
2022-01-11 10:10:29 +00:00
Daniel Rodriguez e1a1281985 Merge branch 'ent-8363-edicion-de-paradas-planificadas' into 'develop'
Fix module edidtion on alerts only planned downtime

See merge request artica/pandorafms!4608
2022-01-05 12:33:11 +00:00
Jose Gonzalez 1e92ad99ad Fix merge 2022-01-05 11:14:04 +01:00
Calvo d8ab5c1e7f Fix module edidtion on alerts only planned downtime 2022-01-03 11:42:06 +01:00
Calvo e4804db8cb Planned downtime monthly same day on different hours fix 2021-12-29 18:27:18 +01:00
Junichi Satoh 5fcf3eca23 Fixed problems in planned downtime below.
- modules cannot be added to defined planned downtime with 'Quiet' mode.
- pending modules for delete can be selected when modify defined planned downtime.
2021-06-08 14:43:43 +09:00
Luis f25256a74d Unified downtime name as scheduled downtime 2021-05-10 09:06:43 +00:00
alejandro.campos@artica.es 88b4b4920f Merge remote-tracking branch 'origin/develop' into ent-5276-AADCM-creacion-de-paradas-planificadas 2021-03-15 12:13:05 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
alejandro.campos@artica.es 5c3b5d2be0 minor fixes in scheduled downtime setup 2021-03-10 13:02:17 +01:00
alejandro.campos@artica.es b117bbfd7e Refactored downtime editor 2021-03-04 16:27:14 +01:00
Daniel Rodriguez b2ed2f5511 Merge branch 'ent-6833-planned-downtimes-any-no-funciona' into 'develop'
Fix issue with adding agents and modules

Closes pandora_enterprise#6833

See merge request artica/pandorafms!3723
2021-03-01 10:05:59 +00:00
Jose Gonzalez 7cfc1d2f9a Fixed issue with all modules 2021-02-25 16:08:02 +01:00
alejandro-campos 366d02f203 Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-14 09:22:06 +01:00
Jose Gonzalez dc5a0eb5b9 Fix issue with adding agents and modules 2020-12-14 17:33:58 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
fbsanchez 146f3b44d9 Merge remote-tracking branch 'origin/develop' into ent-3653-finalizacion-de-paradas-planificadas-al-dia-siguiente-de-su-comienzo 2020-11-26 11:30:39 +01:00
alejandro-campos def59508ae changed behavior of all group acl check and fixed acl vulnerabilities 2020-10-22 12:00:44 +02:00
fbsanchez 42cca865ac groups_get_children and propagate update 2020-10-21 11:38:57 +02:00
fbsanchez 5a5fb6eeea Allow define time start greater than time end in weekly planed downtimes 2020-10-07 14:49:46 +02:00
fbsanchez 5d63bc547e Group selection review 2020-09-29 14:22:58 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00
Luis Calvo 33d26144f1 Fixed planned downtime acl 2019-10-22 16:00:01 +02:00
manuel ada49966e0 Merge branch 'develop' into ent-3468-Ayudas_online
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
2019-05-21 10:05:06 +02:00
Daniel Maya b508e40a73 Changed simple quote in alerts
Former-commit-id: 48f06d79b9f6e93ba2164d8da6240f28cc4f785c
2019-05-14 11:11:27 +02:00
Daniel Barbero Martin ac41e9255f helpers
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53:18 +02:00
artica b3da2803a4 Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
fermin831 d663553e8d [Rebranding] Open godmode/agentes 2018-05-10 13:08:34 +02:00
KIKUCHI Koichiro 022eddf43f Make change of "modules selection mode" updates module list 2018-03-01 19:56:38 +09:00
Daniel Maya 32fa42a378 Added modules selection mode 2017-09-08 12:32:21 +02:00
Arturo Gonzalez f467d6d466 Fixed groups select width 2017-05-29 14:31:46 +02:00
Arturo Gonzalez a916844f70 Changed elements colocation in planned downtime elements 2017-05-03 17:24:33 +02:00
Arturo Gonzalez 055ab9040d Added buttonpanel to set today in planned downtime datepicker 2017-04-11 16:34:07 +02:00
Daniel Maya d39b108c1f Merge branch 'develop' into feature/alias_freandly_name
Conflicts:
	pandora_agents/unix/pandora_agent
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
	pandora_console/godmode/agentes/agent_manager.php
	pandora_console/godmode/agentes/modificar_agente.php
	pandora_console/godmode/agentes/planned_downtime.editor.php
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/godmode/massive/massive_edit_modules.php
	pandora_console/include/class/Tree.class.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_treeview.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/pandoradb.sql
2017-02-16 16:05:21 +01:00
enriquecd 43abce6393 Fix scheuled downtime recursive filter checkbox ,optional graph watermark #64 2016-10-27 17:30:45 +02:00
enriquecd a70d840ea4 (cherry picked from commit 64486bc896) 2016-10-14 19:03:13 +02:00
Daniel Maya 370f7ff373 Changed agent name 2016-10-03 12:24:15 +02:00
m-lopez-f 581d3835db Fixed acl's permmissions. Ticket #3912 2016-09-08 16:06:12 +02:00
Daniel Maya c24b118398 Fixed allow create planned downtimes in the past. Ticket #3454. 2016-06-22 09:50:43 +02:00