opidor/dmpopidor

Fork: 0

opidor / dmpopidor

History for dmpopidor / app / controllers

2016-08-03	e9107c2 Browse files » merged conflicts briley committed on 3 Aug 2016
2016-08-03	13c157b Browse files » Added some bug fixes that were a part of an old 'upgrade-bootstrap' branch but were missed when creating the rails-4-2 pull request. Also replaces the static page urls with localized versions briley committed on 3 Aug 2016
2016-07-28	63fd0a3 Browse files » Sam's fix for the API token issue (#11) ... * added data structures for testing * renamed token_permission_type to plural to follow convention of fixtures * added gem to allow testing of controllers * began implimenting testing for projects controller * fixed auth to reject empty string * added data structures for testing * added data structures for testing * removed old unnecissary data structures from fixtures * added forgotten view for org-admins giving user's api permissions * updated .gitignore * added gem to allow testing of controllers * began implimenting testing for projects controller * fixed auth to reject empty string * added data structures for testing * added data structures for testing * removed old unnecissary data structures from fixtures * added forgotten view for org-admins giving user's api permissions * updated .gitignore * fixed leftover merge conflict in .gitignore * updated org-admin view of users for rails 4.2 compatability * fiexed a bug where user's api token permissions wouldnt display * fixed syntax error * changed guidance_group to guidance_groups for consistancy with api spec * fix roadmap route * bugfixing auth for api * removed token_permission as it was accidentially re-added by a merge * added gem to allow testing of controllers * began implimenting testing for projects controller * fixed auth to reject empty string * added data structures for testing * added data structures for testing * removed old unnecissary data structures from fixtures * added forgotten view for org-admins giving user's api permissions * updated .gitignore * removed old unnecissary data structures from fixtures * updated .gitignore * updated org-admin view of users for rails 4.2 compatability * fiexed a bug where user's api token permissions wouldnt display * fixed syntax error * changed guidance_group to guidance_groups for consistancy with api spec * bugfixing auth for api * modified schema * removed admin interface to token_permission, another forgotten side-effect * removed admin interface to token_permission, another forgotten side-effect Jimmy Angelakos authored on 28 Jul 2016 Brian Riley committed on 28 Jul 2016
2016-07-22	6ce7e04 Browse files » Rails 4.2 (#10) ... * Migrated codebase from rails 4.0 to 4.2, also removed most of the version specifications from the gem dependencies and ran bundle update * Commented out api test since it is incomplete and references a missing fixture. Also commented out stubbed performance test because that functionality is no longer a part of rails * renamed config/environment to config/environments which is what rails is looking for. Commented out the DOCX mime type reference because it is already added by rails. Commented out the belongs_to_and has_many line in models/user because it is already defined by rolify gem * updated ruby version to 2.1.10 for devise gem * Added line to have tests auto-run db:migrate * Ran db:migrate to update the schema since there were some pending migrations preventing travis from running rake * removed schem_migration line from test_helper as it did not seem to help with the schema migration issue in travis * Added fb:migrate and db:test:prepare commands to travis file * replaced deprecated ActiveRecord::Migrator call in old db migration file * Removed rake db tasks from travis file now that the offending migration script has been fixed * added rake db:test:prepare back to travis file and added call to run default test task * Updated find_by_all to the newer and more accepted 'where' * Updated routes.rb to remove unecessary create and edit route definitions * Fixed stack too deep error by commenting out circular reference to sections in the version model. Changed deprecated '.find(:all, :order => 'field ASC')' format to '.all.order('field')' * removed redundant bootstrap file. using bootstrap.min.js going forward. updated css to default align all text to left * Added js preventDefault to modal popup functions to prevent them from appearing and immediately disappering * Replaced deprecated link_to_function. the call in the helpers/application.rb should eventually be rethought. We shouldn't be using the onclick function of an html element directly, we should use the jquery approach: .click() * removed deprecated link_to_object function from helpers/application.rb and added client side js script to add new options to a question. * Upgraded select2 js file * Removed all accepts_nested_attributes_for for belongs_to associations because they were creating circular calls in ActiveRecord. * Fixed add/remove option js * Fixed i18n calls in erb files that were missing an equal sign (e.g. <% t('value'') %> --> <%= t('value') %> so that the value will appear to the user. Also updated i18n calls from admin.js with 'js.' prefix) * Removed deprecated uniq_by call on ActiveRecord collection * Updated textbox and textarea sizes on contact_us form. added a route for the 'future plans' page * Added 'self' prefix to dmptemplate references in models/project.rb because of a scoping issue. tweaks to select2 dropdowns on create project page * Moved i18n calls out of string content in toolbar.js * Removed outdated i%() array initializers because they now create arrays of symbols instead of strings * Fixes to the plan settings page * Fixed issues with settings hash * Removed some debug statements * Added the new rails 4.2 byebug gem * added rails 4 bin * added rails 4 bin * tweaks to env and session_store cookie domain * Updated routes to make lock/unlock paths use json by default * updated routes for lock/unlock section on plan form * fixed issue with lock/unlock using .json extension in ajax call. fixed unknown i18n references in plans.js * Fixed issue with location of web-console in the Gemfile. Brian Riley authored on 22 Jul 2016 GitHub committed on 22 Jul 2016
	90c9052 Browse files » Fixed merge conflicts API/I18n -> Rails 4.2 Brian Riley committed on 22 Jul 2016
	ec4ac16 Browse files » Merged conflicts Brian Riley committed on 22 Jul 2016
	97cb77a Browse files » merge DamodarSojka committed on 22 Jul 2016
	0e5ec7d Browse files » localization based on url DamodarSojka committed on 22 Jul 2016
2016-07-21	2df281d Browse files » Fixed issues with settings hash briley committed on 21 Jul 2016
2016-07-21	9075316 Browse files » Fixes to the plan settings page briley committed on 21 Jul 2016
2016-07-20	1accf80 Browse files » Removed outdated i%() array initializers because they now create arrays of symbols instead of strings briley committed on 20 Jul 2016
	a9b062b Browse files » Added 'self' prefix to dmptemplate references in models/project.rb because of a scoping issue. tweaks to select2 dropdowns on create project page briley committed on 20 Jul 2016
	7b879f3 Browse files » final commit before merging into master xsrust committed on 20 Jul 2016
2016-07-19	c4393e3 Browse files » Fixed add/remove option js briley committed on 19 Jul 2016
	8fcd6dc Browse files » added view for token_permission_types xsrust committed on 19 Jul 2016
	1b6dc89 Browse files » added a page for users to view api endpoint information xsrust committed on 19 Jul 2016
	018585f Browse files » updated logic for token removal/generation xsrust committed on 19 Jul 2016
2016-07-18	96d48ae Browse files » Removed all accepts_nested_attributes_for for belongs_to associations because they were creating circular calls in ActiveRecord. briley committed on 18 Jul 2016
	33eb22d Browse files » controller now depricated xsrust committed on 18 Jul 2016
	f14a1a5 Browse files » added way to define users api-tokens through users controller xsrust committed on 18 Jul 2016
2016-07-15	18df131 Browse files » removed deprecated link_to_object function from helpers/application.rb and added client side js script to add new options to a question. Brian Riley committed on 15 Jul 2016
	7a6a1a7 Browse files » Fixed stack too deep error by commenting out circular reference to sections in the version model. Changed deprecated '.find(:all, :order => 'field ASC')' format to '.all.order('field')' Brian Riley committed on 15 Jul 2016
	99234ab Browse files » localization further work, including dropdown initial work DamodarSojka committed on 15 Jul 2016
	71a174f Browse files » comment for clarity xsrust committed on 15 Jul 2016
	1693c2d Browse files » re-wrote authentication to ignore empty string tokens xsrust committed on 15 Jul 2016
2016-07-11	0bb8f26 Browse files » changed can_view to can_view? for consistency xsrust committed on 11 Jul 2016
2016-07-08	3572cb0 Browse files » updated call for can_view to can_view? xsrust committed on 8 Jul 2016
2016-06-30	95ed5fd Browse files » standardised errors in api controllers xsrust committed on 30 Jun 2016
	0f83c82 Browse files » adding standardised errors to locales xsrust committed on 30 Jun 2016
	0030458 Browse files » added parsing of guidances to projects api ... -Added parsing of the guidance param in the JSON xsrust committed on 30 Jun 2016