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

13428 Commits

Author SHA1 Message Date
Arturo Gonzalez 24defd473d Fixed grid position problem in visual consoles. Ticket #256 2017-02-16 09:57:58 +01:00
m-lopez-f 71bfbf76d9 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-16 08:38:27 +01:00
m-lopez-f 483c64a888 Add lost updates of files in mobile version #148 2017-02-16 08:37:36 +01:00
artica 96b160adc2 Auto-updated build strings. 2017-02-16 00:01:14 +01:00
nramon 97f5254956 Merge branch '253-bit-de-licencia-ux-para-pandora-7' into 'develop' 
Update the Update Manager URLs.

See merge request !157
 2017-02-15 16:10:07 +01:00
nramon 165b59656e Merge branch 'develop' into '253-bit-de-licencia-ux-para-pandora-7' 
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
#   pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
 2017-02-15 15:49:16 +01:00
Ramon Novoa de392d26ad Update the Update Manager URLs. 2017-02-15 15:41:54 +01:00
m-lopez-f 68bdcdd74f Fixed typo error 2017-02-15 13:43:15 +01:00
m-lopez-f b43f2cb433 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-15 13:42:48 +01:00
m-lopez-f af65ec1910 Disable default extension Matrix, Vna and SSH. Gitlab: #251, #259 2017-02-15 13:42:40 +01:00
Arturo Gonzalez 5cce7ac2d0 Fixed interface links editor in networkmaps. Ticket #260 2017-02-15 10:29:45 +01:00
daniel cb8fea7f2e fixed minor errors warnings in log 2017-02-15 08:52:57 +01:00
artica 7e7713ae04 Auto-updated build strings. 2017-02-15 00:01:14 +01:00
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