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

16873 Commits

Author SHA1 Message Date
fbsanchez ed282c6a9b 1923 Added required methods for migrationserver 2018-03-13 16:35:13 +01:00
vgilc d6e82be357 Merge branch 'ent-2048-warnings-en-el-servidor-module_interval' into 'develop' 
[Server] Fixed undefined module_interval

See merge request artica/pandorafms!1363
 2018-03-13 16:32:30 +01:00
daniel a3dceac0a0 Merge remote-tracking branch 'origin/develop' into 1923-Migrar_agentes_desde_metaconsola 2018-03-13 16:00:44 +01:00
fermin831 9b60d94d59 [Autoprovision] Changed hostname by alias in database 2018-03-13 13:39:30 +01:00
fermin831 e03ad1a1bf [Server] Fixed undefined module_interval 2018-03-13 13:03:44 +01:00
artica af5d70bd7d Updated version and build strings. 2018-03-13 11:06:33 +01:00
artica 24ff4014ff Auto-updated build strings. 2018-03-13 00:01:27 +01:00
fbsanchez 7d58734ef2 MigrationServer aux util 2018-03-12 19:39:28 +01:00
daniel c8118c2e08 fixed minor error 2018-03-12 19:31:24 +01:00
fermin831 775f2b1a55 [Console images] Added toggle images 2018-03-12 17:57:18 +01:00
vgilc f65aebf532 Merge branch 'ent-1850-no-hay-opcion-command-line-snapshot-en-meta-3' into 'develop' 
[Snapshots] Fixed snapshots in metaconsole. Changed functionallity but preserve all way to work

See merge request artica/pandorafms!1361
 2018-03-12 16:01:16 +01:00
fermin831 74f899736f [Snapshots] Fixed snapshots in metaconsole. Changed functionallity but preserve all way to work 2018-03-12 15:17:59 +01:00
vgilc 3e90c3421a Merge branch '2031-syslogserver-perdida-de-historico-en-cambio-de-alias-re' into 'develop' 
Fixed duplicate definition $rs

See merge request artica/pandorafms!1360
 2018-03-12 13:55:49 +01:00
fbsanchez 4566aee4e1 Fixed duplicate definition $rs 2018-03-12 13:47:57 +01:00
daniel 2fdc520a36 Merge remote-tracking branch 'origin/develop' into 1923-Migrar_agentes_desde_metaconsola 2018-03-12 13:07:34 +01:00
artica a66a7fde49 Auto-updated build strings. 2018-03-12 00:01:29 +01:00
artica 6235fc381a Auto-updated build strings. 2018-03-11 00:01:29 +01:00
artica 4af8841c29 Auto-updated build strings. 2018-03-10 00:01:37 +01:00
daniel 2605064c02 minor change 2018-03-09 15:33:51 +01:00
vgilc df6370ac4b Merge branch '1908-No-se-muestran-correctamente-las-gráficas-con-decimales-dev' into 'develop' 
Fixed shorten axis units

See merge request artica/pandorafms!1359
 2018-03-09 12:22:27 +01:00
danielmaya 64b62edd90 Fixed shorten axis units 2018-03-09 10:18:02 +01:00
artica 5a13db5a18 Auto-updated build strings. 2018-03-09 00:01:42 +01:00
fermin831 f0dbb78950 [Autoprovision] Added order and removed type from tprovisioning 2018-03-08 14:22:10 +01:00
artica f3f0d7771c Updated version and build strings. 2018-03-08 12:26:57 +01:00
daniel 1f3b95f6d1 check problems migration 2018-03-08 12:09:03 +01:00
vgilc ff8051b433 Merge branch '2031-syslogserver-perdida-de-historico-en-cambio-de-alias' into 'develop' 
Added get_agent as unified function

See merge request artica/pandorafms!1355
 2018-03-08 10:08:28 +01:00
artica 05fab2100d Updated version and build strings. 2018-03-08 09:47:20 +01:00
artica 89da7843ee Auto-updated build strings. 2018-03-08 00:01:34 +01:00
vgilc d9bbabf491 Merge branch 'cherry-pick-6b7a22e4' into 'develop' 
Aprovechar el arreglo de artica/pandorafms!1352 en develop

