Commits · d5d7d654860e60be96560e9800d948523e7a6a1c · edx / edx-platform · GitLab

05 Oct, 2015 13 commits
- fixup! Split Test Transformer fixes. · d5d7d654
  Nimisha Asthagiri committed Oct 05, 2015
  
  d5d7d654 Browse Files
- fixup! user_partitions unit tests, DAG errors, etc. · 2021ba63
  Nimisha Asthagiri committed Oct 05, 2015
  
  2021ba63 Browse Files
- fixup! SplitTestTransformer skip split_test module. · 2d64c54c
  Nimisha Asthagiri committed Oct 05, 2015
  
  2d64c54c Browse Files
- fixup! SplitTestTransformer to handle deeper hierarchies and DAGs. · 7a3b4104
  Nimisha Asthagiri committed Oct 05, 2015
  
  7a3b4104 Browse Files
- fixup! split_test, user_partitions. · 183f2f82
  Nimisha Asthagiri committed Oct 05, 2015
  
  183f2f82 Browse Files
- fixup! SplitTest and UserPartitions. · 57ed7983
  Nimisha Asthagiri committed Oct 05, 2015
  
  57ed7983 Browse Files
- fixup! SplitTest.. Remove Include_schemes and add staff user tests · 6c602dee
  Dino Cikatic committed Oct 05, 2015
  
  6c602dee Browse Files
- Course API and Transformer · d96fa776
  Nimisha Asthagiri committed Oct 05, 2015
  
  d96fa776 Browse Files
- Block Transformers: Split Test and Content Library · a3a48a98
  Dino Cikatic committed Oct 05, 2015
  
  a3a48a98 Browse Files
- Blocks Transformers: Visibility, Start Date, User Partitions · 82f3c0df
  Nimisha Asthagiri committed Oct 05, 2015
  
  82f3c0df Browse Files
- Refactor has_access for re-usability. · 8407cac1
  Nimisha Asthagiri committed Oct 05, 2015
  
  8407cac1 Browse Files
- Reuse DEFAULT_START_DATE definition. · d0795b27
  Nimisha Asthagiri committed Oct 05, 2015
  
  d0795b27 Browse Files
- Block Cache Framework · eb88d9da
  Nimisha Asthagiri committed Oct 05, 2015
  
  eb88d9da Browse Files
02 Oct, 2015 21 commits
- Merge pull request #10025 from edx/markhoeber-intersphinx-fix · d3f39b2f
```
Doc Label fix for Intersphinx
```
  Mark Hoeber committed Oct 02, 2015
  d3f39b2f Browse Files
- Merge pull request #10024 from edx/benp/tnl-3492-flaky-test · c8782f14
```
Flag test as flaky. See TNL-3492.
```
  Ben Patterson committed Oct 02, 2015
  c8782f14 Browse Files
- Merge pull request #10020 from edx/benp/TNL3489-flag-flaky-test · 6570552c
```
TNL-3489. Flag test as flaky.
```
  Ben Patterson committed Oct 02, 2015
  6570552c Browse Files
- Merge pull request #9999 from edx/bbeggs/TNL-3452-master · 5550ca30
```
Fixed select_related fields for course embargos and the mobile user api. TNL-3452
```
  Brian Beggs committed Oct 02, 2015
  5550ca30 Browse Files
- Doc Label fix for Intersphinx · 35034841
  Mark Hoeber committed Oct 02, 2015
  
  35034841 Browse Files
- Merge pull request #9934 from edx/usman/use-included-staticfiles-app · 0ce679fc
```
Upgrade django-pipeline and staticfiles.
```
  Usman Khalid committed Oct 02, 2015
  0ce679fc Browse Files
- Flag test as flaky. See TNL-3492. · ecdba730
  Ben Patterson committed Oct 02, 2015
  
  ecdba730 Browse Files
- Merge pull request #9984 from edx/ahodges/enroll_api · eab5c607
```
Updates the description provided for a new enrollment report
```
  Alison Hodges committed Oct 02, 2015
  eab5c607 Browse Files
