tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,415 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

13415 Commits

Author SHA1 Message Date
daniel 0eab9f1eaf Merge branch '55-warning-al-crear-o-editar-un-grupo-integria-4460' into 'develop' 
fixed minor errors and no show warnning in console to create agent groups

See merge request !154
 2017-02-14 16:00:48 +01:00
daniel fb4cc26193 fixed minor errors and no show warnning in console to create agent groups 2017-02-14 15:47:12 +01:00
Arturo Gonzalez c6dbf7c3b5 Added some modifications to node links. Ticket #260 2017-02-14 12:40:57 +01:00
Arturo Gonzalez 0c4f90d252 Node details improvements. Ticket #78 References ticket(s): #78 2017-02-14 09:52:11 +01:00
Arturo Gonzalez 584427de06 Added changes to finish rr feature. Ticket #169 2017-02-14 09:36:11 +01:00
artica 22e81a0c2f Auto-updated build strings. 2017-02-14 00:01:17 +01:00
m-lopez-f 1fe9ded0fc Add changes of visual mobile version of pandora. Gitlab: #148 2017-02-13 16:06:17 +01:00
Arturo Gonzalez b42e4a8277 Rewrite lost code. 2017-02-13 15:29:45 +01:00
artu30 e71c6070ad Merge branch 'feature/rolling_release' into 'develop' 
Feature/rolling release

See merge request !151
 2017-02-13 15:17:29 +01:00
Arturo Gonzalez de1291a378 Fixed db 2017-02-13 14:59:39 +01:00
daniel 51f93ea95e Merge branch '54-mejorar-control-de-seleccion-para-informes-de-agente-modulo-y-vista-de-agente-modulo' into 'develop' 
fixed forms in agents/modules

See merge request !152
 2017-02-13 14:46:47 +01:00
Arturo Gonzalez 5b7f4a5139 Merge branch 'develop' into feature/rolling_release 
Conflicts:
	pandora_console/general/header.php
	pandora_console/include/functions.php
	pandora_console/index.php
	pandora_console/pandoradb_data.sql
 2017-02-13 14:19:25 +01:00
daniel 93e1c72949 fixed forms in agents/modules 2017-02-13 14:18:48 +01:00
Arturo Gonzalez 4c63756f51 Fixed classic menu mode. Ticket #250 2017-02-13 13:50:28 +01:00
Arturo Gonzalez 2cfce8979e Added new funtion to module cron interval with "from" and "to" forms. Ticket #246 2017-02-13 11:32:04 +01:00
artica 7b95f9dbfe Auto-updated build strings. 2017-02-13 00:01:13 +01:00
artica 5426cd36f6 Auto-updated build strings. 2017-02-12 00:01:12 +01:00
artica 570bc28301 Auto-updated build strings. 2017-02-11 00:01:16 +01:00
Enrique Camargo bb1c4f9424 Merge branch '53-no-ejecuta-custom-responses' into 'develop' 
Show unreachable host reponse when ping from custom responses - #53

See merge request !148
 2017-02-10 16:56:55 +01:00
enriquecd bd7ca5645a Show unreachable host reponse when ping from custom responses - #53 2017-02-10 16:42:55 +01:00
Arturo Gonzalez 9303041450 Fixed events query with like in tags field. Ticket #208 2017-02-10 12:30:21 +01:00
Arturo Gonzalez 9a73cb56d7 Added module crontab to local modules with rc. Ticket #246 2017-02-10 11:43:12 +01:00
Enrique Camargo 6b168873fa Merge branch '52-la-ventana-de-alertas-deberia-de-ser-arrastrable-y-con-zindex-3-cambiar-tambien-texto-para-desactivar-logo-en-graficas-en-setup-visual' into 'develop' 
Make alert messages window draggable, zindex 3, change disable logo in graph - #52

See merge request !143
 2017-02-10 10:33:24 +01:00
enriquecd 36aa73bdd8 Make alert messages window draggable, zindex 3, change disable logo in graph - #52 2017-02-10 10:18:53 +01:00
artica 060c6236c4 Auto-updated build strings. 2017-02-10 00:01:14 +01:00
Enrique Camargo df11fa3fff Merge branch '15-mejoras-visuales-en-consola-visual-para-develop-duplicado-de-enterprise' into 'develop' 
Fix period field when open simple value and module graph - #15

