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

sync with Roadmap #57

Merged
merged 1,291 commits into from
Apr 9, 2018
Merged

sync with Roadmap #57

merged 1,291 commits into from
Apr 9, 2018
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Feb 14, 2018

  1. Merge pull request #1155 from CDLUC3/issue1147 

    added new text to my dashboard
    @jollopre
    jollopre authored Feb 14, 2018
    Configuration menu
    Copy the full SHA
    da083d1 View commit details
    Browse the repository at this point in the history

  2. rake task for statistics API 

    org
- editor ripped whitespace(sorry)
- added grant_api!(token_permission_type) function to model
bugfix.rake
- added rake bugfix: :stats_api_org_admin
- grants stats api permission to orgs with org admins, and api_tokens to org_admins
    @xsrust
    xsrust committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    31fd086 View commit details
    Browse the repository at this point in the history

  3. Download button for each yearly topic. #1149

    Jose Lloret committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    41e2d97 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1157 from DigitalCurationCentre/issue1149 

    Download button for each yearly topic. #1149
    @briri
    briri authored Feb 14, 2018
    Configuration menu
    Copy the full SHA
    8a25bb6 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2018

  1. ammends as per comment #154 (comment) #154 

    Renamed export to download. #1149
    Jose Lloret committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    02cf9cb View commit details
    Browse the repository at this point in the history

  2. update org.rb to add end

    @xsrust
    xsrust authored Feb 15, 2018
    Configuration menu
    Copy the full SHA
    b5fa093 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1156 from DMPRoadmap/api_perms_for_dashboard 

    rake task for statistics API
    @jollopre
    jollopre authored Feb 15, 2018
    Configuration menu
    Copy the full SHA
    1a09333 View commit details
    Browse the repository at this point in the history

  4. fixes for downloads 

    updated security check
    @briri
    briri committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    c01ba32 View commit details
    Browse the repository at this point in the history

  5. Pre-fetching plan and current phase respecting order by number for se… 

    …ctions and questions
    Jose Lloret committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    b1ec0ae View commit details
    Browse the repository at this point in the history

  6. moved forgot password link

    @briri
    briri committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    12eefae View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1167 from DigitalCurationCentre/issue154 

    Issue 154
    @briri
    briri authored Feb 15, 2018
    Configuration menu
    Copy the full SHA
    1768df3 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1172 from DigitalCurationCentre/pre_fetched_phase 

    Preserves ordering by number for sections/questions
    @briri
    briri authored Feb 15, 2018
    Configuration menu
    Copy the full SHA
    97cccf9 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2018

  1. Merge pull request #1170 from CDLUC3/issue1127 

    fixes for downloads
    @jollopre
    jollopre authored Feb 16, 2018
    Configuration menu
    Copy the full SHA
    a73119a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1171 from CDLUC3/issue1117 

    moved forgot password link
    @jollopre
    jollopre authored Feb 16, 2018
    Configuration menu
    Copy the full SHA
    d4eeff2 View commit details
    Browse the repository at this point in the history

  3. Create account org is needed now. Fixed find nil whne swaping orgs. #… 

    …1144
    Jose Lloret committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    ed940aa View commit details
    Browse the repository at this point in the history

  4. init changes

    @xsrust
    xsrust committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    d40dc9a View commit details
    Browse the repository at this point in the history

  5. added questionformatscontroller, updated answers_controler to deal wi… 

    …th rda_ques
    @xsrust
    xsrust committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    e8a7119 View commit details
    Browse the repository at this point in the history

  6. rda backend implimented, bugfixing ui/JS

    @xsrust
    xsrust committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    b80421a View commit details
    Browse the repository at this point in the history

  7. update bug in answer.rb, fixes for rda_metadata.js

    @xsrust
    xsrust committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    549bafd View commit details
    Browse the repository at this point in the history

  8. update schema

    @xsrust
    xsrust committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    b8a85f5 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #1174 from DigitalCurationCentre/issue1144 

    Issue 1144
    @briri
    briri authored Feb 16, 2018
    Configuration menu
    Copy the full SHA
    10c5c05 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2018

  1. New login workflow changes (post-shibboleth authentication) 

    - New dual choice layout in app/views/devise/registrations/new.html.erb
- Changes to omniauth_callbacks/application/registrations/sessions controllers to support choice post-shibboleth auth:
  - Do you have an account? Sign in to link your shibboleth credentials
  - If you don't have an account, sign up and this will link your shibboleth credentials
- Changes to sign in, create account, and password details forms for multiple onscreen "show password" tickboxes
- Aesthetic change to clear-field (X) icon (align it with input field and bring it inside)
    Jimmy Angelakos committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    38ff88c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'development' into login_workflow

    @vyruss
    vyruss authored Feb 19, 2018
    Configuration menu
    Copy the full SHA
    7ac49e3 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1125 from DigitalCurationCentre/login_workflow 

    New login workflow changes (post-shibboleth authentication) [UPDATE: now tested on DMPonline-test]
    @vyruss
    vyruss authored Feb 19, 2018
    Configuration menu
    Copy the full SHA
    72f2def View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2018

  1. Merge pull request #54 from DMPRoadmap/development 

    Sync with Roadmap
    @vyruss
    vyruss authored Feb 20, 2018
    Configuration menu
    Copy the full SHA
    ae453da View commit details
    Browse the repository at this point in the history

  2. page ALL is retained if latest request contains it. Sort links are no… 

    …w right aligned within the th. #1105

default sorting to paginable concern specified through query_params keyword. #1105

paginable plans including default sorting

