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

3190 Commits

Author SHA1 Message Date
vgilc b506e47150 Merge branch '622-fixed-qick-guide' into 'develop' 
Remove temporality links to help. And in future chenge this help

See merge request !386
 2017-05-17 17:28:46 +02:00
vgilc 4ced4feeed Merge branch '783-Imagen-incorrecta-offline-manager-7' into 'develop' 
Change update manager offline icon - #783

See merge request !406
 2017-05-17 17:22:13 +02:00
vgilc aed804e022 Merge branch '759-actualizador-pandora' into 'develop' 
Change update manager advice when there are db changes - #759

See merge request !410
 2017-05-17 17:19:39 +02:00
vgilc bce443e0ba Merge branch '824-Pandora-Administrators-y-umbrales-de-módulos' into 'develop' 
Make warning a critical limits fields not disabled for admin profile users - #824

See merge request !439
 2017-05-17 17:15:57 +02:00
vgilc 5e442bcb0b Merge branch '711-Agent-name-en-lugar-de-alias-en-visor-de-actividad-dev' into 'develop' 
Changed name by alias when deleting agent

See merge request !380
 2017-05-17 17:12:46 +02:00
vgilc b861d2a19e Merge branch '795-elements-colocation-in-scheduled-downtime-dev' into 'develop' 
Changed elements colocation in planned downtime elements

See merge request !426
 2017-05-17 17:12:05 +02:00
enriquecd 2df8eb9454 Add icon to recon server row in operation column for pandora servers view - #442 2017-05-17 15:08:05 +02:00
Arturo Gonzalez 33ff4f8aba Added tags filter to copy modules in massive operations 2017-05-17 11:11:27 +02:00
Arturo Gonzalez 4a6b1a0daf Added tags filter to massive module deletion (anget first and module first selection) 2017-05-17 10:56:42 +02:00
Arturo Gonzalez d49f1f9916 Added tags filter to mosule massive operations (agent selection first) 2017-05-17 10:41:30 +02:00
Daniel Maya 1897ee59a3 fixed problem with parent agents 2017-05-17 10:34:35 +02:00
Arturo Gonzalez 4b94e7ce2b Added tag filter to module massive operations (edit and modules selection first) 2017-05-17 09:59:10 +02:00
Arturo Gonzalez 1361ecd2e9 Added tags select field 2017-05-16 16:37:48 +02:00
artu30 1546e48e15 Merge branch 'develop' into '689-Change_translations_in_mr_and_um_section' 
# Conflicts:
#   pandora_console/include/javascript/update_manager.js
 2017-05-16 11:57:58 +02:00
enriquecd da535e72eb Change display up front column icons for agent custom field manager - 855 2017-05-11 18:36:44 +02:00
Arturo Gonzalez 77a563eb29 Added new general table view to html 2017-05-11 14:00:59 +02:00
Arturo Gonzalez c1ef7b00db Added float parser to module threshold 2017-05-11 10:55:33 +02:00
Arturo Gonzalez 1f4b7fddc0 Added more specified alert to update modules and agents when no one field change 2017-05-11 09:29:08 +02:00
enriquecd 746eab7666 Show package version rather build version in footer (ext. fix update manager css) - #813 2017-05-10 13:18:45 +02:00
Arturo Gonzalez 6f40069aa9 Added a new system to draw lines in visual console when element have an image 2017-05-09 17:29:17 +02:00
enriquecd e8ccd7a309 Show preset options in post process selector for modules massive operations - #840 2017-05-09 16:35:58 +02:00
Arturo Gonzalez eb1dafe807 Fixed lines in visual console 2017-05-09 12:40:22 +02:00
Arturo Gonzalez 600f4bc364 Changed bad jquery get call in alert actions and alerts snmp. 2017-05-08 15:54:35 +02:00
enriquecd e32a3e4a72 Make warning a critical limits fields not disabled for admin profile users - #824 2017-05-08 13:40:12 +02:00
Arturo Gonzalez a916844f70 Changed elements colocation in planned downtime elements 2017-05-03 17:24:33 +02:00
enriquecd af5be1bfb0 Disable dinamic image size input changer on vconsole editor mode - #786 2017-04-27 17:32:28 +02:00
vgilc 211183e382 Merge branch '786-consolas-visuales-en-modo-full-screen-no-respetan-el-color-de-fondo-open' into 'develop' 
Fill background vconsole widget with vconsole color source and fix vconsole size editor - #786

