dmpopidor / app / views /
@briley briley authored on 1 Feb 2017
..
admin/ dmptemplates Merging current stable development branch into master (#23) 9 years ago
api/ v0 updated api templates endpoints to use new data access 9 years ago
contact_us Moved org specific telephone, address and google maps link to config/branding.yml 9 years ago
devise resolved merge conflicts 9 years ago
dmptemplates fixed merge conflicts 9 years ago
guidance_groups re-wrote data access for guidance_groups controller 9 years ago
guidances updated prefetching for guidances index 9 years ago
home Merging current stable development branch into master (#23) 9 years ago
layouts resolved merge conflicts 9 years ago
orgs updated orgs_controller, views, and model 9 years ago
plans resolved merge conflicts 9 years ago
projects resolved merge conflicts 9 years ago
settings fixed merge conflicts 9 years ago
shared resolved merge conflicts 9 years ago
static_pages resolved merge conflicts 9 years ago
templates Merge branch 'final_schema' of https://github.com/CDLUC3/roadmap into final_schema 9 years ago
token_permission_types Corrected spelling of text_desription field in token_permission_types 9 years ago
user_mailer fixed syntax bug in user_mailer for api_tokens 9 years ago
users updated users controller 9 years ago