opidor/dmpopidor

Fork: 0

opidor / dmpopidor

History for dmpopidor / db

2016-08-12	63c131e Browse files » Updated gemfile to specify >= ruby 2.2.2. Updated Rails to the latest version due to an XSS vulnerability. updated locale initializer to handle migration issue where it was checking default_location in langauges table before the column exists. Also added check for instances where no default langauge is specified. Rebuilt schema.rb. Fixed issue with seeds.rb reported by Weiwei Brian Riley committed on 12 Aug 2016
	015259a Browse files » Resolved merge conflicts Brian Riley committed on 12 Aug 2016
	8fe7792 Browse files » Merging master (#20) ... * 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 * modified return structure of guidance_groups API to reflect current spec * removed guidances api endpoint as no longer necissary * added templates api endpoint * commit * commit * initial commit of untested statistics API * updated Statistics API and added bugfixes * added aditional seeds for api token_permission_types * added docs for stats api, also passing tests * added fucntionality to give org_admin priveleges through the org_admin interface * corrected statistics API to handle null dates and filter projects correctly * addedrestriction that users must be confirmed to be counted by stats api * added documentation to dmptemplates api controller * added org_id field to plans metadata as a returned plan can belong to somebody else's organisation * initial passover of removing magic strings * added comment to I18n_constant and fixed missing magic string * fixed the magic strings function * removed duplicate gem from gemfile * migrations and routes tests * changed gem dependancies and fixed syntax bug * fixed bug where show plans view only displayed first letter of columns * aliased * added documentation to organisation, phase, and part of plans * added documentation to organisation, phase, and part of plans * added documentation to model for plan * added documentation to project model * added documentation to project_group model * added documentation to remaining models * fixed admin logout bug * removed hard-coded references to DCC * fixed bug in dmptemplate with magicstrings * dropdown and org language setting * test * commit * migrations and routes tests * aliased * dropdown and org language setting * test * remove typo * fixed parentheses bug in api/projects_controller * fix * merging * remove git merge conflicts artifacts * added gemfile, environments, and an initaliser to allow merge * fix locales picking * super_admin area for languages, changes to langauge initializer to fix migrations issue and org language priority in user language picking * add association between organisation and language Damodar Sojka authored on 12 Aug 2016 Brian Riley committed on 12 Aug 2016
2016-08-11	a15e3bf Browse files » removed mysql 5.6 specifications form travis file. added limits to size of friendly_id_slugs index briley committed on 11 Aug 2016
	a874431 Browse files » removed mysql 5.6 specifications form travis file. added limits to size of friendly_id_slugs index briley committed on 11 Aug 2016
	a63a206 Browse files » added length specification to a few indexes that are causing travis mysql db setup issues briley committed on 11 Aug 2016
	769b5fc Browse files » rebuilt db schema briley committed on 11 Aug 2016
2016-08-03	8580b6b Browse files » Added in missing bug fixes (#13) ... * 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 Brian Riley authored on 3 Aug 2016 GitHub committed on 3 Aug 2016
2016-08-03	e9107c2 Browse files » merged conflicts 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
	189c22c Browse files » prepping for final merge 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
2016-07-20	7b879f3 Browse files » final commit before merging into master xsrust committed on 20 Jul 2016
2016-07-19	1e33e95 Browse files » language table, dropdown, additional locales DamodarSojka committed on 19 Jul 2016
2016-07-19	843ace8 Browse files » removed depricated api strucures from the models xsrust committed on 19 Jul 2016
2016-07-15	e3e8641 Browse files » updated seeds file for better compatability xsrust committed on 15 Jul 2016
2016-07-05	71fff86 Browse files » migrated from old schema xsrust committed on 5 Jul 2016
2016-06-29	f5d3d5c Browse files » replaced deprecated ActiveRecord::Migrator call in old db migration file briley committed on 29 Jun 2016
2016-06-29	2d28ef0 Browse files » Ran db:migrate to update the schema since there were some pending migrations preventing travis from running rake briley committed on 29 Jun 2016
2016-06-28	4d47484 Browse files » Fixed typo in token_permissions in db/seeds.rb. Started cleanup of tests briley committed on 28 Jun 2016
2016-06-27	23760dd Browse files » Ran a rake db:migration:reset to get the API db changes in briley committed on 27 Jun 2016
	8277115 Browse files » Rebased development branch and corrected merge conflicts briley committed on 27 Jun 2016
	33dab23 Browse files » Master (#7) ... * Update license (merging Marta's change that added Univ. of Glasgow to the text) Update license to include University of Glasgow. * Added API and Localisation work API development done by Sam Rust - xsrust Localisation work done by Damodar Sojka - DamodarSojka DigitalCurationCentre authored on 27 Jun 2016 Brian Riley committed on 27 Jun 2016
2016-06-23	c540f48 Browse files » Added API and Localisation work ... API development done by Sam Rust - xsrust Localisation work done by Damodar Sojka - DamodarSojka xsrust committed on 23 Jun 2016
2016-06-09	058f58b Browse files » Added better data to seeds file. Tested upgrade to bootstrap 3.2 but reverted back briley committed on 9 Jun 2016
2016-06-07	a70427e Browse files » Updated seeds.rb to first check to see if record exists before inserting. Added a 4.0 hack to load the new config/secrets.yml file instead of config/initializers/secret_token.rb, this new secrets.yml will auto-load when we are on 4.1 briley committed on 7 Jun 2016
2016-06-06	1c377e5 Browse files » commented out reference to old AdminUser object in DB migration file. Added installation instructions to README briley committed on 6 Jun 2016