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

15380 Commits

Author SHA1 Message Date
nramon 13894ba403 Merge branch '832-server-proxy-details-dev' into 'develop' 
Added details to agent wizard and secundary servers

See merge request !770
 2017-09-01 11:36:53 +02:00
daniel d74a3f74b4 Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-01 10:51:54 +02:00
Arturo Gonzalez a80f62003c Added details to agent wizard and secundary servers 2017-09-01 10:44:26 +02:00
slerena 53e61715a1 Merge branch '1211-Falta-tabla-de-proceso-de-reseteo-de-contraseñas-en-MR' into 'develop' 
Add password reset table in MR - #1211

See merge request !754
 2017-09-01 00:09:39 +02:00
artica cce7f496b6 Auto-updated build strings. 2017-09-01 00:01:14 +02:00
fbsanchez 4d1be92150 DB changes (text => mediumtext) ONLY NEW INSTALLATIONS 2017-08-31 19:14:31 +02:00
Enrique Camargo 6b4a15534d Merge branch 'develop' into '1211-Falta-tabla-de-proceso-de-reseteo-de-contraseñas-en-MR' 
# Conflicts:
#   pandora_console/extras/mr/6.sql
 2017-08-31 18:21:08 +02:00
slerena 601db73596 Merge branch '1177-Graficas_con_valores_negativos_rev2' into 'develop' 
fixed error values negatives in reports pdf

See merge request !769
 2017-08-31 18:16:26 +02:00
slerena ec1b95d45a Merge branch 'Alta-de-nueva-macro-_id_module_-ayuda-1072' into 'develop' 
Add _id_module_ definition to help - #1072

See merge request !757
 2017-08-31 18:07:09 +02:00
Enrique Camargo afd184f466 Update 6.sql 2017-08-31 17:58:34 +02:00
daniel b0263a8806 fixed error values negatives in reports pdf 2017-08-31 16:52:41 +02:00
fbsanchez e08a3dd040 Core: Send _data_ macro as image when needed 2017-08-31 16:28:18 +02:00
nramon abccf5c972 Merge branch '1058-large-names-in-service-map-dev' into 'develop' 
Removed unused styles

See merge request !768
 2017-08-31 16:25:07 +02:00
slerena c13119183c Merge branch '1229-Códigos-QR-de-Pandora-2' into 'develop' 
change url in preview qr code in agent view - #1229

See merge request !767
 2017-08-31 16:23:36 +02:00
daniel a64e0feba3 fixed minor error view snapshot WUX 2017-08-31 16:13:28 +02:00
Arturo Gonzalez d0715bed51 Removed unused styles 2017-08-31 16:08:24 +02:00
enriquecd ac0820b9b4 change url in preview qr code in agent view - #1229 2017-08-31 15:57:34 +02:00
enriquecd f6c6e2a6ba Add show_statistics option for group item - #1245 2017-08-31 15:09:04 +02:00
nramon a99b75da4c Merge branch '832-add-server-exec-proxy-to-policy-wizard-dev' into 'develop' 
Added db changes to mr 6

See merge request !765
 2017-08-31 11:46:41 +02:00
nramon 83da33a53f Merge branch '137-global-module-search-get-disabled-modules-dev' into 'develop' 
Added condition to query

See merge request !762
 2017-08-31 11:39:17 +02:00
nramon 02bf6dbd5c Merge branch '1058-rework-elements-labels-in-service-map-dev' into 'develop' 
Added styles to service map elements

See merge request !679
 2017-08-31 11:38:21 +02:00
nramon 17201b5dd8 Merge branch '1190-Error-in-module-cascade-selector-dev' into 'develop' 
Do the autocomplete field correct

See merge request !761
 2017-08-31 11:36:44 +02:00