paginable orgs including default sorting. #1105
    Jose Lloret committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    f2ff19e View commit details
    Browse the repository at this point in the history

  3. removed ids for email and password sign_in_form. Refactored JS associ… 

    …ated. #1064
    Jose Lloret committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    7a122d4 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2018

  1. Merge pull request #1177 from DigitalCurationCentre/issue1105 

    Issue1105
    @briri
    briri authored Feb 21, 2018
    Configuration menu
    Copy the full SHA
    f75ab2b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1178 from DigitalCurationCentre/issue1064 

    Issue 1064
    @briri
    briri authored Feb 21, 2018
    Configuration menu
    Copy the full SHA
    993daaa View commit details
    Browse the repository at this point in the history

  3. updated JS to fix guidance selection synchronization. updated control… 

    …ler to just replace guidance list
    @briri
    briri committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    20c647d View commit details
    Browse the repository at this point in the history

  4. fixed issue with phase accordions on template page 

    fixed issue with retaining current template tab

updated urls in test
    @briri
    briri committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    2131671 View commit details
    Browse the repository at this point in the history

  5. perpetuate default template flag across versions 

    perpetuate default template flag across versions
    @briri
    briri committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    13f662a View commit details
    Browse the repository at this point in the history

  6. added cancel button to create plan page

    @briri
    briri committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    e2af4b4 View commit details
    Browse the repository at this point in the history

  7. updated text on usage dashboard

    @briri
    briri committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    971b010 View commit details
    Browse the repository at this point in the history

  8. added privileges to profile page

    @briri
    briri committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    4d5e224 View commit details
    Browse the repository at this point in the history

  9. fixed issue with clearing all theme selections 

    switch variable name
    @briri
    briri committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    55b0892 View commit details
    Browse the repository at this point in the history

  10. added confirm message to delete phase

    @briri
    briri committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    908bb5b View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2018

  1. Merge pull request #1196 from CDLUC3/issue1089 

    added confirm message to delete phase
    @jollopre
    jollopre authored Feb 22, 2018
    Configuration menu
    Copy the full SHA
    5cd4d1e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1195 from CDLUC3/issue1094 

    added privileges to profile page
    @jollopre
    jollopre authored Feb 22, 2018
    Configuration menu
    Copy the full SHA
    6163384 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1194 from CDLUC3/issue1176 

    updated text on usage dashboard
    @jollopre
    jollopre authored Feb 22, 2018
    Configuration menu
    Copy the full SHA
    f96dba0 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1193 from CDLUC3/issue1183 

    fixed issue with clearing all theme selections
    @jollopre
    jollopre authored Feb 22, 2018
    Configuration menu
    Copy the full SHA
    7239dee View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1192 from CDLUC3/issue1159 

    added cancel button to create plan page
    @jollopre
    jollopre authored Feb 22, 2018
    Configuration menu
    Copy the full SHA
    a60bd40 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1191 from CDLUC3/issue1106 

    perpetuate default template flag across versions
    @jollopre
    jollopre authored Feb 22, 2018
    Configuration menu
    Copy the full SHA
    771b4d4 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1189 from CDLUC3/issue1181 

    fixed template pages
    @jollopre
    jollopre authored Feb 22, 2018
    Configuration menu
    Copy the full SHA
    fed9bb9 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1188 from CDLUC3/issue943 

    Fix plan guidance selection save
    @jollopre
    jollopre authored Feb 22, 2018
    Configuration menu
    Copy the full SHA
    68eeed1 View commit details
    Browse the repository at this point in the history

  9. updated tables so they have default sorts. updated paginable clear/se… 

    …arch links

added logic to retain sort info after search

fixed sort link and updated tests

reverted changes to concern and paginable/search erbs

reverted tests
    @briri
    briri committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    740deb1 View commit details
    Browse the repository at this point in the history

  10. Orcid logo, fixes #1179.

    Jimmy Angelakos committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    8e2b7de View commit details
    Browse the repository at this point in the history

  11. fixed issue with api-token rake task

    @briri
    briri committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    77ab4fc View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2018

  1. updated to fix disable issue and clone selections from modal to main … 

    …list
    @briri
    briri committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    671013f View commit details
    Browse the repository at this point in the history

  2. fixed theme saving on questions edit/add

    @briri
    briri committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    545e1da View commit details
    Browse the repository at this point in the history

  3. fixed issue for org admin template tabs

    @briri
    briri committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    6f9ee23 View commit details
    Browse the repository at this point in the history

  4. switched dropdown label back to 'Plans'

    @briri
    briri committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    0e64276 View commit details
    Browse the repository at this point in the history

  5. auto expand 1st phase accordion on edit template

    @briri
    briri committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    8e80df2 View commit details
    Browse the repository at this point in the history

  6. allow uppercase in emails

    @briri
    briri committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    96d4d79 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1206 from CDLUC3/issue1200 

    allow uppercase in emails
    @jollopre
    jollopre authored Feb 23, 2018
    Configuration menu
    Copy the full SHA
    684a0bd View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1205 from CDLUC3/auto-expand-accordion 

    auto expand 1st phase accordion on edit template
    @jollopre
    jollopre authored Feb 23, 2018
    Configuration menu
    Copy the full SHA
    beebdf7 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #1204 from CDLUC3/issue1176 

    switched dropdown label back to 'Plans'
    @jollopre
    jollopre authored Feb 23, 2018
    Configuration menu
    Copy the full SHA
    fdd8fa3 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #1203 from CDLUC3/issue1180 

    fixes tab selection issue on templates page
    @jollopre
    jollopre authored Feb 23, 2018
    Configuration menu
    Copy the full SHA
    80ca84a View commit details
    Browse the repository at this point in the history

  11. Merge pull request #1202 from CDLUC3/issue1183 

    fixed theme saving on questions edit/add
    @jollopre
    jollopre authored Feb 23, 2018
    Configuration menu
    Copy the full SHA
    eb06af8 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #1201 from CDLUC3/issue943 

    updated to fix disable issue and clone selections from modal to main …
    @jollopre
    jollopre authored Feb 23, 2018
    Configuration menu
    Copy the full SHA
    81103bc View commit details
    Browse the repository at this point in the history

  13. Merge pull request #1198 from DigitalCurationCentre/issue1179 

    Orcid logo, fixes #1179.
    @jollopre
    jollopre authored Feb 23, 2018
    Configuration menu
    Copy the full SHA
    144de86 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #1190 from CDLUC3/issue1187 

    updated tables so they have default sorts & fix search/sort retention
    @jollopre
    jollopre authored Feb 23, 2018
    Configuration menu
    Copy the full SHA
    402b168 View commit details
    Browse the repository at this point in the history

  15. Add current working directory to logfile to identify multiple Rails i… 

    …nstances on same server.
    Jimmy Angelakos committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    35b60dc View commit details
    Browse the repository at this point in the history

  16. removed side effects when generating or removing API token. Removed o… 

    …rg_id method from User and use after_update callback instead. #1060
    Jose Lloret committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    89f2509 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #1216 from DigitalCurationCentre/issue1060 

    Issue 1060
    @briri
    briri authored Feb 23, 2018
    Configuration menu
    Copy the full SHA
    e4d2b2b View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2018

  1. simplified logic for selected templates tab 

    perpetuate edit flag throughout partials

