opidor/dmpopidor

Fork: 0

opidor / dmpopidor

2018-03-20	Unverified 8f453a0 Browse files » Merge pull request #1303 from CDLUC3/issue1275 ... Updates to Super Admin Users page Jose Lloret authored on 20 Mar 2018 GitHub committed on 20 Mar 2018
	77014f5 Browse files » added active flag to users and updated admin users page to allow admin to update the value ... updated column text Updated inactive message updated mailers to exclude inactive users except for sharing and devise emails about their account added tests for super admin users. added functionality for super admin to edit user info added org and created columns to users table swapped in good schema.rb removed debug line added new field to schem.rb manually fixed schema.rb added button to go back to users and switched from and to && fixed typo in schema.rb briley authored on 15 Mar 2018 Brian Riley committed on 20 Mar 2018
	Unverified e2e1057 Browse files » Merge pull request #1295 from CDLUC3/issue1220 ... added check for user's role on a plan to determine if download tab is… Jose Lloret authored on 20 Mar 2018 GitHub committed on 20 Mar 2018
	Unverified e359596 Browse files » Merge pull request #1304 from DigitalCurationCentre/issue1184 ... Fixes #1184 . Brian Riley authored on 20 Mar 2018 GitHub committed on 20 Mar 2018
	Unverified 67631c4 Browse files » Merge pull request #1302 from DigitalCurationCentre/gettextfix ... Exclude javascript directory which seems to break "rake gettext:find" Brian Riley authored on 20 Mar 2018 GitHub committed on 20 Mar 2018
2018-03-19	f016708 Browse files » Fixes #1184 . ... - example_answer/guidance test expected Integer, received String from enum - added a few `.chomp.strip`s to fix naughty user-entered texts - changed "Created by the %{app...}" to "Created by the %{app...} service" as it didn't look right for some service names Jimmy Angelakos committed on 19 Mar 2018
2018-03-16	Unverified 8cb98d7 Browse files » Update CONTRIBUTING.md Brian Riley authored on 16 Mar 2018 GitHub committed on 16 Mar 2018
2018-03-16	67fa429 Browse files » Exclude javascript directory which seems to break "rake gettext:find" Jimmy Angelakos committed on 16 Mar 2018
2018-03-15	Unverified 20a2a04 Browse files » Merge pull request #1299 from DigitalCurationCentre/issue1292 ... Re-enable display of themed guidance from the organisation the template belongs to Brian Riley authored on 15 Mar 2018 GitHub committed on 15 Mar 2018
	10aaded Browse files » Workaround for #1292 Jimmy Angelakos committed on 15 Mar 2018
	7976e15 Browse files » added check for user's role on a plan to determine if download tab is available briley committed on 15 Mar 2018
2018-03-13	Unverified 7539038 Browse files » Merge pull request #1289 from DMPRoadmap/master-merge ... Merge from master to resolve conflicts Jimmy Angelakos authored on 13 Mar 2018 GitHub committed on 13 Mar 2018
	4c82a9a Browse files » Merge branch 'master' into development ... Conflicts: app/controllers/phases_controller.rb app/models/plan.rb app/models/section.rb app/views/phases/_answer_form.html.erb app/views/phases/edit.html.erb app/views/plans/_plan_nav_tabs.html.erb app/views/sections/_progress.html.erb app/views/templates/admin_template.html.erb Jimmy Angelakos committed on 13 Mar 2018
	Unverified 32a1e30 Browse files » Merge pull request #1287 from DigitalCurationCentre/themes_tasks ... added rake tasks for themes Jimmy Angelakos authored on 13 Mar 2018 GitHub committed on 13 Mar 2018
	Unverified 3d6018d Browse files » spelling Jimmy Angelakos authored on 13 Mar 2018 GitHub committed on 13 Mar 2018
	Unverified cf2da6c Browse files » Merge pull request #1286 from DigitalCurationCentre/phases_fix ... Select the correct phase for editing in edit plan Brian Riley authored on 13 Mar 2018 GitHub committed on 13 Mar 2018
	Unverified aed8d74 Browse files » remove accidentally committed line Sam Rust authored on 13 Mar 2018 GitHub committed on 13 Mar 2018
	eb6b515 Browse files » added rake tasks for themes xsrust committed on 13 Mar 2018
	a097325 Browse files » Select the correct phase for editing in edit plan Jimmy Angelakos committed on 13 Mar 2018
	Unverified 8dfeaee Browse files » Merge pull request #1284 from DigitalCurationCentre/remove_migration ... Remove migration Brian Riley authored on 13 Mar 2018 GitHub committed on 13 Mar 2018
	391b9eb Browse files » Remove offending migration Jimmy Angelakos committed on 13 Mar 2018
	d53aa3c Browse files » Merge branch 'development' of https://github.com/DMPRoadmap/roadmap into development Jimmy Angelakos committed on 13 Mar 2018
	Unverified 8e0c24f Browse files » Merge pull request #1282 from DigitalCurationCentre/upgrade_omniauth ... Update OmniAuth (CVE-2017-18076) Brian Riley authored on 13 Mar 2018 GitHub committed on 13 Mar 2018
	d405c3c Browse files » Update omniauth-orcid because of ORCID API 1.2 deprecation Jimmy Angelakos committed on 13 Mar 2018
	f58e196 Browse files » Update OmniAuth (CVE-2017-18076) Jimmy Angelakos committed on 13 Mar 2018
	bfb1f52 Browse files » Merge branch 'development' of https://github.com/DMPRoadmap/roadmap into development Jimmy Angelakos committed on 13 Mar 2018
	Unverified cbcd557 Browse files » Merge pull request #1281 from DigitalCurationCentre/required_indices ... Migration for adding required indices. Jose Lloret authored on 13 Mar 2018 GitHub committed on 13 Mar 2018
	0dae80b Browse files » Migration for adding required indices. Jimmy Angelakos committed on 13 Mar 2018
	Unverified 7ca7ebd Browse files » Merge pull request #1273 from DigitalCurationCentre/issue1210_ ... Issue 1210 Jimmy Angelakos authored on 13 Mar 2018 GitHub committed on 13 Mar 2018
	ffc581d Browse files » Fixes broken tasks and adds two migrations to keep db integrity. DMPRoadmap/roadmap#1210 ... . . Jose Lloret committed on 13 Mar 2018