See merge request !417
 2017-04-27 17:24:59 +02:00
vgilc b11865ccae Merge branch '782-Error-SQL-en-lista-de-alertas' into 'develop' 
Not use group filter sql if not exist filter_group data - #782

See merge request !412
 2017-04-27 16:31:45 +02:00
enriquecd a99eba3a45 Fill background vconsole widget with vconsole color source and fix vconsole size editor - #786 2017-04-27 13:28:49 +02:00
vgilc e11acefe38 Merge branch '143-no-saca-correos-con-caracteres-no-ascii' into 'develop' 
fixed errors send email text-plain

See merge request !411
 2017-04-26 16:30:44 +02:00
enriquecd c2208e5e4a Use real background-color in visual console builder - #785 2017-04-26 13:01:38 +02:00
enriquecd d2b409d276 Not use group filter sql if not exist filter_group data - #782 2017-04-26 12:09:35 +02:00
daniel bf2485ec25 fixed errors send email text-plain 2017-04-26 12:00:08 +02:00
Arturo Gonzalez 6aab4e60ae Added buttons text to translate them 2017-04-26 09:50:42 +02:00
enriquecd 1a6051caeb Change update manager advice when there are db changes - #759 2017-04-25 17:24:32 +02:00
vgilc cdf95a47dd Merge branch '140-error-a-la-hora-de-duplicar-alertas-snmp' into 'develop' 
fixed error duplicate alert SNMP

Closes #140

See merge request !402
 2017-04-25 16:27:17 +02:00
vgilc 4b5da69e31 Merge branch '688-problema-acl-enterprise-workspace-2-7' into 'develop' 
Change sec url string in message and vconsole section - #688 - 2

See merge request !378
 2017-04-25 16:21:00 +02:00
vgilc 5e72afaec8 Merge branch '679-añadir-tooltips-a-opciones-de-una-recon' into 'develop' 
Added tooltips in recon

See merge request !335
 2017-04-25 16:19:09 +02:00
vgilc 48939e10e7 Merge branch '716-delete_all_checkbox_in_report_items' into 'develop' 
Added checkbox to selet all items in report (to delete them)

See merge request !366
 2017-04-25 16:06:34 +02:00
enriquecd 7ee4c77897 Change update manager offline icon - #783 2017-04-25 15:37:52 +02:00
daniel 13e2f2d05b fixed error duplicate alert SNMP 2017-04-25 09:30:59 +02:00
m-lopez-f fcf3da2acf Remove temporality links to help. And in future chenge this help 2017-04-20 12:10:52 +02:00
Enrique Camargo 6259a62095 Merge branch 'develop' into '486-Mejoras-visuales-de-las-ventanas-modales-de-las-MRs-open' 
# Conflicts:
#   pandora_console/include/javascript/update_manager.js
 2017-04-19 11:39:57 +02:00
vgilc f01639a34d Merge branch '404-conf-del-satelite-se-mete-en-dataserver' into 'develop' 
Fixed problems with remote config view files of conf about server and satellite.

See merge request !329
 2017-04-18 16:01:55 +02:00
vgilc 61e328afa7 Merge branch '579-se-pueden-crear-module-templates-vacías' into 'develop' 
Deleted white space when saving modules template

See merge request !314
 2017-04-18 16:00:44 +02:00
Arturo Gonzalez 1066124678 Merge branch 'develop' into 596-default_event_filter_by_user 
Conflicts:
	pandora_agents/unix/DEBIAN/control
	pandora_agents/unix/DEBIAN/make_deb_package.sh
	pandora_agents/unix/pandora_agent
	pandora_agents/unix/pandora_agent.redhat.spec
	pandora_agents/unix/pandora_agent.spec
	pandora_agents/unix/pandora_agent_installer
	pandora_agents/win32/installer/pandora.mpi
	pandora_agents/win32/pandora.cc
	pandora_agents/win32/versioninfo.rc
	pandora_console/DEBIAN/control
	pandora_console/DEBIAN/make_deb_package.sh
	pandora_console/extras/mr/1.sql
	pandora_console/include/config_process.php
	pandora_console/install.php
	pandora_console/pandora_console.redhat.spec
	pandora_console/pandora_console.spec
	pandora_server/DEBIAN/control
	pandora_server/DEBIAN/make_deb_package.sh
	pandora_server/lib/PandoraFMS/Config.pm
	pandora_server/pandora_server.redhat.spec
	pandora_server/pandora_server.spec
	pandora_server/pandora_server_installer
	pandora_server/util/pandora_db.pl
	pandora_server/util/pandora_manage.pl
 2017-04-18 11:28:02 +02:00
