opidor/dmpopidor

Fork: 0

opidor / dmpopidor

2018-03-21	3a1dbd0 Browse files » First Branding version FAURE Benjamin committed on 21 Mar 2018
2018-03-19	Unverified 9e4fcbc Browse files » Merge pull request #39 from DMPRoadmap/master ... DMPRoadmap V1.0.0 Benjamin FAURE authored on 19 Mar 2018 GitHub committed on 19 Mar 2018
2018-03-13	Unverified 7814e53 Browse files » Merge pull request #1288 from DMPRoadmap/development ... master <- development merge for Roadmap v1.0.0 release Jimmy Angelakos authored on 13 Mar 2018 GitHub committed on 13 Mar 2018
	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
	Unverified 9f1d047 Browse files » Merge pull request #1280 from CDLUC3/issue1278 ... added sort to sections/questions for export Jose Lloret authored on 13 Mar 2018 GitHub committed on 13 Mar 2018
	Unverified 960269b Browse files » Merge pull request #1277 from DigitalCurationCentre/rename_bugfix ... Renamed bugfix rake task to upgrade Jose Lloret authored on 13 Mar 2018 GitHub committed on 13 Mar 2018
2018-03-12	860d648 Browse files » added sort to sections/questions for export briley committed on 12 Mar 2018
	Unverified 6d572ba Browse files » Merge pull request #1276 from DigitalCurationCentre/sync_i18n_l10n ... Sync all translations & locales Brian Riley authored on 12 Mar 2018 GitHub committed on 12 Mar 2018
	a5361f7 Browse files » Renamed bugfix rake task to upgrade Jimmy Angelakos committed on 12 Mar 2018
	e2c9790 Browse files » Remove :custom date display format for i18n reasons Jimmy Angelakos committed on 12 Mar 2018
	d2b3dbf Browse files » Renamed bugfix rake task to upgrade Jimmy Angelakos committed on 12 Mar 2018
	9a8f926 Browse files » Sync all translations & locales Jimmy Angelakos committed on 12 Mar 2018