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

14726 Commits

Author SHA1 Message Date
vgilc d4c635d5f1 Merge branch '537-Removed-menu-options-in-dashboard-but-keep-cancel-zoom-dev' into 'develop' 
Works in good dashboards module graphs

See merge request !509
 2017-05-25 10:54:58 +02:00
Arturo Gonzalez 09b90be1ca Works in good dashboards module graphs 2017-05-25 10:08:30 +02:00
artica faa96927dd Auto-updated build strings. 2017-05-25 00:01:12 +02:00
enriquecd df715561d7 Format module inventary to show only changes on events - #523 2017-05-24 18:24:53 +02:00
Arturo Gonzalez 71b809ac25 Fixed wrong ids 2017-05-24 18:01:58 +02:00
Arturo Gonzalez 3155b81eb5 Added correct path to images in login page background 2017-05-24 17:09:44 +02:00
Daniel Maya a8cae99747 Updated id module group 2017-05-24 16:17:43 +02:00
Arturo Gonzalez 8b849efc3c Added changes to group view 2017-05-24 15:39:44 +02:00
vgilc 44dc9128b2 Merge branch '537-Module-graphs-dev' into 'develop' 
537 module graphs dev

See merge request !503
 2017-05-24 14:14:16 +02:00
Arturo Gonzalez 20c205fbc9 Added good styles to graphs 2017-05-24 13:12:47 +02:00
Arturo Gonzalez 4a03298b69 Added unit to module name and recolocate yaxis label 2017-05-24 12:18:43 +02:00
vgilc 20599871a1 Merge branch '711-agent-name-en-lugar-de-alias' into 'develop' 
Remove quotation marks in agent deletion

See merge request !501
 2017-05-24 09:26:18 +02:00
vgilc af898c8b3d Merge branch '704-agrupar-gráficas-combinadas' into 'develop' 
704 agrupar gráficas combinadas

See merge request !500
 2017-05-24 09:25:11 +02:00
artica 42704e5981 Auto-updated build strings. 2017-05-24 00:01:10 +02:00
Arturo Gonzalez 63554c54a2 Removed babel 2017-05-23 17:55:37 +02:00
Daniel Maya e1b867069b Remove quotation marks in agent deletion 2017-05-23 17:50:37 +02:00
Daniel Maya 0f9a2cf2f8 New feature: Graphic grouping. added mr 2017-05-23 17:17:40 +02:00
Daniel Maya e243067c4b New feature: Graphic grouping 2017-05-23 17:13:47 +02:00
Arturo Gonzalez 63129641eb Fixed free search 2017-05-23 16:54:24 +02:00
vgilc 6f6eac640b Merge branch '913-fixed-blank-page-in-user-creation-(metaconsole)-dev' into 'develop' 
Ficed bad include call

See merge request !498
 2017-05-23 15:50:04 +02:00
Arturo Gonzalez 8692a17567 Ficed bad include call 2017-05-23 15:36:35 +02:00
Arturo Gonzalez d744cb9220 Added end date to fullscale chart view 2017-05-23 15:16:34 +02:00
Arturo Gonzalez 53f4c6edb8 Added fullscale setting in boolean chart 2017-05-23 15:15:28 +02:00
Arturo Gonzalez 5bb3cd2ad6 Added some code to fullscale graphs 2017-05-23 15:02:53 +02:00
vgilc c8251d62e0 Merge branch '788_Añadir_macros_para_varias_ips' into 'develop' 
add new macros all_address and address_n

See merge request !497
 2017-05-23 10:25:56 +02:00
vgilc b21e09deef Merge branch '635-reset-or-recover-password-in-pandora-node-and-meta-dev' into 'develop' 
635 reset or recover password in pandora node and meta dev

See merge request !389
 2017-05-23 10:14:43 +02:00
daniel 37d3d895b0 add new macros all_address and address_n 2017-05-23 10:09:32 +02:00
vgilc 3abb9710b1 Merge branch '596-default_event_filter_by_user' into 'develop' 
596 default event filter by user