See merge request artica/pandorafms!1353
 2018-03-07 17:24:52 +01:00
fbsanchez 5450c682a9 Added get_agent as unified function 
It unifies:
- get_agent_from_alias
- get_agent_from_addr
- get_agent_from_name
 2018-03-07 16:56:35 +01:00
vgilc 5335b69b61 Merge branch '1776-3833-no-aparecen-eventos-en-la-aplicacion-de-android-v6' into 'pandora_6.0' 
Resolve "[ #3833] No aparecen Eventos en la aplicación de android v6"

See merge request artica/pandorafms!1352

(cherry picked from commit 6b7a22e47c)

c7e7ea1e Removed unwanted output from the api.php responses
 2018-03-07 16:54:18 +01:00
artica a0eff331c5 Auto-updated build strings. 2018-03-07 00:01:39 +01:00
vgilc 725ad80872 Merge branch '2011-Consolas-visuales-no-se-muestran-IPM-2' into 'develop' 
Fix visual console list groups filter - #2011

See merge request artica/pandorafms!1348
 2018-03-06 17:13:03 +01:00
enriquecd 80fb004c96 Fix visual console list groups filter - #2011 2018-03-06 17:07:02 +01:00
vgilc ccad148875 Merge branch '1894-Metaconsola-no-muestra-contador-de-autorefresh-dev' into 'develop' 
Fixed refresh in metaconsole

See merge request artica/pandorafms!1345
 2018-03-06 13:38:26 +01:00
danielmaya dc5a8b8425 Fixed refresh in metaconsole 2018-03-06 13:13:40 +01:00
vgilc 9588ddeb1b Merge branch 'ent-2014-5152-autovalidacion-automatica-de-eventos-en-metaconsola-sin-tener-que-validarse' into 'develop' 
[Server] Fixed event creation from alert server (use id_template_module instead id_template)

See merge request artica/pandorafms!1344
 2018-03-06 11:10:25 +01:00
artica 98b2aa2c8e Auto-updated build strings. 2018-03-06 00:01:36 +01:00
fermin831 79f65b43ff [Server] Fixed event creation from alert server (use id_template_module instead id_template) 2018-03-05 18:06:42 +01:00
vgilc 7ee1fbf1d8 Merge branch '1802-comision-europea-mejoras-plugin-mysql' into 'develop' 
Minor fixes and new methods

See merge request artica/pandorafms!1330
 2018-03-05 17:00:02 +01:00
fbsanchez 22192e6890 PluginTools Minor fixes 2018-03-05 16:43:18 +01:00
Ramon Novoa e1c171483e Change the type of netstat modules to incremental. 2018-03-05 15:33:42 +01:00
fbsanchez 19ddaeb799 Plugin Tools added get_address, some fixes and default values 2018-03-05 14:27:51 +01:00
fermin831 cd74015b95 [Autoprovision] Create tprovisioning and tprovisioining rules tables 2018-03-05 12:39:56 +01:00
vgilc efdb784ffd Merge branch 'ent-2009-Backgrounds-Consola-Visual-azul' into 'develop' 
[Visual console] Added background images

See merge request artica/pandorafms!1343
 2018-03-05 12:05:18 +01:00
vgilc 88d000379a Merge branch 'fix-modules_selection_mode_changes_not_update_module_list' into 'develop' 
Make change of "modules selection mode" in scheduled downtime editor updates module list

See merge request artica/pandorafms!1334
 2018-03-05 09:15:30 +01:00
artica a01d65fb89 Auto-updated build strings. 2018-03-05 00:01:32 +01:00
artica 5db4a03117 Auto-updated build strings. 2018-03-04 00:01:30 +01:00
artica a3c3b1c699 Auto-updated build strings. 2018-03-03 00:01:43 +01:00
fermin831 33e76d176a [Visual console] Added background images 2018-03-02 14:21:18 +01:00