updated preview

updated preview
    @briri
    briri committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    2f56f10 View commit details
    Browse the repository at this point in the history

  2. added check for blank question 

    fixed typo
    @briri
    briri committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    de73cd0 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2018

  1. removed link to plan

    @briri
    briri committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    cb7cf60 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2018

  1. Merge pull request #1215 from CDLUC3/issue1180 

    simplified logic for selected templates tab
    @jollopre
    jollopre authored Feb 26, 2018
    Configuration menu
    Copy the full SHA
    a612c6d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1222 from CDLUC3/fix-export-blank-question 

    added check for blank question
    @jollopre
    jollopre authored Feb 26, 2018
    Configuration menu
    Copy the full SHA
    c919825 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1223 from CDLUC3/fix-api-token 

    fixed issue with api-token rake task
    @jollopre
    jollopre authored Feb 26, 2018
    Configuration menu
    Copy the full SHA
    e353ae4 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1224 from CDLUC3/issue1220 

    removed links to plans on admin plans page
    @jollopre
    jollopre authored Feb 26, 2018
    Configuration menu
    Copy the full SHA
    9a82231 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1208 from DigitalCurationCentre/logging 

    Add working directory to logging format
    @jollopre
    jollopre authored Feb 26, 2018
    Configuration menu
    Copy the full SHA
    4edea99 View commit details
    Browse the repository at this point in the history

  6. Added nil checks to plan exports

    @briri
    briri committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    04075a9 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1226 from CDLUC3/bug-exports 

    Fixed bugs in plan exports
    @briri
    briri authored Feb 26, 2018
    Configuration menu
    Copy the full SHA
    e5055dd View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2018

  1. fixed issue with double plan in docx

    @briri
    briri committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    8caa171 View commit details
    Browse the repository at this point in the history

  2. added additional invitation token check

    @briri
    briri committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    3b0fdca View commit details
    Browse the repository at this point in the history

  3. fixed up issues with request feedback emails

    @briri
    briri committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    8e162b8 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2018

  1. removed joins from orgs index

    @briri
    briri committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    138a602 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2018

  1. Merge pull request #1242 from CDLUC3/issue1239 

    removed joins from orgs index
    @jollopre
    jollopre authored Mar 2, 2018
    Configuration menu
    Copy the full SHA
    a672c7b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1238 from CDLUC3/issue1230 

    fixed issues with request feedback emails
    @jollopre
    jollopre authored Mar 2, 2018
    Configuration menu
    Copy the full SHA
    af73ed0 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1237 from CDLUC3/issue1234 

    fixed issue with duplicate email when creating account
    @jollopre
    jollopre authored Mar 2, 2018
    Configuration menu
    Copy the full SHA
    2840a61 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1236 from CDLUC3/issue1228 

    fixed issue with double plan in docx
    @jollopre
    jollopre authored Mar 2, 2018
    Configuration menu
    Copy the full SHA
    4141ec9 View commit details
    Browse the repository at this point in the history

  5. patch for download/export blank answers 

    switch to is_valid
    @briri
    briri committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    ac7d33c View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1241 from CDLUC3/issue1240 

    patch for download/export blank answers
    @briri
    briri authored Mar 2, 2018
    Configuration menu
    Copy the full SHA
    9ab7ce1 View commit details
    Browse the repository at this point in the history

  7. removed joins from paginable orgs

    @briri
    briri committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    f2a85b0 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1244 from CDLUC3/issue1239 

    removed joins from paginable orgs
    @briri
    briri authored Mar 2, 2018
    Configuration menu
    Copy the full SHA
    c1367ec View commit details
    Browse the repository at this point in the history

  9. fixed typo

    @briri
    briri committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    6d52ee8 View commit details
    Browse the repository at this point in the history

  10. added link back

    @briri
    briri committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    c63c4cb View commit details
    Browse the repository at this point in the history

  11. updated templates to display customisation in messaging when appropriate

    @briri
    briri committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    84d2dbd View commit details
    Browse the repository at this point in the history

  12. moved constants to application.html.erb

    @briri
    briri committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    6c7e78d View commit details
    Browse the repository at this point in the history

  13. centered plan title 

    fixed issue with pdf fomratting

