manuel
|
46089b31a8
|
Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch
Conflicts:
pandora_console/install.php
Former-commit-id: 3dee86da8f6b6b1c2caa5e6e1529acd7f60c1433
|
2019-02-28 13:36:18 +01:00 |
artica
|
a8a9a9d620
|
Auto-updated build strings.
Former-commit-id: 2c0ee9351e5f306085921bde697a1b10de102b2e
|
2019-02-28 00:01:32 +01:00 |
artica
|
26560c734c
|
Updated version and build strings.
Former-commit-id: 39df6ee0aee9f29c9afb8729f9e95b316ca8cd67
|
2019-02-27 11:25:50 +01:00 |
samucarc
|
9f92f3f010
|
Fixed
Former-commit-id: 4fc7d9a22dd2a59501cd7ffc7539c431d37512a8
|
2019-02-27 10:35:40 +01:00 |
|
samucarc
|
8f24c0cb18
|
Fixed conflict in CLI apply_policy
Former-commit-id: ab512d9c2b88cd7042d6ae065251cd116b2ea5af
|
2019-02-27 10:28:36 +01:00 |
|
artica
|
65b89f6688
|
Auto-updated build strings.
Former-commit-id: 59e3d47f8cc8c9fedb86f0ba6fd7fe183cb908b8
|
2019-02-27 00:01:47 +01:00 |
|
manuel
|
c886dd1dfa
|
Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch
Conflicts:
pandora_console/include/functions_html.php
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: 5cd5899c222ba13ec9bfa0212e5d2ec580353787
|
2019-02-26 12:31:37 +01:00 |
|
manuel
|
875d7ecaba
|
Unified sizes of the checkbox switch
Former-commit-id: f6f8eca748f67fdf1e4a98256c3ca590b61328ac
|
2019-02-26 12:04:18 +01:00 |
|
artica
|
88202977fa
|
Auto-updated build strings.
Former-commit-id: e3e3a3aba908a64a4743bd8b18337510e0c6e609
|
2019-02-26 00:01:57 +01:00 |
fbsanchez
|
510833eaf1
|
Merge remote-tracking branch 'origin/develop' into ent-3430-discovery
Former-commit-id: 418593106602da6aa270905e478e25b50a8f5ebd
|
2019-02-25 10:47:46 +01:00 |
|
artica
|
9753faa17a
|
Auto-updated build strings.
Former-commit-id: 01fee147745dfd638487449f20211abd8e83b71e
|
2019-02-25 00:01:36 +01:00 |
|
artica
|
a49f68e96b
|
Auto-updated build strings.
Former-commit-id: ee007a4042fe893b73e088abd7a7b6cd0bdc45d2
|
2019-02-24 00:01:50 +01:00 |
|
artica
|
febe2cc3a6
|
Auto-updated build strings.
Former-commit-id: 4f687af81ee7ab9541649e5f395c2e2aaf359609
|
2019-02-23 00:02:37 +01:00 |
|
fbsanchez
|
b1aa0fe2f2
|
Merge from develop
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
|
2019-02-22 12:30:27 +01:00 |
|
artica
|
b1149a053b
|
Auto-updated build strings.
Former-commit-id: f642e8fe029c7df7a017abe433d7768acd8577fd
|
2019-02-22 00:01:38 +01:00 |
|
artica
|
1156b29743
|
Auto-updated build strings.
Former-commit-id: f760ca3d8b53ad47017d82e6bc2fbb298a69312b
|
2019-02-21 00:01:55 +01:00 |
|
artica
|
53a41a7a56
|
Auto-updated build strings.
Former-commit-id: f44eb5d91d85be5ebfaf5fe25cea0fdb40b874f3
|
2019-02-20 00:01:26 +01:00 |
|
artica
|
2b3a72e938
|
Auto-updated build strings.
Former-commit-id: cf3f4af9caa5c9c435adf672e8c620b4b173f3cc
|
2019-02-19 00:01:28 +01:00 |
daniel
|
5411b83ceb
|
Merge remote-tracking branch 'origin/develop' into 3404-Mejoras_y_arreglos_en_la_instalación_de_la_consola
Conflicts:
pandora_console/install.php
Former-commit-id: 9d1616cab554029cb90f7c0e89276124589e2867
|
2019-02-18 16:55:09 +01:00 |
Tatiana Llorente
|
582b8a70da
|
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
Conflicts:
pandora_console/install.php
Former-commit-id: 0c97025f2425b1048efd1447a56ea9e2062b3b13
|
2019-02-18 09:22:48 +01:00 |
|
artica
|
0ef118f401
|
Auto-updated build strings.
Former-commit-id: 2e217d82f2119ffdca6218a233fa8eeb743c3fb0
|
2019-02-18 00:01:24 +01:00 |
|
artica
|
1fafda8502
|
Auto-updated build strings.
Former-commit-id: affb7e6fc134d1ae80be0450f759a30960b177fd
|
2019-02-17 00:01:24 +01:00 |
|
artica
|
0d93ccc094
|
Auto-updated build strings.
Former-commit-id: 8789c127ad23a066317bd86d0bfe456dd4a3ec38
|
2019-02-16 00:01:31 +01:00 |
|
Tatiana Llorente
|
a20d7b9ce1
|
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
Conflicts:
pandora_console/install.php
Former-commit-id: ef2b7fb631fab61bcb5e21b0632f02a3af451045
|
2019-02-15 12:10:49 +01:00 |
|
artica
|
cd83f324a1
|
Auto-updated build strings.
Former-commit-id: 3efb9b48fb3cc1021d0b3e7752c3cd1607e863a5
|
2019-02-15 00:01:26 +01:00 |
|
fbsanchez
|
2059614ba2
|
missed install...
Former-commit-id: a2e1bc42354612afde7e1a28845348f41eab7509
|
2019-02-14 17:20:00 +01:00 |
|
fbsanchez
|
3995874176
|
WIP: H&D: merge
Former-commit-id: c1e04b80a49fb0a9870676dc8f59732cd595fbc0
|
2019-02-14 17:19:20 +01:00 |
|
Tatiana Llorente
|
f849c2b0f0
|
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
Conflicts:
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: d74f5cb5c6ff0cc05542e63d1f8537f289eebfc8
|
2019-02-14 16:41:17 +01:00 |
|
Daniel Barbero
|
52bf8befd2
|
Merge remote-tracking branch 'origin/develop' into 3404-Mejoras_y_arreglos_en_la_instalación_de_la_consola
Conflicts:
pandora_console/install.php
Former-commit-id: 02eb23f0147608c8154aad2c312d8f9d84390806
|
2019-02-14 08:06:19 +01:00 |
|
Daniel Barbero
|
0fb61444f6
|
Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico
Conflicts:
pandora_console/godmode/setup/performance.php
pandora_console/include/functions_api.php
pandora_console/install.php
Former-commit-id: e8fc07d1f10723700114949b30e9f3770208149e
|
2019-02-14 08:01:23 +01:00 |
|
artica
|
f0338cd08e
|
Auto-updated build strings.
Former-commit-id: d0d40baca6720eb12b085a1968d827b8e9e767b0
|
2019-02-14 00:01:26 +01:00 |
|
fbsanchez
|
42dc0c60be
|
supervisor
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
|
2019-02-12 11:41:21 +01:00 |
|
manuel.montes
|
7150b8b758
|
restore install.php
Former-commit-id: 917f3d5d07b1bce92fa06836c5b2872dc06390d2
|
2019-02-11 16:08:36 +01:00 |
|
manuel.montes
|
76259c3026
|
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
Conflicts:
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: 1ab951e0bf8984214f30d71c9585d232ba7c182c
|
2019-02-08 15:03:59 +01:00 |
|
daniel
|
801d67e690
|
Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico
Conflicts:
pandora_console/install.php
Former-commit-id: 0176b7cddb80b80e9a56571f89559a17e525cb79
|
2019-02-08 14:35:58 +01:00 |
|
artica
|
e6abb61a13
|
Auto-updated build strings.
Former-commit-id: 0f011fb8fe35e16e311b4cd0f946fec051170c32
|
2019-02-08 00:01:29 +01:00 |
|
Tatiana Llorente
|
f05011956f
|
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
Conflicts:
pandora_console/install.php
Former-commit-id: cbe20ba58ef82cd1d8c833f34b20e74f16062434
|
2019-02-07 09:02:56 +01:00 |
|
Tatiana Llorente
|
4c2215a3db
|
Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
Conflicts:
pandora_console/install.php
Former-commit-id: bc20f50737c115ade0034b4ca9e6d4cab26d35e6
|
2019-02-07 08:59:45 +01:00 |
|
daniel
|
f14684b22d
|
Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico
Conflicts:
pandora_console/godmode/setup/performance.php
pandora_console/godmode/setup/setup.php
Former-commit-id: 9a96a30cc97d2d2af707d7cd89b5a1e6ad0d0746
|
2019-02-07 07:58:33 +01:00 |
|
artica
|
1f3fe51f69
|
Auto-updated build strings.
Former-commit-id: 984f5cc8c4bf0b5adb68d7bfe86e171f7b748f77
|
2019-02-07 00:01:40 +01:00 |
|
manuel.montes
|
dee7c769f2
|
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
Conflicts:
pandora_console/godmode/setup/performance.php
pandora_console/godmode/setup/setup_auth.php
pandora_console/godmode/setup/setup_ehorus.php
pandora_console/godmode/setup/setup_general.php
pandora_console/godmode/setup/setup_visuals.php
pandora_console/include/styles/pandora.css
modificado: pandora_console/include/functions_html.php
Former-commit-id: feaf2f5d3defda182f9cdaf151854257aeba1b22
|
2019-02-06 16:11:46 +01:00 |
|
daniel
|
b58f96ec42
|
Merge remote-tracking branch 'origin/develop' into 3404-Mejoras_y_arreglos_en_la_instalación_de_la_consola
Conflicts:
pandora_console/install.php
Former-commit-id: 292ab3a98f7b2dffef8e0198298af74a6b619df2
|
2019-02-06 16:04:37 +01:00 |
|
Tatiana Llorente
|
b805fe594e
|
Merge remote-tracking branch 'origin/develop' into ent-3274-Retoque-visual-vista-SNMP-interfaces
Conflicts:
pandora_console/include/functions_reporting_html.php
Former-commit-id: d096025f7a166160598f9fb26fe17c60809c9c3e
|
2019-02-06 15:34:06 +01:00 |
|
Tatiana Llorente
|
cc17cbf60f
|
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
Conflicts:
pandora_console/include/functions_config.php
Former-commit-id: 3456fcc7a45639055010e67440601ac4fba547ec
|
2019-02-06 15:22:05 +01:00 |
|
Tatiana Llorente
|
b8aab972c9
|
Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
Conflicts:
pandora_console/godmode/groups/group_list.php
Former-commit-id: 6f928cc0a3ce2d4822affc7444254393d1d47b69
|
2019-02-06 15:14:22 +01:00 |
|
artica
|
c0a23889ab
|
Auto-updated build strings.
Former-commit-id: ad456bf0e4cb361694afa246a9348e5b87b85a94
|
2019-02-06 00:01:29 +01:00 |
|
artica
|
97259bc285
|
Auto-updated build strings.
Former-commit-id: e3473dde27b1cc8aaa1ae555158171d25941710f
|
2019-02-05 00:01:28 +01:00 |
Alejandro Gallardo Escobar
|
4c735762dc
|
Merge branch 'develop' into cursed-format-change
Former-commit-id: a986a0245f7f0cce5ea7fc3c33503bc53e85242a
|
2019-02-04 09:11:39 +01:00 |
|
artica
|
af1f081e5c
|
Auto-updated build strings.
Former-commit-id: e75f41146e01ab55222c3b4176a50aee7e9246df
|
2019-02-04 00:01:33 +01:00 |
|
artica
|
934533141e
|
Auto-updated build strings.
Former-commit-id: ac84c1e47dd82d12c0b83a0a79b044ca26fc8d8e
|
2019-02-03 00:01:26 +01:00 |