Daniel Maya 42c7a400f0 Changed name by alias when deleting agent 2017-04-18 10:42:23 +02:00
enriquecd 1348256d1a Change sec url string in message section - #684 /4 2017-04-17 19:30:44 +02:00
enriquecd ee128242bc Change sec url string in message and vconsole section - #688 - 2 2017-04-17 18:51:59 +02:00
vgilc 86a4ca2a80 Merge branch '581-Error-en-custom-graphs' into 'develop' 
When there is no custom graph redirects to the graph list

See merge request !363
 2017-04-17 09:47:11 +02:00
Arturo Gonzalez 23b9e7c08d Added checkbox to selet all items in report (to delete them) 2017-04-12 11:35:26 +02:00
Arturo Gonzalez 055ab9040d Added buttonpanel to set today in planned downtime datepicker 2017-04-11 16:34:07 +02:00
Daniel Maya a81dcdcfc5 When there is no custom graph redirects to the graph list 2017-04-11 15:30:32 +02:00
Arturo Gonzalez 893707a024 Remove trace 2017-04-10 14:39:31 +02:00
Arturo Gonzalez 9cd99307dd Added selector in visual conf to select a csv divider 2017-04-10 13:58:42 +02:00
vgilc 5e4032e4de Merge branch '33-buscador-en-gestion-de-agentes-es-case-sensitive-integria-4398' into 'develop' 
Make case insensitive search bar in agent manager - #33

See merge request !320
 2017-04-07 12:52:17 +02:00
vgilc 553e58deba Merge branch '99-problemas-visualizacion-graficas-combinadas-tipo-gauge-bullet-chart-y-pie-chart-en-consolas-visuales' into 'develop' 
Filter custom graph size in  visual console editor, autoset size - #99

See merge request !287
 2017-04-07 12:51:37 +02:00
vgilc 7d5a8fd84e Merge branch '107-sell-en-network-components' into 'develop' 
Dont show "sell" message in manage_network_component header - #107

See merge request !312
 2017-04-07 12:48:57 +02:00
vgilc 9d7d4b9cad Merge branch '566-visual-console-graficas-de-area-y-creador-de-elementos-open' into 'develop' 
Adjust area graph position in vconsole dashboard / open - #566

See merge request !302
 2017-04-07 12:38:53 +02:00
Daniel Maya eb4b5b9f43 added home screen in the creation and modification of users 2017-04-06 16:17:54 +02:00
Arturo Gonzalez a6209c15ca Added event filter field to user in creation and edition 2017-04-05 17:44:24 +02:00
Arturo Gonzalez 94d85d9f6e Translations changed 2017-04-04 17:35:11 +02:00
Daniel Maya 7450e19d96 Added tooltips in recon 2017-03-31 13:56:43 +02:00
m-lopez-f 599a8b7e11 Fixed problems with remote config view files of conf about server and satellite. 2017-03-30 17:27:19 +02:00
enriquecd a0d16eff76 Make case insensitive search bar in agent manager - #33 2017-03-29 13:30:43 +02:00
Daniel Maya ea47372c06 Deleted white space when saving modules template 2017-03-29 11:01:15 +02:00
enriquecd 6003db1ebc Dont show "sell" message in manage_network_component header - #107 2017-03-29 10:52:50 +02:00
enriquecd f3b5e3bb03 Adjust area graph position in vconsole dashboard / open - #566 2017-03-24 15:08:35 +01:00
enriquecd 15749e323f Change sec param in policies section, gpolicies to gmodules / 7 / open - #562 2017-03-24 13:07:49 +01:00
enriquecd 0b6227b1bf Change strings in minor release update manager / open - #486 2017-03-23 15:53:05 +01:00
daniel 0c52b0487f fixed visual error in recorn task 2017-03-23 09:57:50 +01:00
daniel 81cf7aba11 add news checkbox for vlan_enabled and snmp_enabled 2017-03-22 16:30:15 +01:00
daniel aeb8e74bdc delete help in visual setup 2017-03-22 15:54:53 +01:00
enriquecd 62541482ab Filter custom graph size in visual console editor, autoset size - #99 2017-03-22 10:10:56 +01:00
Daniel Maya 8cc316ff83 Fixed sql bug in custom report 2017-03-21 12:28:30 +01:00
Hirofumi Kosaka 6ef5614904 Fixed 2 wrong ACL check about reporting. 
- 'IR' was required for listing custom graphs at editting items.
  - 'IW' was required for add/delete SLA items at editting SLA items
 2017-03-17 09:19:55 +01:00