fixed issue with pdf fomratting
    @briri
    briri committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    d3ba6c7 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2018

  1. Merge pull request #1249 from CDLUC3/fix-text-download 

    fixed typo
    @vyruss
    vyruss authored Mar 5, 2018
    Configuration menu
    Copy the full SHA
    8bafa58 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1254 from CDLUC3/issue1245 

    centered plan title in exports
    @vyruss
    vyruss authored Mar 5, 2018
    Configuration menu
    Copy the full SHA
    937967f View commit details
    Browse the repository at this point in the history

  3. capture changes

    @xsrust
    xsrust committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    cda7db5 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1250 from CDLUC3/issue1220 

    added link back to Org admin plans page
    @vyruss
    vyruss authored Mar 5, 2018
    Configuration menu
    Copy the full SHA
    c8a7318 View commit details
    Browse the repository at this point in the history

  5. init changes

    @xsrust
    xsrust committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    181f096 View commit details
    Browse the repository at this point in the history

  6. added questionformatscontroller, updated answers_controler to deal wi… 

    …th rda_ques
    @xsrust
    xsrust committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    278ec83 View commit details
    Browse the repository at this point in the history

  7. rda backend implimented, bugfixing ui/JS

    @xsrust
    xsrust committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    17a3c3c View commit details
    Browse the repository at this point in the history

  8. update bug in answer.rb, fixes for rda_metadata.js

    @xsrust
    xsrust committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    ec5c642 View commit details
    Browse the repository at this point in the history

  9. update schema

    @xsrust
    xsrust committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    5e34644 View commit details
    Browse the repository at this point in the history

  10. capture changes

    @xsrust
    xsrust committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    c97bc88 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'rda_backend_mvp' of https://github.com/DigitalCurationC… 

    …entre/roadmap into rda_backend_mvp
    @xsrust
    xsrust committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    0e60d45 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2018

  1. Merge pull request #1253 from CDLUC3/issue599 

    moved JS constants to application.html.erb
    @xsrust
    xsrust authored Mar 6, 2018
    Configuration menu
    Copy the full SHA
    a4b370d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1252 from CDLUC3/issue1229 

    updated templates to display customisation in messaging when appropriate
    @xsrust
    xsrust authored Mar 6, 2018
    Configuration menu
    Copy the full SHA
    c335d6f View commit details
    Browse the repository at this point in the history

  3. bugfixes/tweaks

    @xsrust
    xsrust committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    150911f View commit details
    Browse the repository at this point in the history

  4. init changes

    @xsrust
    xsrust committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    b39f3df View commit details
    Browse the repository at this point in the history

  5. added questionformatscontroller, updated answers_controler to deal wi… 

    …th rda_ques
    @xsrust
    xsrust committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    9c1aee9 View commit details
    Browse the repository at this point in the history

  6. rda backend implimented, bugfixing ui/JS

    @xsrust
    xsrust committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    d33158c View commit details
    Browse the repository at this point in the history

  7. update bug in answer.rb, fixes for rda_metadata.js

    @xsrust
    xsrust committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    59231a7 View commit details
    Browse the repository at this point in the history

  8. capture changes

    @xsrust
    xsrust committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    b7192a4 View commit details
    Browse the repository at this point in the history

  9. init changes

    @xsrust
    xsrust committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    f0c636f View commit details
    Browse the repository at this point in the history

  10. update schema

    @xsrust
    xsrust committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    c175d30 View commit details
    Browse the repository at this point in the history

  11. bugfixes/tweaks

    @xsrust
    xsrust committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    993359d View commit details
    Browse the repository at this point in the history

  12. Merge branch 'rda_backend_mvp' of https://github.com/DigitalCurationC… 

    …entre/roadmap into rda_backend_mvp
    @xsrust
    xsrust committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    8e43b08 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2018

  1. visual tweaks

    @xsrust
    xsrust committed Mar 7, 2018
    Configuration menu
    Copy the full SHA
    655999b View commit details
    Browse the repository at this point in the history

  2. RDA export + updates to export logic

    @xsrust
    xsrust committed Mar 7, 2018
    Configuration menu
    Copy the full SHA
    8ae0bc6 View commit details
    Browse the repository at this point in the history

  3. hid typeahead as not currently working

    @xsrust
    xsrust committed Mar 7, 2018
    Configuration menu
    Copy the full SHA
    0a67faf View commit details
    Browse the repository at this point in the history

  4. Update webpack.config.js: remove leftover from old bootstrap

    @vyruss
    vyruss authored Mar 7, 2018
    Configuration menu
    Copy the full SHA
    5d58a76 View commit details
    Browse the repository at this point in the history

  5. added new constants lookup

    @briri
    briri committed Mar 7, 2018
    Configuration menu
    Copy the full SHA
    16a2e51 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1256 from CDLUC3/fix-constants 

    added new constants lookup for paswords
    @briri
    briri authored Mar 7, 2018
    Configuration menu
    Copy the full SHA
    2a7307e View commit details
    Browse the repository at this point in the history

  7. removed separate api access email and updated privileges email

    @briri
    briri committed Mar 7, 2018
    Configuration menu
    Copy the full SHA
    89ec781 View commit details
    Browse the repository at this point in the history

  8. removed html from text download

    @briri
    briri committed Mar 7, 2018
    Configuration menu
    Copy the full SHA
    121f3e3 View commit details
    Browse the repository at this point in the history

  9. removed debug line and fixed integer check

    @briri
    briri committed Mar 7, 2018
    Configuration menu
    Copy the full SHA
    64236f1 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #1259 from CDLUC3/issue1247 

    removed debug line and fixed integer check
    @briri
    briri authored Mar 7, 2018
    Configuration menu
    Copy the full SHA
    48620ac View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2018

  1. Merge pull request #1260 from DigitalCurationCentre/rda_backend_mvp 

    Rda backend mvp
    @vyruss
    vyruss authored Mar 8, 2018
    Configuration menu
    Copy the full SHA
    21c78ed View commit details
    Browse the repository at this point in the history

  2. Merge pull request #55 from DMPRoadmap/development 

    Development sync to Roadmap
    @vyruss
    vyruss authored Mar 8, 2018
    Configuration menu
    Copy the full SHA
    8850843 View commit details
    Browse the repository at this point in the history

  3. Fix typo in bugfix:set_template_visibility for #1210

    Jimmy Angelakos committed Mar 8, 2018
    Configuration menu
    Copy the full SHA
    77d6349 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1261 from DigitalCurationCentre/development 

    PR for #1210
    @vyruss
    vyruss authored Mar 8, 2018
    Configuration menu
    Copy the full SHA
    370d4b7 View commit details
    Browse the repository at this point in the history

  5. Typo

    @vyruss
    vyruss authored Mar 8, 2018
    Configuration menu
    Copy the full SHA
    b35fcf8 View commit details
    Browse the repository at this point in the history

  6. Update _branding.html.erb

    @vyruss
    vyruss authored Mar 8, 2018
    Configuration menu
    Copy the full SHA
    41e65a3 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1257 from CDLUC3/issue1225 

    Remove duplicative API rights email
    @jollopre
    jollopre authored Mar 8, 2018
    Configuration menu
    Copy the full SHA
    db2b6ae View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1255 from DMPRoadmap/update-webpack-config-js 

    Update webpack.config.js: remove leftover from old bootstrap
    @jollopre
    jollopre authored Mar 8, 2018
    Configuration menu
    Copy the full SHA
    e4fa7ef View commit details
    Browse the repository at this point in the history

  9. Merge pull request #1258 from CDLUC3/issue1246 

    Remove HTML markup from text downloads
    @jollopre
    jollopre authored Mar 8, 2018
    Configuration menu
    Copy the full SHA
    da4b883 View commit details
    Browse the repository at this point in the history

  10. switched to use google fonts 

    fixed issue with margins