See merge request !354
 2017-05-23 10:05:49 +02:00
artu30 faa353bc5c Merge branch 'develop' into '635-reset-or-recover-password-in-pandora-node-and-meta-dev' 
# Conflicts:
#   pandora_console/include/help/clippy/extension_cron_send_email.php
 2017-05-23 09:50:22 +02:00
artu30 37757f7ace Merge branch 'develop' into '596-default_event_filter_by_user' 
# Conflicts:
#   pandora_console/godmode/users/configure_user.php
 2017-05-23 09:48:37 +02:00
artica eddeb12bcf Auto-updated build strings. 2017-05-23 00:01:18 +02:00
vgilc 7b851742b1 Merge branch '777-translations-dev' into 'develop' 
777 translations dev

See merge request !413
 2017-05-22 17:57:27 +02:00
artu30 a78b5cc60d Merge branch 'develop' into '777-translations-dev' 
# Conflicts:
#   pandora_console/godmode/update_manager/update_manager.offline.php
#   pandora_console/include/functions_update_manager.php
 2017-05-22 17:51:21 +02:00
vgilc 50420f79b9 Merge branch '836-fixed-margin-top-images-in-vc-lines-open-dev' into 'develop' 
Added margin top value to images when have lines

See merge request !496
 2017-05-22 17:45:57 +02:00
artu30 b5d3893c41 Merge branch 'develop' into '836-fixed-margin-top-images-in-vc-lines-open-dev' 
# Conflicts:
#   pandora_console/include/javascript/pandora_visual_console.js
 2017-05-22 17:38:49 +02:00
Arturo Gonzalez f58a9151f7 Fixed bad merge, thx branches 2017-05-22 17:37:21 +02:00
Arturo Gonzalez 309e9e900e Added margin top value to images when have lines 2017-05-22 17:31:29 +02:00
vgilc 6bded36a60 Merge branch '599-csv_divider_selector' into 'develop' 
599 csv divider selector

See merge request !359
 2017-05-22 17:11:52 +02:00
Hirofumi Kosaka d209bd2f45 Bug Fix: SNMP Alert could not refer agents. #150 2017-05-22 15:50:49 +09:00
artica 3b6272a7d2 Auto-updated build strings. 2017-05-22 00:01:14 +02:00
artica 7d7d5a9cec Auto-updated build strings. 2017-05-21 00:01:52 +02:00
artica 7749e7c08a Auto-updated build strings. 2017-05-20 00:01:16 +02:00
enriquecd 3e230572ad Change permission filter for module bulk operations, PM change to AW - #902 2017-05-19 14:58:34 +02:00
enriquecd 61eb5e755e Fix insert data extension, bad parameters in xml format - #869 2017-05-19 14:00:47 +02:00
Arturo Gonzalez 16fe10d1af Added fullscale to boolean charts. Continue with the tests. 2017-05-19 12:04:54 +02:00
vgilc daf3c5d3f7 Merge branch 'Ayuda-Upload_max_filesize-PHP-v7' into 'develop' 
Update en_GB translations - #886

See merge request !491
 2017-05-19 12:00:28 +02:00
enriquecd bb0eec8883 Update en_GB translations - #886 2017-05-19 11:44:12 +02:00
vgilc da314c7ed7 Merge branch '825-La-pantalla-de-login-con-mysql-parado-no-configurado-no-se-ve-correctamente-2' into 'develop' 
Fix logout bad permission with myslq service stopped dialog - #825

See merge request !490
 2017-05-19 11:24:09 +02:00
enriquecd 57393eb9cf Fix logout bad permission with myslq service stopped dialog - #825 2017-05-19 11:12:58 +02:00
Hirofumi Kosaka 5807e55459 Modified SNMP Console to prefer agent aliases as SNMP agent if registered. #149 2017-05-19 16:49:54 +09:00