- Merge pull request #10023 from edx/release · 0219e18f
```
Release into master
```
  David Baumgold committed Oct 02, 2015
  0219e18f Browse Files
- Merge pull request #10022 from edx/rc/2015-10-01 · a3f8ed3f
```
Rc/2015 10 01
```
  David Baumgold committed Oct 02, 2015
  a3f8ed3f Browse Files
- Merge pull request #10004 from Gadal/master · 241ce4a6
```
Update AUTHORS
```
  Sarina Canelake committed Oct 02, 2015
  241ce4a6 Browse Files
- TNL-3489. Flag test as flaky. · ed13815b
```
See ticket for details.
```
  Ben Patterson committed Oct 02, 2015
  ed13815b Browse Files
- Merge pull request #10016 from edx/bderusha/segment-fix · 9d13ccdb
```
Rename SEGMENT_KEY to have a unique key name for both CMS and LMS
```
  Fred Smith committed Oct 02, 2015
  9d13ccdb Browse Files
- Merge pull request #9771 from edx/diana/add-team-to-reports · 7bfb1127
```
Add team column to grade reports.
```
  Diana Huang committed Oct 02, 2015
  7bfb1127 Browse Files
- Use django.contrib.staticfiles instead of django-staticfiles. · 2b59d46a
```
TNL-3137
```
  Usman Khalid committed Oct 02, 2015
  2b59d46a Browse Files
- Upgrade to django-pipeline v.1.5.3. · 98df2336
```
TNL-3137
```
  Usman Khalid committed Oct 02, 2015
  98df2336 Browse Files
- Merge pull request #9986 from mitocw/fix/jf/enroll-ccx-coaches · 94d5f736
```
Enroll CCX coaches in the courses to which they're added
```
  Peter Pinch committed Oct 02, 2015
  94d5f736 Browse Files
- Update AUTHORS · 5106c7c6
  Dustin Gadal committed Oct 02, 2015
  
  5106c7c6 Browse Files
- Merge pull request #10003 from Gadal/master · 4f34377b
```
Fix import error
```
  Sarina Canelake committed Oct 01, 2015
  4f34377b Browse Files
- Fix import error · dfc0a357
```
See also:
https://github.com/edx/edx-platform/pull/9969

I'm not at a linux box to do a rebase from the command line, so I'm creating a new PR.
```
  Dustin Gadal committed Oct 01, 2015
  dfc0a357 Browse Files
- Merge pull request #9977 from edx/cdodge/flaky-test · 4b37d788
```
Mark test_can_add_remove_allowance Bokchoy test as flaky for now
```
  chrisndodge committed Oct 01, 2015
  4b37d788 Browse Files
01 Oct, 2015 6 commits
- Rename SEGMENT_KEY to have a unique key name for both CMS and LMS · bcb71a32
  Bill DeRusha committed Oct 01, 2015
  
  bcb71a32 Browse Files
- Merge pull request #9958 from edx/cdyer/MA-1280-restful-conventions · b85ea12a
```
Make the profile_image api more restful.
```
  Cliff Dyer committed Oct 01, 2015
  b85ea12a Browse Files
- Merge pull request #9997 from edx/clintonb/credit-grade-length · d1f4d3a6
```
Limited grades to seven characters
```
  Clinton Blackburn committed Oct 01, 2015
  d1f4d3a6 Browse Files
- Updates the description provided for a new enrollment report · adffb10c
```
https://github.com/edx/edx-platform/pull/9345
```
  Alison Hodges committed Oct 01, 2015
  adffb10c Browse Files
- Merge pull request #9978 from mitocw/fix/gs/min_count_keyerror · 972196fe
```
Fixed KeyError in CCX
```
  Sarina Canelake committed Oct 01, 2015
  972196fe Browse Files
- Merge pull request #9950 from lduarte1991/lti-allow-fullscreen · cdd59b5a
```
Allow fullscreen within lti
```
  Sarina Canelake committed Oct 01, 2015
  cdd59b5a Browse Files