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.

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

[PLAT-1181] Waffle all Prereg Challenge specific parts of the codebase #8833

Merged

Commits on Dec 3, 2018

  1. Configuration menu
    Copy the full SHA
    3f32b5b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b2d26f4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d6afc55 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d854276 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c0514ba View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2018

  1. change tooltip language

    Johnetordoff committed Dec 4, 2018
    Configuration menu
    Copy the full SHA
    30594d9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4a29ea8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bc920db View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2018

  1. Configuration menu
    Copy the full SHA
    4486c60 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2018

  1. Configuration menu
    Copy the full SHA
    60aa3d0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    795f2d0 View commit details
    Browse the repository at this point in the history
  3. remove colon typo

    Johnetordoff committed Dec 6, 2018
    Configuration menu
    Copy the full SHA
    9bfe36a View commit details
    Browse the repository at this point in the history
  4. Merge branch 'develop' of https://github.com/CenterForOpenScience/osf.io

     into winddown-waffle-the-rest
    
    * 'develop' of https://github.com/CenterForOpenScience/osf.io:
      Bump version and update changelog
      [PLAT-1254] Fix embargoing pre-registrations
      Update export_user_account script for files-on-anything
      Add an absolute_url property to Institutions model
      Move call to delete files on a node to a celery task
      Expect 410 gone again rather than not permission for less confusion
      Allow sorting search results by "modified"
      Downgrade DRF to 3.8.2
      Raise 410 instead of 404, include helpful message
      Update entity ID for Ferris
      When viewing a deleted file on a private node with no access, raise 404
      If a node is deleted, show No files in the file browser when viewing tombstone metadata
      Update index settings, post-bulk indexing
      Limit the number of buckets in ES aggregation for preprints
      Upgrade django-elasticsearch-metrics; speed up backfill
      Reduce batch size; show progress
      Delete files on nodes removed from bulk destroy
      Fix related lookup contenttype restriction
      Change URL for captured raven message to send to Sentry
      chore: upgrade to osf-style@1.8.0
    
    # Conflicts:
    #	website/project/views/drafts.py
    Johnetordoff committed Dec 6, 2018
    Configuration menu
    Copy the full SHA
    1895ad5 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d97ced0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b021d50 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2018

  1. Configuration menu
    Copy the full SHA
    039c0b2 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #6 from caseyrollins/winddown-waffle-the-rest

    Remove mention of remind_draft_preregistrations script
    Johnetordoff committed Dec 11, 2018
    Configuration menu
    Copy the full SHA
    551d857 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2018

  1. OSF Prereg copy edits

    caseyrollins committed Dec 15, 2018
    Configuration menu
    Copy the full SHA
    965c95e View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2018

  1. Merge pull request #7 from caseyrollins/feature/prereg-copy-edits

    OSF Preregistration form copy edits [PLAT-1279]
    Johnetordoff committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    7c89dc3 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2018

  1. Configuration menu
    Copy the full SHA
    876c235 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #8 from caseyrollins/prereg-add-migration

    Add migration to ensure schemas
    Johnetordoff committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    816c61b View commit details
    Browse the repository at this point in the history