Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Development sync with Roadmap #58

Merged
merged 103 commits into from
Apr 9, 2018
Merged

Development sync with Roadmap #58

merged 103 commits into from
Apr 9, 2018

Conversation

vyruss
Copy link

@vyruss vyruss commented Apr 9, 2018

Fixes # .

Changes proposed in this PR:

briri and others added 30 commits February 16, 2017 15:47
@briri
Update README.md
aceeb52
@briri
Merge branch 'DMPRoadmap-master'
5e09ccd
@briri
fixed merge conflict in README
66ab889
@briri
fixed merge conflict
d45a78c
@briri
Merge branch 'master' of https://github.com/CDLUC3/roadmap
8f506e1
@vyruss
Merge pull request #854 from DMPRoadmap/development
f1fa5a7 
v0.3.5
@briri
Merge pull request #984 from DMPRoadmap/development
e21610c 
Update yard gem and fix typo in CSS
@briri
Merge pull request #987 from DMPRoadmap/development
3d57616 
Upgrade nokogiri gem
@xsrust
updated iterator on admin_template page to remove nil access errors
5763daf
@jollopre
Merge pull request #1032 from DigitalCurationCentre/templates_bugfix
1e94a1e 
updated iterator on admin_template page to remove nil access errors
@briri
Merge branch 'master' of https://github.com/DMPRoadmap/roadmap
4bf8c10
@briri
Merge branch 'master' of https://github.com/CDLUC3/roadmap
81bc290
@briri
Fixes issue with bad join in Phase load
d6d1a99 
rewrote Plans.load_for_phase query

added notes to new query
@briri
Merge pull request #1074 from DigitalCurationCentre/phase-load-bug
1659587 
Cherry-pick of bugfix from PR #901 for deployment on live service
@xsrust
addresses 1091
27cc094
@xsrust
updates load_for_phase to handle non-existant plans/phases
1cae6f4
@jollopre
Merge pull request #1100 from DigitalCurationCentre/plan/phase_prefet…
2c2c93c 
…ch_fix

addresses 1091
@xsrust
fixes #1091
25e2669
@jollopre
Merge pull request #1118 from DigitalCurationCentre/plan/phase_prefet…
2c2dfa9 
…ch_fix

 fixes  #1091
@xsrust
ensured sections/questions are in correct order
fa7c4bc 
Sorting done in ruby to avoid hitting the DB again and loosing prefetching
I dont have a DB for the live service so was unable to test this fix
@jollopre
Merge pull request #1168 from DMPRoadmap/bugfix-section-question-order
dbf422e 
ensured sections/questions are in correct order
@vyruss
Update Omniauth to v1.3.2
4d377a6
@vyruss
Update Gemfile.lock
1f73165
Renamed bugfix rake task to upgrade
d2b3dbf
Merge branch 'development' of https://github.com/DMPRoadmap/roadmap i…
bfb1f52 
…nto development
Update OmniAuth (CVE-2017-18076)
f58e196
Update omniauth-orcid because of ORCID API 1.2 deprecation
d405c3c
@briri
Merge pull request #1282 from DigitalCurationCentre/upgrade_omniauth
8e0c24f 
Update OmniAuth (CVE-2017-18076)
Merge branch 'development' of https://github.com/DMPRoadmap/roadmap i…
d53aa3c 
…nto development
Remove offending migration
391b9eb
jollopre and others added 29 commits March 26, 2018 10:17
@jollopre
Merge pull request #1324 from DigitalCurationCentre/issue1214
c2c969a 
Issue1214
paginable_base_url_with_query_params using double splat. paginable me…
3dfab1e 
…thod instead of local variable. #1186

view_all option for paginable_renderise method in order to restrict access to ALL data from a scope. #1186

fixed integration tests to accommodate the view_all option. #1186
@briri
Merge pull request #1325 from DigitalCurationCentre/issue1186
a397dd2 
Issue 1186
@briri
added an excludeAsterisks option to AriatiseForm and validation JS fi…
5a130a6 
…les. Also updated 2 gettext strings to allow for embedded HTML
@briri
Merge pull request #1327 from CDLUC3/issue1197
07167a8 
added an excludeAsterisks option to AriatiseForm and validation JS fi…
@briri
removed defaults from orgs/templates.links fields
d00cf53
@briri
updated logic for download/share
2d70e2c
@briri
Merge pull request #1329 from CDLUC3/issue1294
d128d3c 
refinement to permissions to allow editor to download but not share plans
View All not available for User scope when the current_user can super…
6559dd5 
…_admin. #1186
@jollopre
Merge pull request #1328 from CDLUC3/issue1315
59f441b 
removed defaults from orgs.links templates.links migration files
@briri
Merge pull request #1330 from DigitalCurationCentre/issue1186
3837a61 
Issue 1186
@briri
Merge pull request #1332 from DMPRoadmap/development
a59c966 
Bug fixes and enhancements for Sprint ending on 3/28/18
any paginable link or form uses paginable-action selector to avoid co…
d4b5e07 
…nflicting with other wider selectors. #1334
@jollopre
Merge pull request #1336 from DigitalCurationCentre/issue1334
b28acb0 
Issue1334
Merge branch 'development'
67edbda
@briri
fixed issue with equality check on localizable string :/
949284c
@briri
added org abbreviation to 'Guidance' sections and added customized ex…
bb28367 
…ample answers

updated locking logic
@jollopre
Merge pull request #1348 from CDLUC3/issue1338
ba62d8d 
Fixed issue with equality check against a localizable string
@jollopre
Merge pull request #1347 from CDLUC3/issue1343
f094e64 
added org abbreviation to 'Guidance' sections and added customized ex…
@briri
patch to fix issue with default template visibility setting
4c46272 
added nil check

reverted changes to schema.rb
@briri
Merge pull request #1346 from CDLUC3/issue1342
8559169 
patch to fix issue with default template visibility setting
Existing template customisation appears now to be editable. #1318
9d5bbaf
@briri
Merge pull request #1351 from DigitalCurationCentre/issue1318
a612f13 
Issue 1318
@briri
Merge branch 'master' of https://github.com/DMPRoadmap/roadmap
7ffbc87
@briri
added base_template_org and updated write plan to show correct org in…
7850aea 
… guidance tab

updated example answers logic

added missing code to answers conroller and fixed test
@briri
Merge pull request #1352 from CDLUC3/issue1343
6070c55 
Finishes up final updates for template customization bug
@briri
updated to check for blank example answers
5b88834
@briri
Merge pull request #1353 from CDLUC3/issue1343
a1136a2 
updated to check for blank example answers
@briri
Merge pull request #1354 from DMPRoadmap/master
16bcf7a 
Pulling fixes for template customization back into development
@vyruss vyruss merged commit 204ce37 into DigitalCurationCentre:development Apr 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@vyruss @briri @xsrust @jollopre