Commit Graph

27490 Commits

Author SHA1 Message Date
artica ace916bc8e Updated version and build strings. 2021-06-10 17:12:11 +02:00
Daniel Rodriguez e0464c70a9 Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'
Ent 7519 cambio de fuentes en la consola a nivel global

See merge request artica/pandorafms!4192
2021-06-10 14:48:21 +00:00
marcos 45667da362 cambio de fuentes css 2021-06-10 16:21:06 +02:00
marcos e75abd1d2f cambio de fuentes css 2021-06-10 16:13:45 +02:00
marcos 4502550353 Merge remote-tracking branch 'origin/develop' into ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global 2021-06-10 13:40:37 +02:00
Daniel Rodriguez 168e191734 Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'
Ent 7519 cambio de fuentes en la consola a nivel global

See merge request artica/pandorafms!4191
2021-06-10 08:19:12 +00:00
Marcos Alconada 665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
marcos e0a7a8a8ee cambio de fuentes css 2021-06-10 09:20:26 +02:00
artica 5ad364cc4a Auto-updated build strings. 2021-06-10 01:00:20 +02:00
Daniel Rodriguez 2aac302edd Merge branch 'revert-d58e9f63' into 'develop'
Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'"

See merge request artica/pandorafms!4189
2021-06-09 16:13:01 +00:00
Daniel Rodriguez 4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'"
This reverts merge request !4132
2021-06-09 18:09:43 +02:00
Daniel Rodriguez d58e9f634a Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'
Ent 7519 cambio de fuentes en la consola a nivel global

See merge request artica/pandorafms!4132
2021-06-09 13:59:29 +00:00
Marcos Alconada 2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
Daniel Rodriguez 95832cd071 Merge branch 'ent-7652-iconos-para-black-theme' into 'develop'
changed icons for black theme

See merge request artica/pandorafms!4186
2021-06-09 13:12:47 +00:00
Marcos Alconada 8814b1f971 changed icons for black theme 2021-06-09 13:12:47 +00:00
Daniel Rodriguez 73f54c3375 Merge branch 'ent-7661-Error-500-al-editar-las-opciones-avanzadas-de-un-informe' into 'develop'
fixed bug

See merge request artica/pandorafms!4185
2021-06-09 12:37:59 +00:00
Daniel Rodriguez 79499204ce Merge branch 'ent-fix-planned-downtime' into 'develop'
Fixed problems in planned downtime

See merge request artica/pandorafms!4181
2021-06-09 10:49:48 +00:00
alejandro.campos@artica.es 13850e52d5 fixed bug 2021-06-09 10:41:45 +02:00
artica 2953870e4f Auto-updated build strings. 2021-06-09 01:00:20 +02:00
marcos 9023adb98c cambio de fuentes css 2021-06-08 17:53:33 +02:00
marcos 91e0750885 cambio de fuentes css 2021-06-08 17:05:36 +02:00
Daniel Rodriguez 4fa8e5cf29 Merge branch 'ent-7617-macro-address-no-funciona-en-modulos-de-red' into 'develop'
Fixed macro address on network server modules

See merge request artica/pandorafms!4170
2021-06-08 10:53:15 +00:00
Luis 72cb359133 Fixed macro address on network server modules 2021-06-08 10:53:15 +00:00
marcos 0c455c1941 cambio de fuentes css 2021-06-08 12:33:45 +02:00
marcos 8f4e4c8cc7 cambio de fuentes css 2021-06-08 10:55:48 +02:00
marcos c7ed8b547a cambio de fuentes css 2021-06-08 10:46:32 +02:00
marcos 6412cd59e8 cambio de fuentes css 2021-06-08 09:45:46 +02:00
marcos 56c3f13c89 cambio de fuentes css 2021-06-08 09:31:18 +02:00
marcos 7882368eae Merge remote-tracking branch 'origin/develop' into ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global 2021-06-08 08:53:10 +02: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
artica a63a4efb71 Auto-updated build strings. 2021-06-08 01:00:20 +02:00
marcos 9761018544 add mr changes and remove setup font token 2021-06-07 13:36:44 +02:00
marcos ce2abf1fb5 add mr changes and remove setup font token 2021-06-07 13:32:56 +02:00
marcos e1e5475f9c Merge remote-tracking branch 'origin/develop' into ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global 2021-06-07 08:55:10 +02:00
artica bc6b4acd8b Auto-updated build strings. 2021-06-07 01:00:19 +02:00
artica 656105cdf0 Auto-updated build strings. 2021-06-06 01:00:14 +02:00
artica 2513693ada Auto-updated build strings. 2021-06-05 01:00:19 +02:00
marcos 430d25a551 merge conflict 2021-06-04 13:21:41 +02:00
Daniel Rodriguez 9070ababed Merge branch 'ent-7472-errores-visuales-black-theme' into 'develop'
fixed visual error black theme

See merge request artica/pandorafms!4095
2021-06-04 11:03:35 +00:00
Marcos Alconada 3bc2844b4d fixed visual error black theme 2021-06-04 11:03:35 +00:00
Daniel Rodriguez 77b05de784 Merge branch 'ent-fix-bulk-alert-operations' into 'develop'
Fixed that restricted users can add/delete all alert templates using bulk alert operations.

See merge request artica/pandorafms!4171
2021-06-04 10:24:51 +00:00
Daniel Rodriguez 90a5a1c1a3 Merge branch 'ent-5785-Nuevo-informe-inventario-de-agentes' into 'develop'
Added new item type in reports

See merge request artica/pandorafms!4133
2021-06-04 09:03:32 +00:00
alejandro.campos@artica.es c9edf8081c excluded report item from templates list 2021-06-04 10:50:06 +02:00
alejandro.campos@artica.es 70946af507 Merge remote-tracking branch 'origin/develop' into ent-5785-Nuevo-informe-inventario-de-agentes 2021-06-04 10:32:45 +02:00
Daniel Rodriguez d11ddfe059 Merge branch 'ent-7342-Bug-en-busqueda-de-usuarios' into 'develop'
fixed bug in users search

See merge request artica/pandorafms!4085
2021-06-04 07:49:56 +00:00
Daniel Rodriguez 8aae3f79be Merge branch 'ent-7650-no-aparecen-graph-buttons' into 'develop'
Fixed missed buttons, improve code and added go back button when create-update

Closes pandora_enterprise#7650

See merge request artica/pandorafms!4169
2021-06-04 07:46:59 +00:00
Junichi Satoh 3563a99703 Fixed that restricted users can see all alert templates. 2021-06-04 16:01:16 +09:00
artica 8976ec4b6e Auto-updated build strings. 2021-06-04 01:00:19 +02:00
Daniel Rodriguez a12c692972 Merge branch 'ent-fix-custom-report' into 'develop'
Fixed custom report

See merge request artica/pandorafms!4167
2021-06-03 15:08:26 +00:00
Jose Gonzalez 08c945d91d Fixed missed buttons, improve code and added go back button when create-update 2021-06-03 15:37:11 +02:00