See merge request !142
 2017-02-09 18:06:23 +01:00
enriquecd 9fd08e8728 Fix period field when open simple value and module graph - #15 2017-02-09 17:55:46 +01:00
Arturo Gonzalez 47338f240f Fixed module cron interval seter. Ticket #246 2017-02-09 15:54:33 +01:00
Arturo Gonzalez 46e1d41ce0 Fixed netflow filter. Ticket #207 2017-02-09 12:55:11 +01:00
Arturo Gonzalez 0e179a1725 Added "G" in srtftime format from date format. Ticket #241 2017-02-09 12:19:59 +01:00
daniel c9b4b3be5c Merge branch '145-nuevo-item-de-informes-y-dashboard-module-histogram-histograma-de-modulo' into 'develop' 
add new report graph module histogram

See merge request !140
 2017-02-09 11:53:35 +01:00
daniel b41ef3cd4b add new report graph module histogram 2017-02-09 11:43:54 +01:00
fbsanchez 83ca7e898f Minor fix (performance) 
Moved transactional subsystem enabled update to "new module" section
 2017-02-09 10:15:50 +01:00
Arturo Gonzalez e7bb60b61d Added open images folder to custom logo edit in setup visual. Ticket #51 2017-02-09 09:22:14 +01:00
Arturo Gonzalez f1bdcbd3c0 Added ux console images. Ticket #173 2017-02-09 08:15:51 +01:00
artica 5af516078c Auto-updated build strings. 2017-02-09 00:01:14 +01:00
Enrique Camargo 574bb029d0 Merge branch '50-anadir-modulos-con-wizard-en-consola-visual-integria-4429' into 'develop' 
Empty panel when click over edit key in vconsole with an element selected - #50

See merge request !139
 2017-02-08 18:43:31 +01:00
enriquecd 53817271cf Empty panel when click over edit key in vconsole with an element selected - #50 2017-02-08 18:31:53 +01:00
Enrique Camargo c6af6cd530 Merge branch '237-editar-modulo-web-no-enlazado-a-politica-integria-4421/open' into 'develop' 
Enable fields in web modules created by policy when is unlinked - #237

See merge request !137
 2017-02-08 17:07:27 +01:00
enriquecd 294d95481c Enable fields in web modules created by policy when is unlinked - #237 2017-02-08 16:54:17 +01:00
daniel 87a11a7d20 Merge branch '49-la-consola-visual-tira-mucho-de-la-bbdd' into 'develop' 
Improved performance of groups within the visual console

See merge request !135
 2017-02-08 08:39:55 +01:00
Ramon Novoa 3dc44b4e1c Revert "Copy the repo before running any tests." 
This reverts commit edae9ebd0e.
 2017-02-08 08:19:20 +01:00
Ramon Novoa 3ef7c1a34e Revert "Fix the path to test.sh." 
This reverts commit fa1edc0973.
 2017-02-08 08:19:20 +01:00
artica 16f4281de7 Auto-updated build strings. 2017-02-08 00:02:21 +01:00
daniel 5a857ff4c9 Improved performance of groups within the visual console 2017-02-07 18:31:18 +01:00
Enrique Camargo 07ca0a4933 Merge branch 'Add-titles-to-lateral-menu-buttons-#234-2' into 'develop' 
Add titles to all levels buttons in lateral menu buttons / 2 - #234

See merge request !133
 2017-02-07 17:45:23 +01:00
enriquecd b6e9ed3604 Add titles to all levels buttons in lateral menu buttons / 2 - #234 2017-02-07 17:43:22 +01:00
Enrique Camargo 3f893be7d5 Merge branch '48-aumentar-altura-de-las-filas-de-la-tabla-agent-contact-en-la-vista-de-agente' into 'develop' 
Increase cell height in agent contact table of agent view - #48

See merge request !131
 2017-02-07 17:06:23 +01:00
enriquecd da366da872 Increase cell height in agent contact table of agent view - #48 2017-02-07 17:04:24 +01:00
Enrique Camargo 1ba76736b8 Merge branch '7-cambiar-color-de-grafica-de-acceso-integria-3271' into 'develop' 
Change water mark logo - #7

See merge request !129
 2017-02-07 15:54:42 +01:00