opidor/dmpopidor

Fork: 0

opidor / dmpopidor

History for dmpopidor / app / controllers / api

2017-01-25	0dce881 Browse files » updated api templates endpoints to use new data access xsrust committed on 25 Jan 2017
2016-12-12	9ea9518 Browse files » replaces Organisation. with Org. in all files xsrust committed on 12 Dec 2016
2016-09-01	56544fe Browse files » added new permissions to api xsrust committed on 1 Sep 2016
2016-09-01	c51c970 Browse files » removed cancancan and rollify xsrust committed on 1 Sep 2016
2016-08-11	3974321 Browse files » Merge branch 'development' of https://github.com/DMPRoadmap/roadmap ... Lots of merge conflicts so I had to go through and manually fix them Hopefully have not missed any conflicts nor destroyed any work done by somebody Most of the conflicts were on account of changes to branding in files, but others were content changed on both forks New Gem requires ruby 2.2.2 (contact_us) xsrust committed on 11 Aug 2016
2016-08-10	473a766 Browse files » conflicts DamodarSojka committed on 10 Aug 2016
	2452d02 Browse files » fix DamodarSojka committed on 10 Aug 2016
	9caa713 Browse files » dropdown and org language setting Damodar committed on 10 Aug 2016
2016-08-09	ae3bb64 Browse files » Replacing remaining DMPonline references with DMPRoadmap (#15) ... * 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. * Updated static page links so that they use localized paths. Added new locized_routes flag to the contact-us initializer and upgraded its gem * Updated gemfile to specify specific version of contact-us * 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 * removed console.log debug statements * Organized locale files for dependencies into subdirectories * Added localization files for the contact-us gem * Updated load path on locales initializer so that it understands subdirectories. separated en contact-us locale into en-Uk and en-US. updated contact_us page to use gem's built in localization files * updated en-UK and en-US locale files to make sure that they use their respective locale ids instead of en. Added a branding yaml file for org and app names * Change name of the application's root module from DMPonline4 to DMPRoadmap * Began removing branding variables from the locales file and placed them in branding.yml * finished initial branding of static pages * Created DMPRoadmap logo and swapped out JISC logo for UC3 logo. * commented out version specification in Gemfile for the contact-us gem * Updated the contact_us gem version for localized paths * updated contact_us gem version * removed Gemfile.lock, contact_us initializer, and /config/environments files from gitignore * added initializers that were previsouly ignored by gitignore * Changed DMPonline references to DMPRoadmap Brian Riley authored on 9 Aug 2016 GitHub committed on 9 Aug 2016
2016-08-04	2b8e919 Browse files » Merged in changes from DmpRoadmap/development xsrust committed on 4 Aug 2016
2016-08-04	135d359 Browse files » fixed the magic strings function xsrust committed on 4 Aug 2016
2016-08-03	bb81f86 Browse files » initial passover of removing magic strings xsrust committed on 3 Aug 2016
	ea7efd2 Browse files » added documentation to dmptemplates api controller xsrust committed on 3 Aug 2016
	99a4ce3 Browse files » addedrestriction that users must be confirmed to be counted by stats api xsrust committed on 3 Aug 2016
2016-08-02	6dbed6f Browse files » corrected statistics API to handle null dates and filter projects correctly xsrust committed on 2 Aug 2016
2016-08-01	cef105c Browse files » added docs for stats api, also passing tests xsrust committed on 1 Aug 2016
2016-07-29	fb06ca7 Browse files » updated Statistics API and added bugfixes xsrust committed on 29 Jul 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-28	b94ddc6 Browse files » initial commit of untested statistics API xsrust committed on 28 Jul 2016
2016-07-27	1a23955 Browse files » added templates api endpoint xsrust committed on 27 Jul 2016
2016-07-27	21119ce Browse files » removed guidances api endpoint as no longer necissary xsrust committed on 27 Jul 2016
2016-07-26	c1e1c05 Browse files » bugfixing auth for api xsrust committed on 26 Jul 2016
2016-07-26	138fa7d Browse files » fixed auth to reject empty string xsrust committed on 26 Jul 2016
2016-07-22	ec4ac16 Browse files » Merged conflicts Brian Riley committed on 22 Jul 2016
2016-07-20	7b879f3 Browse files » final commit before merging into master xsrust committed on 20 Jul 2016
2016-07-15	71a174f Browse files » comment for clarity xsrust committed on 15 Jul 2016
2016-07-15	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