removed old id

updated h1

updated h1s
    @briri
    briri committed Mar 8, 2018
    Configuration menu
    Copy the full SHA
    28d2da2 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2018

  1. Bug fix for #1264

    Jimmy Angelakos committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    d09cb11 View commit details
    Browse the repository at this point in the history

  2. update question heading display

    @xsrust
    xsrust authored Mar 9, 2018
    Configuration menu
    Copy the full SHA
    2468ad1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1265 from DigitalCurationCentre/development 

    Bug fix for #1264
    @vyruss
    vyruss authored Mar 9, 2018
    Configuration menu
    Copy the full SHA
    bd43008 View commit details
    Browse the repository at this point in the history

  4. Fix specific to #1263 - shouldn't affect anything else

    Jimmy Angelakos committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    410caa1 View commit details
    Browse the repository at this point in the history

  5. Remove tinymce branding from bottom right

    Jimmy Angelakos committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    b6a932f View commit details
    Browse the repository at this point in the history

  6. Fix for nasty bug (add Note after Answer has been saved -> duplicate … 

    …blank answer saved)
    Jimmy Angelakos committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    f1ee8ed View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1266 from DigitalCurationCentre/development 

    Fix specific to #1263 - shouldn't affect anything else
    @vyruss
    vyruss authored Mar 9, 2018
    Configuration menu
    Copy the full SHA
    e1fef01 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1267 from DigitalCurationCentre/development 

    Fix for duplicate answer issue
    @briri
    briri authored Mar 9, 2018
    Configuration menu
    Copy the full SHA
    5082ec3 View commit details
    Browse the repository at this point in the history

  9. rake task for duplicate answer removal

    @xsrust
    xsrust committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    466f91e View commit details
    Browse the repository at this point in the history

  10. added org change confirmation 

    finalized changes
    @briri
    briri committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    45615f3 View commit details
    Browse the repository at this point in the history

  11. update check for array

    @xsrust
    xsrust committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    caeae6f View commit details
    Browse the repository at this point in the history

  12. added api_token for super/org admins

    @briri
    briri committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    d8b533a View commit details
    Browse the repository at this point in the history

  13. removed limit statements from schema.rb

    @briri
    briri committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    d907633 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2018

  1. Merge pull request #1268 from CDLUC3/issue1060 

    added org change confirmation
    @jollopre
    jollopre authored Mar 12, 2018
    Configuration menu
    Copy the full SHA
    d24ff0a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1269 from CDLUC3/issue1243 

    added api_token for super/org admins to seeds.rb file
    @jollopre
    jollopre authored Mar 12, 2018
    Configuration menu
    Copy the full SHA
    faf3d9a View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1271 from CDLUC3/remove-limits 

    removed limit statements from schema.rb
    @jollopre
    jollopre authored Mar 12, 2018
    Configuration menu
    Copy the full SHA
    30ece6e View commit details
    Browse the repository at this point in the history

  4. typo in variable substitutions 

    for some reason this typo prevented both substitutions in the final string...
    @vyruss
    vyruss authored Mar 12, 2018
    Configuration menu
    Copy the full SHA
    c0a4a36 View commit details
    Browse the repository at this point in the history

  5. Fix isActivePage for top navbar

    Jimmy Angelakos committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    3c3e959 View commit details
    Browse the repository at this point in the history

  6. fix HTML tags

    @vyruss
    vyruss authored Mar 12, 2018
    Configuration menu
    Copy the full SHA
    1165560 View commit details
    Browse the repository at this point in the history

  7. new_answer.id doesn't exist yet 

    should result in notes getting migrated to the new answer ID
    @vyruss
    vyruss authored Mar 12, 2018
    Configuration menu
    Copy the full SHA
    99f131a View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1272 from DMPRoadmap/reset-password-email-fix 

    typo in variable substitutions
    @briri
    briri authored Mar 12, 2018
    Configuration menu
    Copy the full SHA
    172ba56 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #1262 from CDLUC3/pdf-css-fix 

    Fixed PDF fomratting issues
    @jollopre
    jollopre authored Mar 12, 2018
    Configuration menu
    Copy the full SHA
    77da506 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #1274 from DigitalCurationCentre/fix_isActivePage_… 

    …navbar

Fix isActivePage for top navbar
    @briri
    briri authored Mar 12, 2018
    Configuration menu
    Copy the full SHA
    64c6876 View commit details
    Browse the repository at this point in the history

  11. now saving note.answer_id

    @vyruss
    vyruss authored Mar 12, 2018
    Configuration menu
    Copy the full SHA
    7ffb2d7 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #1270 from DigitalCurationCentre/remove_duplicate_… 

    …answers

