add search icon
Merge branch 'master' of github.com:StrataLabs/service_desk
SDPII-76 - ldap validate username first
SDPII-76 fix - ldap validate username first
SDPII-76 fix 2- ldap validate username first
refactor dashboard#new_ticket
SDPII-29 Ability to configure and override the default SMS template
Merge branch 'master' of https://github.com/StrataLabs/service_desk
SDPII-56/70 refactor tickets controller
SDPII-29 - Ability to configure and override the default SMS template
adding application.yml to staging.rb
fixing specs
fixing sms
fix conflict
sms templates
fix merge conflict
Merge branch 'master' of github.com:StrataLabs/service_desk
SDPII-32 Merge Conflict