Ramon Novoa 83fef97c17 Add dependencies to test the Satellite Server. 2017-08-31 11:35:31 +02:00
Arturo Gonzalez 2fe8849708 Added db changes to mr 6 2017-08-31 11:33:08 +02:00
Arturo Gonzalez 7b949cb5bf Added function to get all interfaces 2017-08-31 10:09:49 +02:00
artu30 914f09c559 Merge branch 'develop' into '1058-rework-elements-labels-in-service-map-dev' 
# Conflicts:
#   pandora_console/include/styles/pandora.css
 2017-08-31 08:19:00 +02:00
artica e45face2fc Auto-updated build strings. 2017-08-31 00:01:15 +02:00
slerena 0a11d3d086 Merge branch '1228-massive-module-deletes-all-modules-with-any-tag-dev' into 'develop' 
Fixed "any" filter with selects unknown and not init modules in massive delete operation

See merge request !756
 2017-08-30 17:50:15 +02:00
slerena 10a145fe98 Merge branch '1248-deadlocks-en-pandora-4452' into 'develop' 
Remove nested queries to prevent deadlocks with the Data Server.

See merge request !760
 2017-08-30 17:48:53 +02:00
nramon 7da6dd02ca Merge branch '124-anadir-enlace-a-los-iconos-de-la-columna-remote-config-de-la-vista-de-agentes-2' into 'develop' 
Fix agent view remote config column order - #124

See merge request !763
 2017-08-30 17:44:13 +02:00
enriquecd 68aa0f91ac Fix agent view remote config column order - #124 2017-08-30 17:30:36 +02:00
Arturo Gonzalez 573a0f5534 Added condition to query 2017-08-30 16:26:06 +02:00
daniel fe2a2a36e8 fixed minor errors in WUX 2017-08-30 16:09:11 +02:00
Arturo Gonzalez 0eabf7a0ce Do the autocomplete field correct 2017-08-30 15:52:28 +02:00
daniel b078d48918 fixed errors in wux 2017-08-30 09:47:57 +02:00
artica 0594a7bcbc Auto-updated build strings. 2017-08-30 00:01:13 +02:00
slerena 9c4eb3086e Merge branch '832-exec-proxy-dev' into 'develop' 
832 exec proxy dev

See merge request !755
 2017-08-29 16:11:03 +02:00
Arturo Gonzalez 976581e983 Adjust timeout in events response commands 2017-08-29 15:54:12 +02:00
Ramon Novoa 29cecf2e29 Remove nested queries to prevent deadlocks with the Data Server. 
Ref pandora_enterprise#1248.
 2017-08-29 14:34:14 +02:00
slerena 347a6d3a3d Merge branch '1244-sql-error-in-massive-agents-edition-dev' into 'develop' 
Added filter when id groups comes empty

See merge request !759
 2017-08-29 13:49:21 +02:00
slerena 6bcc209d62 Merge branch '1177-Graficas_con_valores_negativos_rev' into 'develop' 
fixed errors in simple graphs value negative

See merge request !758
 2017-08-29 13:42:21 +02:00
Arturo Gonzalez 63fb488176 Clean code 2017-08-29 11:52:34 +02:00
Arturo Gonzalez 32ad745c62 Added filter when id groups comes empty 2017-08-29 11:32:25 +02:00
Arturo Gonzalez 8daa66d6ee Added option to set exec proxy in server 2017-08-29 11:14:42 +02:00
daniel 487711d567 fixed errors in simple graphs value negative 2017-08-29 09:28:05 +02:00
artica 8616015f38 Auto-updated build strings. 2017-08-29 00:01:14 +02:00
fbsanchez 9a8e80bf68 Updates wux_module to web_analysis 2017-08-28 19:55:01 +02:00
fbsanchez ae971ded58 Fix on migrate 6.0 to 7.0 2017-08-28 19:15:10 +02:00
fbsanchez 2b18b1589c Added new module type: web_analysis 2017-08-28 19:05:08 +02:00
enriquecd 4f2e12dcf9 Add _id_module_ definition to help - #1072 2017-08-28 16:46:39 +02:00