Daniel Rodriguez
|
0ea5b7ff1b
|
Merge branch 'ent-4196-Eliminar-funcionalidad-QR-Code-in-header' into 'develop'
Removed option to show qr code in header - #4196
See merge request artica/pandorafms!2494
|
2019-06-26 12:04:00 +02:00 |
Daniel Maya
|
8f2feac676
|
Added DESTDIR in license.php
|
2019-06-18 11:35:59 +02:00 |
Tatiana Llorente
|
e4139874dd
|
Removed option to show qr code in header - #4196
|
2019-06-11 18:00:41 +02:00 |
|
Daniel Rodriguez
|
16d34bf584
|
Merge branch 'ent-3643-mensaje-duplicado-con-info-de-la-db_history-en-performance' into 'develop'
ticket resolved, duplicated sentece
See merge request artica/pandorafms!2239
|
2019-05-30 15:33:27 +02:00 |
|
Daniel Maya
|
552467286c
|
Merge branch 'develop' into 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual'
# Conflicts:
# pandora_console/extras/mr/28.sql
|
2019-05-29 11:10:31 +02:00 |
Alejandro Gallardo Escobar
|
f5d5cbf5b8
|
VC item cache improvements.
-Added a default value to the configuration.
-Changed the control to edit the cache expiration.
- Added the cache to more items.
|
2019-05-28 18:34:07 +02:00 |
Luis Calvo
|
6fdd88ab65
|
Fixed errors on eHorus user level conf
|
2019-05-28 17:19:13 +02:00 |
|
Luis Calvo
|
5966367f8f
|
eHorus user level login conf added in user editor
|
2019-05-28 13:14:42 +02:00 |
|
Luis Calvo
|
588d19102f
|
Resolve merge conflict
|
2019-05-27 18:30:24 +02:00 |
fbsanchez
|
dd8af874fa
|
Merge branch 'ent-1668-update-manager' into 'develop'
license forms sync MC-N
See merge request artica/pandorafms!2441
|
2019-05-23 10:36:43 +02:00 |
|
fbsanchez
|
2cfe4378c2
|
license forms sync MC-N
|
2019-05-22 18:50:51 +02:00 |
|
Daniel Rodriguez
|
979f11ca8f
|
Merge branch 'ent-1668-update-manager' into 'develop'
Ent 1668 update manager
See merge request artica/pandorafms!2420
|
2019-05-22 15:25:49 +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 |
|
fbsanchez
|
77fc1abe89
|
minor style updates and fixes in safe-output
|
2019-05-20 18:16:21 +02:00 |
|
fbsanchez
|
5e9b2479eb
|
Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager
|
2019-05-20 13:11:39 +02:00 |
|
fbsanchez
|
e7dbb55392
|
Minor fixes
Former-commit-id: 51e446b36a4ad2b93a1a2e3ff76e89ea2a21db9b
|
2019-05-16 12:00:49 +02:00 |
|
Luis Calvo
|
702926cf85
|
solved merge conflict mr 28.sql
Former-commit-id: 687cf5c37f15648421843b5d2908351fc2f3c032
|
2019-05-16 10:15:46 +02:00 |
|
fbsanchez
|
d871b599ef
|
General fixes and UM comm updates
Former-commit-id: b4c58f467f195627f96afe7f06b59004adeb83be
|
2019-05-14 23:49:01 +02:00 |
|
Daniel Rodriguez
|
be20163073
|
Merge branch 'ent-3799-bug-en-configuracion-ehorus' into 'develop'
Ent 3799 bug en configuracion ehorus
See merge request artica/pandorafms!2421
Former-commit-id: cf20d4985c6de38e1eab8bdd23ddb32708cc57ba
|
2019-05-14 17:38:55 +02:00 |
marcos.alconada
|
ff8abf9b40
|
updated function for show and hide ehorus form
Former-commit-id: 91c91ee7b1014dfa4d8f7719cb848ae4770199f5
|
2019-05-14 15:34:22 +02:00 |
|
manuel
|
20dace7de8
|
Merge branch 'develop' into ent-3468-Ayudas_online
Conflicts:
pandora_console/godmode/agentes/agent_manager.php
Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
|
2019-05-13 16:20:12 +02:00 |
|
Luis Calvo
|
14717a6c6d
|
Fixed merge conflict
Former-commit-id: bd98cc80ad87b840a60c2548667352f5c6041c55
|
2019-05-13 15:15:14 +02:00 |
|
Luis Calvo
|
895588ebe0
|
Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings
Former-commit-id: c5f4313d97cad17c9f653dc0e4bbc0d9e7e9f308
|
2019-05-13 15:00:35 +02:00 |
|
Luis Calvo
|
27096276ec
|
agent view user acces ehorus
Former-commit-id: 66739ce807d5bd5f2e46ce9fd1aa0cc72afbb4bc
|
2019-05-13 15:00:29 +02:00 |
|
Daniel Rodriguez
|
ecacf2d3f5
|
Merge branch 'ent-3799-bug-en-configuracion-ehorus' into 'develop'
Ent 3799 bug en configuracion ehorus
See merge request artica/pandorafms!2403
Former-commit-id: 183212d8ad2e9cab574800000ac71576d7ae75ae
|
2019-05-13 14:54:25 +02:00 |
|
Luis Calvo
|
c527435a0e
|
eHorus user-login settings
Former-commit-id: e62be3b137ef5583fbd29186a834a86b075e78fb
|
2019-05-10 15:32:25 +02:00 |
|
marcos.alconada
|
b51cdb93df
|
arreglo con la vista del formulario
Former-commit-id: 0d5b5c099ce2e096d8e3d8e1c0a6220baa27e0a9
|
2019-05-10 15:00:21 +02:00 |
|
marcos.alconada
|
793304b52d
|
Se habilita el boton de ehorus
Former-commit-id: aceee670b00ad4291b7f4e9e0a90f17dca3feed9
|
2019-05-10 12:26:09 +02:00 |
|
Luis Calvo
|
44b14debdc
|
Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings
Former-commit-id: 781b73ee3896c138223d46d40abdb3a7100bcf2c
|
2019-05-10 09:38:31 +02:00 |
|
Luis Calvo
|
ecce1160e1
|
Added button to select ehorus conf type and box into user conf
|
2019-05-09 19:23:18 +02:00 |
slerena
|
9b51928e35
|
Added HTML edit feature, needed because TinyEdit adds lot's of HTML and is not practical. You need to edit the contents in HTML. Is not a security issue, because only admin can edit this news contents.
Former-commit-id: 4039346ffe4fc2628f515b4cdaeaf1655377e74b
|
2019-05-09 16:01:51 +02:00 |
|
marcos.alconada
|
e0729b6ca6
|
Se vuelve a crear la rama
Former-commit-id: 8ac69d4e1d15be23411faff82dc2bddcfcf7f7b6
|
2019-05-09 14:59:47 +02:00 |
Daniel Barbero Martin
|
99f5cab83d
|
fixed filemanager
|
2019-05-08 10:55:20 +02:00 |
|
manuel
|
f5759abcad
|
Merge branch 'develop' into ent-3468-Ayudas_online
|
2019-05-08 09:35:32 +02:00 |
Ramon Novoa
|
a92f81272a
|
Merge branch 'ent-3835-pandora-db-historical-fails-when-port-setted' into develop
|
2019-05-07 15:05:03 +02:00 |
|
manuel
|
00b5fc0a2c
|
Added helps
Former-commit-id: 54292202ea50b6a15c909875853b52fe2f1a045a
|
2019-05-06 16:59:31 +02:00 |
|
manuel
|
6bd8221bc0
|
changed helps
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
|
2019-04-29 14:36:02 +02:00 |
|
Alejandro Gallardo Escobar
|
c1272035cc
|
Merge remote-tracking branch 'origin/develop' into visual-console-refactor
Former-commit-id: 6cffccf44d4bf8c5b87c5c5f112d814c796645c6
|
2019-04-24 17:05:20 +02:00 |
|
Luis Calvo
|
fa0da4504e
|
Fixed bug connection ok when db connection returns null
Former-commit-id: d2d6ea104bea4a0d0b4ffb2c64818428ee6ad703
|
2019-04-22 12:00:06 +02:00 |
|
Alejandro Gallardo Escobar
|
998a66f654
|
Visual Console Refactor: added a setting to use the legacy VC and added the relation line width setup option to the client
Former-commit-id: c6bb6ed82a8e84c485ad7270ebb46150fdfcfa8b
|
2019-04-16 12:23:03 +02:00 |
|
Tatiana Llorente
|
f497d3bd2e
|
Added class to action buttons and moved checkbox to the left side
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
|
2019-04-02 13:42:30 +02:00 |
|
Tatiana Llorente
|
26451c41a1
|
New design for the tables - #3707
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
|
2019-03-29 11:05:52 +01:00 |
fermin831
|
a2f5b8502a
|
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: ad45f5bd3f07d6ef7a6d8d6a291d6a2fd75fda78
|
2019-03-26 10:11:13 +01:00 |
|
Tatiana Llorente
|
448a5e64ea
|
Fixed disabled custom logo in open version
Former-commit-id: 4b5cd56af623bd6485111240be0bb0e11a0a3162
|
2019-03-25 16:46:17 +01:00 |
|
Tatiana Llorente
|
fe7103ba9c
|
Changes in header
Former-commit-id: 3c69b91277f0078a65764c297126d3ebb0dfc11c
|
2019-03-25 12:41:39 +01:00 |
|
fermin831
|
b660da6e84
|
Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/install.php
Former-commit-id: dda11929acf5f741e0a4d290b4607ae72683284b
|
2019-03-14 10:49:16 +01:00 |
|
manuel
|
ccb669a204
|
Fixed minor errors in setup_ehorus
Former-commit-id: ed0ba17641714a87446b4db88d933d7b176e531e
|
2019-03-11 09:37:08 +01:00 |
|
Fermin
|
dd8265f65e
|
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Former-commit-id: 65d43e483dc23616c44da3b26b73c94cbf10d3fe
|
2019-03-08 09:02:22 +01:00 |
|
manuel
|
1020ec1bd7
|
Merge branch 'develop' into ent-3543-Cambio-visual-de-radio-buttons-y-checkbox-en-el-setup
Conflicts:
pandora_console/godmode/setup/setup_visuals.php
Former-commit-id: c193f6995a3a4115270cf45d635e310bf0f8cd3a
|
2019-03-07 13:45:56 +01:00 |
|
Tatiana Llorente
|
35633d181b
|
Merge remote-tracking branch 'origin/develop' into ent-3432-Nueva-cabecera-y-menu-lateral
Conflicts:
pandora_console/install.php
Former-commit-id: 32eb8fd266b43ce01a297044da9117e8d48b64a6
|
2019-03-05 13:20:59 +01:00 |