tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-23 02:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity
32,039 Commits 34 Branches 30 Tags
Commit Graph

881 Commits

Author SHA1 Message Date
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
marcos.alconada
450eccee7f ticket resolved, duplicated sentece 
Former-commit-id: bf419c14b79b633bb2894a34a91f74b32551549e
 2019-03-05 13:17:21 +01:00
Tatiana Llorente
7be5d3e9e0 new header and menu 
Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
 2019-03-05 12:54:11 +01:00
Luis Calvo
2ceba76d22 Fixed ldap conf tooltips 
Former-commit-id: 957a6c1d90ce99630fa2327c829f178561192a50
 2019-03-05 09:09:24 +01:00
manuel
488be0d602 Changed radio buttons by checkbox switch 
Former-commit-id: f0c64cecbf9e1197be08a9a95248d3b4ea8bd949
 2019-03-04 13:12:01 +01:00
Tatiana Llorente
12a287f322 Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into ent-3432-Nueva-cabecera-y-menu-lateral 
Conflicts:
	pandora_console/godmode/setup/setup_visuals.php
	pandora_console/install.php


Former-commit-id: 1c1a318ae74ab3a363a88d99cc079eea6e213171
 2019-03-04 09:52:05 +01:00
Tatiana Llorente
36fa0fc41f new header and menu 
Former-commit-id: d1e8fbd044711f87b75177c32225be7847b60018
 2019-03-04 08:39:56 +01:00
Fermin
3f53541c5e Added switch to enable NTA 
Former-commit-id: 5fc3b47f8f9f92ac643db6a5dbe4fc320ca141f6
 2019-03-01 13:38:48 +01:00
Fermin
f0a3f4e9d7 Added configurable purge tnetwork_matrix 
Former-commit-id: e5869879c2445c15c8332d245ac2dd0d3f8de5d5
 2019-03-01 12:39:55 +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
Tatiana Llorente
34eedc5330 new header and menu 
Former-commit-id: aac70c14548c725b68fa031202e0b8449b725f45
 2019-02-26 11:20:17 +01:00
Tatiana Llorente
4c92375a58 new header and menu 
Former-commit-id: 3509107664a968fc358a8bb3e662f27b26b10c73
 2019-02-25 12:23:15 +01:00
Tatiana Llorente
526311d1c6 new header and menu 
Former-commit-id: 0748bc89d30e8ae4723026848d493d15d82af9cd
 2019-02-25 11:54:46 +01:00
fbsanchez
b1aa0fe2f2 Merge from develop 
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
 2019-02-22 12:30:27 +01:00
daniel
300626e551 Merge remote-tracking branch 'origin/develop' into ent-3499-Numero_de_respuestas_de_eventos_masivas 
Former-commit-id: 4a8482ccef3661c83553dff8f5533c29321f95f2
 2019-02-20 15:38:15 +01:00
Alejandro Fraguas
094a5c17d8 Merge branch '3222-Deshabilitar-doble-autenticacion-si-no-esta-activada' into 'develop' 
disable double authentication option on user edit when disabled in authentication setup

See merge request artica/pandorafms!2054

Former-commit-id: b60f3ec06935ad6b6e456e556c9a281539e42e19
 2019-02-20 09:56:49 +01:00
alejandro-campos
2e78012e40 Fix double authentication check in meta authentication setup 
Former-commit-id: 37fea3368898f58fafda9c485b93bf07c8ad81fa
 2019-02-19 13:13:13 +01:00
daniel
d116e4742a add new tocken max events responses 
Former-commit-id: f65e6a478812a913d25fa7b87e9ac2b26b9a5ff4
 2019-02-19 12:14:42 +01:00
Daniel Rodriguez
4473762393 Merge branch '3227-No-se-guarda-muestra-correctamente-certificado-ssl-en-setup-general' into 'develop' 
fix bug when updating path of ssl certificate in general setup

See merge request artica/pandorafms!2052

Former-commit-id: 453119a3a14e50ce6834eb1ee46da2f1289d6082
 2019-02-18 17:18:46 +01:00
fbsanchez
bb83f4ba4a avoid to show notification if disabled by user 
Former-commit-id: d00b09c9e608c51223f7192ad85408976fac5baa
 2019-02-18 17:08:23 +01:00