Permalink
Commits on Nov 22, 2016
  1. Merge pull request #274 from concord-consortium/fix-permission-form-s…

    …cope
    
    fix typo in permission form scope
    knowuh committed on GitHub Nov 22, 2016
  2. stop solr it was causing travis built to fail

    scytacki committed Nov 22, 2016
  3. fix typo in permission form scope

    [#131178067]
    scytacki committed Nov 21, 2016
Commits on Nov 16, 2016
  1. add user_id to offering api

    [#134402827]
    scytacki committed Nov 16, 2016
Commits on Nov 15, 2016
Commits on Nov 14, 2016
  1. fix typo in selector

    [#134307695]
    scytacki committed Nov 14, 2016
Commits on Oct 27, 2016
  1. update deploy scripts for newer Solr

    deploying this Solr update requires extra steps that are not captured here.
    scytacki committed Oct 27, 2016
  2. Merge pull request #272 from concord-consortium/materials-collection-…

    …header
    
    Add header to materials collection React component
    scytacki committed on GitHub Oct 27, 2016
Commits on Oct 26, 2016
  1. Add onDataLoad callback to MaterialsCollection component

    pjanik committed Oct 26, 2016
  2. Merge pull request #273 from concord-consortium/restrict-projects-api

    Restrict project listing API
    scytacki committed on GitHub Oct 26, 2016
Commits on Oct 21, 2016
  1. Restrict project listing API

    This also fixes a bug where Portal::Project was used instead of 
    Admin::Project
    [#132944869]
    scytacki committed Oct 21, 2016
  2. Merge pull request #270 from concord-consortium/fix-permission-form-s…

    …earch
    
    Fix permission_form searching
    scytacki committed on GitHub Oct 21, 2016
  3. Add header to materials collection React component

    pjanik committed Oct 21, 2016
Commits on Oct 19, 2016
  1. Remove custom SQL in favor of `includes()`

    I didn't want to go this way, because it would mean loading more models into memory, but it seems as though there isn't much of a choice if we want to keep the scope as a relation.
    
    https://www.pivotaltracker.com/n/projects/736901/stories/131178067
    
    [#131178067]
    knowuh committed Oct 19, 2016
  2. Merge pull request #271 from concord-consortium/dynamic-projects-list

    Added projects list class to API.
    knowuh committed on GitHub Oct 19, 2016
  3. Added projects list class to API.

    emcelroy committed Oct 19, 2016
Commits on Oct 17, 2016
  1. Clean up Report Filter view: use permission form IDs when filtering.

    knowuh committed Oct 17, 2016
  2. Use permission ID's when selecting learners report

    https://www.pivotaltracker.com/n/projects/736901/stories/131178067
    
    [#131178067]
    
    Merge me into first commit.
    
    merge with #1
    knowuh committed Oct 14, 2016
Commits on Oct 12, 2016
  1. Merge pull request #269 from concord-consortium/add_username_to_exter…

    …nal_report_url
    
    Add username parameter to external_report urls.
    scytacki committed on GitHub Oct 12, 2016
Commits on Oct 7, 2016
  1. Add username parameter to external_report urls.

    We need this for the HAS Dashboard report for logging features.
    
    [#131758533]
    
    https://www.pivotaltracker.com/story/show/131758533
    knowuh committed Oct 7, 2016
Commits on Oct 6, 2016
  1. Merge pull request #268 from concord-consortium/itsi-staging

    New Dockerized work
    scytacki committed on GitHub Oct 6, 2016
  2. Merge branch 'master' into itsi-staging

    pjanik committed Oct 6, 2016
  3. Merge pull request #265 from concord-consortium/fix-default-teacher

    Fix default teacher (login: 'teacher')
    scytacki committed on GitHub Oct 6, 2016
  4. Merge pull request #267 from concord-consortium/fix-solr

    Fix SOLR
    scytacki committed on GitHub Oct 6, 2016
  5. Update SOLR rspec helper, add nice error messages with instructions

    [#131199117]
    pjanik committed Oct 6, 2016
  6. Fix / modify spec that doesn't work anymore with new SOLR

    [#131199117]
    
    SOLR tokenizes text fields and then tries to match the search term with tokens.
    By default token = whole word, so you can find something only if you
    provide the whole word, not just a substring.
    
    It seems that old SOLR was treating "Noah's" as two tokens, but the new one doesn't.
    I don't think it's worth investigating how to change this behaviour (if possible at all).
    
    We can consider using * (wildcards) to make search more flexible and return more results.
    pjanik committed Oct 6, 2016
  7. Fix SOLR on TravisCI

    [#131199117]
    pjanik committed Oct 6, 2016
Commits on Oct 5, 2016
  1. Merge pull request #266 from concord-consortium/fix-docker-compose

    Update docker-compose, cleanup related scripts, add docs
    pjanik committed on GitHub Oct 5, 2016
  2. Added alternative docker-compose-external-mysql.yml file

    dougmartin committed Oct 5, 2016
Commits on Oct 4, 2016
  1. Update docker-compose, cleanup related scripts, add docs to readme

    [#131622585]
    pjanik committed Oct 4, 2016
Commits on Oct 3, 2016
  1. Fix default teacher (login: 'teacher')

    [#130303063]
    pjanik committed Oct 3, 2016
Commits on Sep 23, 2016
  1. Merge pull request #264 from concord-consortium/fix-teacher-deactivat…

    …es-class
    
    fix failing deactivates classes test
    scytacki committed on GitHub Sep 23, 2016
  2. this test has been failing again and again

    this approach of manually saving and then waiting of the modal to
    disappear is used in other tests, so hopefully it will work here
    scytacki committed Sep 23, 2016
  3. Merge pull request #263 from concord-consortium/add-credits-to-extern…

    …al-activity
    
    Add credits field to external activities [#130192661]
    scytacki committed on GitHub Sep 23, 2016
  4. project admins can save material settings changes

    Previously project admins could view these settings, but the save button would not allow
    them to save the changes.
    
    This also updates a comment describing a problem with the update permission
    scytacki committed on GitHub Sep 23, 2016