daniel e252135979 merge develop 2017-03-15 17:09:40 +01:00
daniel aec0d91109 login page new 2017-03-15 15:23:28 +01:00
Arturo Gonzalez 794b292078 Changed translations in mr 2017-03-15 14:37:52 +01:00
Arturo Gonzalez d9d01a453a Added a last modifications to um offline and online open 2017-03-15 13:53:44 +01:00
Arturo Gonzalez 0db1dc50c7 Added a lot of code to um offline and online open. 2017-03-15 13:20:05 +01:00
Arturo Gonzalez adb055b13c Added a lot of code to um and rr new system 2017-03-15 10:24:29 +01:00
Arturo Gonzalez 0b62513fea Updated translations. Ticket #347 2017-03-14 16:17:13 +01:00
Daniel Maya f4350aed6b Ticket 477. Fixed some bug in the visual console 2017-03-14 15:54:46 +01:00
Ramon Novoa e12b7f0b58 Recon tasks do not generate random names currently. 2017-03-14 08:28:30 +01:00
artu30 7bca59dee1 Merge branch 'move_mr_to_um' into 'develop' 
Move mr to um

See merge request !249
 2017-03-13 16:45:54 +01:00
Arturo Gonzalez 6a39147940 Added rr to um offline. Ticket #510 2017-03-13 16:30:04 +01:00
enriquecd d87dae44db Select user_id(name inserted manually by user) info to show and order (fullname is empty often) - 92 2017-03-13 11:50:37 +01:00
Arturo Gonzalez b5168928e8 Merge branch 'develop' into move_mr_to_um 2017-03-13 08:42:08 +01:00
Arturo Gonzalez 46b008708c Move mr to um section 2017-03-10 14:01:24 +01:00
enriquecd 1dce7623f8 Massive operation profile actions - users select box now is ordered by user_id(primary name) - #92 2017-03-10 13:58:36 +01:00
Ramon Novoa 4a739775c9 Merge remote-tracking branch 'origin/develop' into feature#new-iface-names 2017-03-10 10:32:46 +01:00
Ramon Novoa 9e7c6612be Merge branch 'develop' into feature#new-iface-names 2017-03-10 10:32:40 +01:00
m-lopez-f a06389b652 Change size of rows in bulk add alerts. Gitlab: #490 2017-03-09 16:09:50 +01:00
Arturo Gonzalez 7d6aae01cd Fixed interval field in recon task form 2017-03-08 13:56:10 +01:00
Arturo Gonzalez 0fa2f9b355 Added service image in update, visual console. Ticket #473 2017-03-08 12:19:46 +01:00
enriquecd 65c31e9b7a Creator and updater palette respect original size for elements with lower than 150 size - #90 2017-03-07 17:28:22 +01:00
m-lopez-f e5ec0cb35a Kill pink unicorns 2017-03-07 16:30:40 +01:00
Arturo Gonzalez 18848536be Added icons to services in viual consoles. Ticket #473 2017-03-07 16:07:21 +01:00
Enrique Camargo 7be73cbfce Merge branch 'develop' into '84-el-tamano-de-las-graficas-no-respeta-lo-que-se-previsualiza-en-el-editor' 
# Conflicts:
#   pandora_console/operation/visual_console/render_view.php
 2017-03-07 13:19:34 +01:00