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

3087 Commits

Author SHA1 Message Date
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
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 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
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
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
Junichi Satoh c50fd249be Fixed error without enterprise. 2017-03-07 19:20:18 +09:00
daniel 7ecfe679ea fixed graph pie legend 2017-03-07 09:46:40 +01:00
daniel 9d3caa826d fixed label custom graph 2017-03-07 09:28:22 +01:00