Remove duplicate answers Rake task
    @vyruss
    vyruss authored Mar 12, 2018
    Configuration menu
    Copy the full SHA
    049d751 View commit details
    Browse the repository at this point in the history

  13. Sync all translations & locales

    Jimmy Angelakos committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    9a8f926 View commit details
    Browse the repository at this point in the history

  14. Renamed bugfix rake task to upgrade

    Jimmy Angelakos committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    d2b3dbf View commit details
    Browse the repository at this point in the history

  15. Remove :custom date display format for i18n reasons

    Jimmy Angelakos committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    e2c9790 View commit details
    Browse the repository at this point in the history

  16. Renamed bugfix rake task to upgrade

    Jimmy Angelakos committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    a5361f7 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #1276 from DigitalCurationCentre/sync_i18n_l10n 

    Sync all translations & locales
    @briri
    briri authored Mar 12, 2018
    Configuration menu
    Copy the full SHA
    6d572ba View commit details
    Browse the repository at this point in the history

  18. added sort to sections/questions for export

    @briri
    briri committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    860d648 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2018

  1. Merge pull request #1277 from DigitalCurationCentre/rename_bugfix 

    Renamed bugfix rake task to upgrade
    @jollopre
    jollopre authored Mar 13, 2018
    Configuration menu
    Copy the full SHA
    960269b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1280 from CDLUC3/issue1278 

    added sort to sections/questions for export
    @jollopre
    jollopre authored Mar 13, 2018
    Configuration menu
    Copy the full SHA
    9f1d047 View commit details
    Browse the repository at this point in the history

  3. Fixes broken tasks and adds two migrations to keep db integrity. #1210 

    .

.
    Jose Lloret committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    ffc581d View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1273 from DigitalCurationCentre/issue1210_ 

    Issue 1210
    @vyruss
    vyruss authored Mar 13, 2018
    Configuration menu
    Copy the full SHA
    7ca7ebd View commit details
    Browse the repository at this point in the history

  5. Migration for adding required indices.

    Jimmy Angelakos committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    0dae80b View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1281 from DigitalCurationCentre/required_indices 

    Migration for adding required indices.
    @jollopre
    jollopre authored Mar 13, 2018
    Configuration menu
    Copy the full SHA
    cbcd557 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'development' of https://github.com/DMPRoadmap/roadmap i… 

    …nto development
    Jimmy Angelakos committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    bfb1f52 View commit details
    Browse the repository at this point in the history

  8. Update OmniAuth (CVE-2017-18076)

    Jimmy Angelakos committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    f58e196 View commit details
    Browse the repository at this point in the history

  9. Update omniauth-orcid because of ORCID API 1.2 deprecation

    Jimmy Angelakos committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    d405c3c View commit details
    Browse the repository at this point in the history

  10. Merge pull request #1282 from DigitalCurationCentre/upgrade_omniauth 

    Update OmniAuth (CVE-2017-18076)
    @briri
    briri authored Mar 13, 2018
    Configuration menu
    Copy the full SHA
    8e0c24f View commit details
    Browse the repository at this point in the history

  11. Merge branch 'development' of https://github.com/DMPRoadmap/roadmap i… 

    …nto development
    Jimmy Angelakos committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    d53aa3c View commit details
    Browse the repository at this point in the history

  12. Remove offending migration

    Jimmy Angelakos committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    391b9eb View commit details
    Browse the repository at this point in the history

  13. Merge pull request #1284 from DigitalCurationCentre/remove_migration 

    Remove migration
    @briri
    briri authored Mar 13, 2018
    Configuration menu
    Copy the full SHA
    8dfeaee View commit details
    Browse the repository at this point in the history

  14. Select the correct phase for editing in edit plan

    Jimmy Angelakos committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    a097325 View commit details
    Browse the repository at this point in the history

  15. added rake tasks for themes

    @xsrust
    xsrust committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    eb6b515 View commit details
    Browse the repository at this point in the history

  16. remove accidentally committed line

    @xsrust
    xsrust authored Mar 13, 2018
    Configuration menu
    Copy the full SHA
    aed8d74 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #1286 from DigitalCurationCentre/phases_fix 

    Select the correct phase for editing in edit plan
    @briri
    briri authored Mar 13, 2018
    Configuration menu
    Copy the full SHA
    cf2da6c View commit details
    Browse the repository at this point in the history

  18. spelling

    @vyruss
    vyruss authored Mar 13, 2018
    Configuration menu
    Copy the full SHA
    3d6018d View commit details
    Browse the repository at this point in the history

  19. Merge pull request #1287 from DigitalCurationCentre/themes_tasks 

    added rake tasks for themes
    @vyruss
    vyruss authored Mar 13, 2018
    Configuration menu
    Copy the full SHA
    32a1e30 View commit details
    Browse the repository at this point in the history

  20. 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 Mar 13, 2018
    Configuration menu
    Copy the full SHA
    4c82a9a View commit details
    Browse the repository at this point in the history

  21. Merge pull request #1289 from DMPRoadmap/master-merge 

    Merge from master to resolve conflicts
    @vyruss
    vyruss authored Mar 13, 2018
    Configuration menu
    Copy the full SHA
    7539038 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #1288 from DMPRoadmap/development 

    master <- development merge for Roadmap v1.0.0 release
    @vyruss
    vyruss authored Mar 13, 2018
    Configuration menu
    Copy the full SHA
    7814e53 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'master' of https://github.com/DMPRoadmap/roadmap

    @briri
    briri committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    23f9026 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2018

  1. added check for user's role on a plan to determine if download tab is… 

    … available
    @briri
    briri committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    7976e15 View commit details
    Browse the repository at this point in the history

  2. Workaround for #1292

    Jimmy Angelakos committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    10aaded View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1299 from DigitalCurationCentre/issue1292 

    Re-enable display of themed guidance from the organisation the template belongs to
    @briri
    briri authored Mar 15, 2018
    Configuration menu
    Copy the full SHA
    20a2a04 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2018

  1. Exclude javascript directory which seems to break "rake gettext:find"

    Jimmy Angelakos committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    67fa429 View commit details
    Browse the repository at this point in the history

  2. Update CONTRIBUTING.md

    @briri
    briri authored Mar 16, 2018
    Configuration menu
    Copy the full SHA
    8cb98d7 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2018

  1. 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 Mar 19, 2018
    Configuration menu
    Copy the full SHA
    f016708 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2018

  1. Merge pull request #1302 from DigitalCurationCentre/gettextfix 

    Exclude javascript directory which seems to break "rake gettext:find"
    @briri
    briri authored Mar 20, 2018
    Configuration menu
    Copy the full SHA
    67631c4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1304 from DigitalCurationCentre/issue1184 

    Fixes #1184 .
    @briri
    briri authored Mar 20, 2018
    Configuration menu
    Copy the full SHA
    e359596 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1295 from CDLUC3/issue1220 

    added check for user's role on a plan to determine if download tab is…
    @jollopre
    jollopre authored Mar 20, 2018
    Configuration menu
    Copy the full SHA
    e2e1057 View commit details
    Browse the repository at this point in the history

  4. added active flag to users and updated admin users page to allow admi… 

    …n 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
    @briri
    briri committed Mar 20, 2018
    Configuration menu
    Copy the full SHA
    77014f5 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1303 from CDLUC3/issue1275 

    Updates to Super Admin Users page
    @jollopre
    jollopre authored Mar 20, 2018
    Configuration menu
    Copy the full SHA
    8f453a0 View commit details
    Browse the repository at this point in the history

  6. added orcid to plan download coversheet

    @briri
    briri committed Mar 20, 2018
    Configuration menu
    Copy the full SHA
    be4d5f8 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2018

  1. Merge pull request #1307 from CDLUC3/issue1211 

    added orcid to plan download coversheet
    @jollopre
    jollopre authored Mar 21, 2018
    Configuration menu
    Copy the full SHA
    9b07400 View commit details
    Browse the repository at this point in the history

  2. fixes 1293 and one other reported issue

    @xsrust
    xsrust committed Mar 21, 2018
    Configuration menu
    Copy the full SHA
    17a7b0a View commit details
    Browse the repository at this point in the history

  3. removed libv8 and therubyracer since we are handling assets pipeline … 

    …through webpack and nodejs directly
    Jose Lloret committed Mar 21, 2018
    Configuration menu
    Copy the full SHA
    92ef658 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1311 from DigitalCurationCentre/update_gemfile 

    Gemfile without  libv8 and therubyracer
    @briri
    briri authored Mar 21, 2018
    Configuration menu
    Copy the full SHA
    1592146 View commit details
    Browse the repository at this point in the history

  5. fix typo

    @xsrust
    xsrust committed Mar 21, 2018
    Configuration menu
    Copy the full SHA
    702f2e3 View commit details
    Browse the repository at this point in the history

  6. consolidated question edit/new js so that ariatise and tinymce are on… 

    …ly invoked once

updated timing of validation checks on ariatiseForm because they were firing before Tinymce was transfering its contents to the textarea

added asterisk to JS that handles form validations

removed ariatise from js that did not have any fields defined yet

applied requested changes
    @briri
    briri committed Mar 21, 2018
    Configuration menu
    Copy the full SHA
    ea4bd9f View commit details
    Browse the repository at this point in the history

  7. update question headings for questions with options to display questi… 

    …on text
    @xsrust
    xsrust committed Mar 21, 2018
    Configuration menu
    Copy the full SHA
    d07835f View commit details
    Browse the repository at this point in the history

  8. made reviewers unable to download plans

    @briri
    briri committed Mar 21, 2018
    Configuration menu
    Copy the full SHA
    ebddfdf View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2018

  1. Merge pull request #1314 from CDLUC3/issue1220 

    made reviewers unable to download plans
    @jollopre
    jollopre authored Mar 22, 2018
    Configuration menu
    Copy the full SHA
    ce4c5cf View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1306 from CDLUC3/issue1197 

    Add asterisk to required fields
    @jollopre
    jollopre authored Mar 22, 2018
    Configuration menu
    Copy the full SHA
    899882c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1313 from DigitalCurationCentre/downloads_bugfix 

    Downloads bugfix
    @jollopre
    jollopre authored Mar 22, 2018
    Configuration menu
    Copy the full SHA
    9351617 View commit details
    Browse the repository at this point in the history

  4. fixed merge conflict

    Jose Lloret committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    38f87c3 View commit details
    Browse the repository at this point in the history

  5. updated en_US po file

    @briri
    briri committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    0509249 View commit details
    Browse the repository at this point in the history

  6. made share link viosible to editors

    @briri
    briri committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    ace8e85 View commit details
    Browse the repository at this point in the history

  7. updated plans controller to send user to overview after saving details 

    fixed tests
    @briri
    briri committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    7917bb4 View commit details
    Browse the repository at this point in the history

  8. switched href to data-target

    @briri
    briri committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    84076e0 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2018

  1. Merge pull request #1317 from CDLUC3/issue1294 

    Made share plan link visible to editors
    @jollopre
    jollopre authored Mar 23, 2018
    Configuration menu
    Copy the full SHA
    f709f4b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1320 from CDLUC3/issue1162 

    Updated plans controller to send user to overview after saving details
    @jollopre
    jollopre authored Mar 23, 2018
    Configuration menu
    Copy the full SHA
    a0168b7 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1321 from CDLUC3/issue1309 

    Switched href to data-target for guidance tabs on Write Plan
    @jollopre
    jollopre authored Mar 23, 2018
    Configuration menu
    Copy the full SHA
    ef6d280 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1316 from CDLUC3/en_US 

    updated en_US po file
    @jollopre
    jollopre authored Mar 23, 2018
    Configuration menu
    Copy the full SHA
    28b7c31 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2018

  1. Refactored paginable concern to accommodate proper retaining of query… 

    …_params. #1214

ammended test for paginable concern. #1214

solving JS linter problems
    Jose Lloret committed Mar 26, 2018
    Configuration menu
    Copy the full SHA
    b3e5557 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1324 from DigitalCurationCentre/issue1214 

    Issue1214
    @jollopre
    jollopre authored Mar 26, 2018
    Configuration menu
    Copy the full SHA
    c2c969a View commit details
    Browse the repository at this point in the history

  3. paginable_base_url_with_query_params using double splat. paginable me… 

    …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
    Jose Lloret committed Mar 26, 2018
    Configuration menu
    Copy the full SHA
    3dfab1e View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2018

  1. Merge pull request #1325 from DigitalCurationCentre/issue1186 

    Issue 1186
    @briri
    briri authored Mar 27, 2018
    Configuration menu
    Copy the full SHA
    a397dd2 View commit details
    Browse the repository at this point in the history

  2. added an excludeAsterisks option to AriatiseForm and validation JS fi… 

    …les. Also updated 2 gettext strings to allow for embedded HTML
    @briri
    briri committed Mar 27, 2018
    Configuration menu
    Copy the full SHA
    5a130a6 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1327 from CDLUC3/issue1197 

    added an excludeAsterisks option to AriatiseForm and validation JS fi…
    @briri
    briri authored Mar 27, 2018
    Configuration menu
    Copy the full SHA
    07167a8 View commit details
    Browse the repository at this point in the history

  4. removed defaults from orgs/templates.links fields

    @briri
    briri committed Mar 27, 2018
    Configuration menu
    Copy the full SHA
    d00cf53 View commit details
    Browse the repository at this point in the history

  5. updated logic for download/share

    @briri
    briri committed Mar 27, 2018
    Configuration menu
    Copy the full SHA
    2d70e2c View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1329 from CDLUC3/issue1294 

    refinement to permissions to allow editor to download but not share plans
    @briri
    briri authored Mar 27, 2018
    Configuration menu
    Copy the full SHA
    d128d3c View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2018

  1. View All not available for User scope when the current_user can super… 

    …_admin. #1186
    Jose Lloret committed Mar 28, 2018
    Configuration menu
    Copy the full SHA
    6559dd5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1328 from CDLUC3/issue1315 

    removed defaults from orgs.links templates.links migration files
    @jollopre
    jollopre authored Mar 28, 2018
    Configuration menu
    Copy the full SHA
    59f441b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1330 from DigitalCurationCentre/issue1186 

    Issue 1186
    @briri
    briri authored Mar 28, 2018
    Configuration menu
    Copy the full SHA
    3837a61 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1332 from DMPRoadmap/development 

    Bug fixes and enhancements for Sprint ending on 3/28/18
    @briri
    briri authored Mar 28, 2018
    Configuration menu
    Copy the full SHA
    a59c966 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2018

  1. any paginable link or form uses paginable-action selector to avoid co… 

    …nflicting with other wider selectors. #1334
    Jose Lloret committed Mar 29, 2018
    Configuration menu
    Copy the full SHA
    d4b5e07 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1336 from DigitalCurationCentre/issue1334 

    Issue1334
    @jollopre
    jollopre authored Mar 29, 2018
    Configuration menu
    Copy the full SHA
    b28acb0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'development'

    Jose Lloret committed Mar 29, 2018
    Configuration menu
    Copy the full SHA
    67edbda View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2018

  1. fixed issue with equality check on localizable string :/

    @briri
    briri committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    949284c View commit details
    Browse the repository at this point in the history

  2. added org abbreviation to 'Guidance' sections and added customized ex… 

    …ample answers

updated locking logic
    @briri
    briri committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    bb28367 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2018

  1. Merge pull request #1348 from CDLUC3/issue1338 

    Fixed issue with equality check against a localizable string
    @jollopre
    jollopre authored Apr 5, 2018
    Configuration menu
    Copy the full SHA
    ba62d8d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1347 from CDLUC3/issue1343 

    added org abbreviation to 'Guidance' sections and added customized ex…
    @jollopre
    jollopre authored Apr 5, 2018
    Configuration menu
    Copy the full SHA
    f094e64 View commit details
    Browse the repository at this point in the history

  3. patch to fix issue with default template visibility setting 

    added nil check

reverted changes to schema.rb
    @briri
    briri committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    4c46272 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1346 from CDLUC3/issue1342 

    patch to fix issue with default template visibility setting
    @briri
    briri authored Apr 5, 2018
    Configuration menu
    Copy the full SHA
    8559169 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2018

  1. Existing template customisation appears now to be editable. #1318

    Jose Lloret committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    9d5bbaf View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1351 from DigitalCurationCentre/issue1318 

    Issue 1318
    @briri
    briri authored Apr 6, 2018
    Configuration menu
    Copy the full SHA
    a612f13 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/DMPRoadmap/roadmap

    @briri
    briri committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    7ffbc87 View commit details
    Browse the repository at this point in the history

  4. added base_template_org and updated write plan to show correct org in… 

    … guidance tab

updated example answers logic

added missing code to answers conroller and fixed test
    @briri
    briri committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    7850aea View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1352 from CDLUC3/issue1343 

    Finishes up final updates for template customization bug
    @briri
    briri authored Apr 6, 2018
    Configuration menu
    Copy the full SHA
    6070c55 View commit details
    Browse the repository at this point in the history

  6. updated to check for blank example answers

    @briri
    briri committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    5b88834 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1353 from CDLUC3/issue1343 

    updated to check for blank example answers
    @briri
    briri authored Apr 6, 2018
    Configuration menu
    Copy the full SHA
    a1136a2 View commit details
    Browse the repository at this point in the history