Commits · 8ae92901ef882ee18323eb87447f4090a0098716 · edx / edx-platform

27 Jul, 2016 1 commit

1. Merge microsites into Comprehensive Theming · 8ae92901

2. Add site configuration overrides to theming/helpers.py
3. Move microsite.get_value from theming/helpers to site_configuration/helpers
4. Move microsite_configuration.microsite.get_value usages to site_configuration.helpers.values

committed Jul 27, 2016

8ae92901 Browse Files

26 Jul, 2016 16 commits
- Merge pull request #13096 from edx/ahsan/ECOM-5029-Photo-Verification-Admin-Broken · e8c60bc6
```
Photo Verification Admin Broken
```
  Ahsan Ulhaq committed Jul 27, 2016
  e8c60bc6 Browse Files
- Merge pull request #13105 from edx/release · 92587fbf
```
Release back into master
```
  Diana Huang committed Jul 26, 2016
  92587fbf Browse Files
- Merge pull request #13082 from edx/tnl/split-edit-version · 558043a8
```
Expose course_version and subtree_edited_on in BlockStructures
```
  Nimisha Asthagiri committed Jul 26, 2016
  558043a8 Browse Files
- Merge pull request #13090 from edx/sstudent/TNL-5071 · 8acd1bb1
```
adding request cache for milestones
```
  sanfordstudent committed Jul 26, 2016
  8acd1bb1 Browse Files
- removing redundant inherit · f02889e8
  Sanford Student committed Jul 26, 2016
  
  f02889e8 Browse Files
- Merge pull request #13104 from cpennington/revert-paver-timing · a1e93f61
```
Revert "Merge pull request #13021 from cpennington/paver-timing"
```
  Calen Pennington committed Jul 26, 2016
  a1e93f61 Browse Files
- Expose course_version from Split Modulestore; · 9616ac99
```
Support subtree_edited_on and course_version fields in BlockStructures
TNL-5010
```
  Nimisha Asthagiri committed Jul 26, 2016
  9616ac99 Browse Files
- Merge pull request #13077 from edx/rc/2016-07-26 · 20cbc62c
```
Release Candidate rc/2016-07-26
```
  Diana Huang committed Jul 26, 2016
  20cbc62c Browse Files
- Revert "Merge pull request #13021 from cpennington/paver-timing" · acf50c44
```
This reverts commit ed80381b, reversing
changes made to 205cb8b3.
```
  Calen Pennington committed Jul 26, 2016
  acf50c44 Browse Files
- per cliff's review · d996c2a3
  Sanford Student committed Jul 26, 2016
  
  d996c2a3 Browse Files
- adding query counts · c3d829f2
  Sanford Student committed Jul 26, 2016
  
  c3d829f2 Browse Files
- first round of self review and code review · d9e0ba45
  Sanford Student committed Jul 26, 2016
  
  d9e0ba45 Browse Files
- Merge pull request #13021 from cpennington/paver-timing · ed80381b
```
[EV-62] Paver timing
```
  Calen Pennington committed Jul 26, 2016
  ed80381b Browse Files
- Merge pull request #13095 from open-craft/discussion-export-hotfix · b5dc83f1
```
Discussion import/export fix (TNL-5001)
```
  alisan617 committed Jul 26, 2016
  b5dc83f1 Browse Files
- Merge pull request #13056 from open-craft/ekolpakov/fix_legacy_discussion_import · 205cb8b3
```
[TNL-5001] Import-export issues when importing legacy discussion OLX format
```
  Eugeny Kolpakov committed Jul 26, 2016
  205cb8b3 Browse Files
- Photo Verification Admin Broken · 45db2feb
```
ECOM-5029
```
  Ahsan Ulhaq committed Jul 26, 2016
  45db2feb Browse Files
25 Jul, 2016 23 commits
- [TNL-5001] Import-export issues when importing legacy discussion OLX format · 1f9dfe65
```
Observed Problems:
1. Discussion categories and targets were missing
2. When imported over existing course Discussion IDs have changed unexpectedly - all posts were missing

Solutions:
* Parsing legacy discussion OLX
* Do not force exporting discussion ID
```
  E. Kolpakov committed Jul 25, 2016
  1f9dfe65 Browse Files
- [TNL-5001] Import-export issues when importing legacy discussion OLX format · fe6a942b
```
Observed Problems:
1. Discussion categories and targets were missing
2. When imported over existing course Discussion IDs have changed unexpectedly - all posts were missing

Solutions:
* Parsing legacy discussion OLX
* Do not force exporting discussion ID
```
  E. Kolpakov committed Jul 25, 2016
  fe6a942b Browse Files
- Merge pull request #13069 from edx/christina/cache-disable-state · 0438878a
```
Use request cache for disabled_xblock_types
```
  Christina Roberts committed Jul 25, 2016
  0438878a Browse Files
- adding request cache for milestones · 7d690dde
  Sanford Student committed Jul 25, 2016
  
  7d690dde Browse Files
- Merge pull request #13085 from edx/renzo/devstack-jwt · 27d585e0
```
Configure JWT auth when running Studio in devstack
```
  Renzo Lucioni committed Jul 25, 2016
  27d585e0 Browse Files
- Rename helper method that was being run as a testpoint. · 682ee5ea
  cahrens committed Jul 25, 2016
  
  682ee5ea Browse Files
- Use request_cache for storing disabled xblock names. · d061b8dd
```
TNL-5002
```
  cahrens committed Jul 25, 2016
  d061b8dd Browse Files
- Document how to run tests on Paver scripts (#13088) · 450a0bc9
```
Meta.
```
  Brian Jacobel committed Jul 25, 2016
  450a0bc9 Browse Files
- Try to fix program editor in studio for stage (#13084) · bc6a0603
  Simon Chen committed Jul 25, 2016
  
  bc6a0603 Browse Files
- Merge pull request #12996 from mitocw/fix/aq/staff_access_coach_dashboard · 93969f1b
```
Fixed staff access to CCX coach dashboard issues
```
  Brian Beggs committed Jul 25, 2016
  93969f1b Browse Files
- Document how to run tests on Paver scripts · 940f6e99
```
Meta.
```
  Brian Jacobel committed Jul 25, 2016
  940f6e99 Browse Files
- Try to fix program editor in studio for stage · 9424930f
  Simon Chen committed Jul 25, 2016
  
  9424930f Browse Files
- Configure JWT auth when running Studio in devstack · 29672370
```
An important step towards being able to use Studio's program editor out of the box. Part of ECOM-4638.
```
  Renzo Lucioni committed Jul 25, 2016
  29672370 Browse Files
- Merge pull request #12882 from edx/muddasser/lettuce-to-bok-choy/signup.feature · 00448dff
```
Conversion of cms/signup.feature to bok-choy
```
  Muddasser committed Jul 25, 2016
  00448dff Browse Files
- Merge pull request #13075 from edx/sstudent/TNL-4925 · ba54ad19
```
generalizing proctored exam transformer to handle all milestones
```
  sanfordstudent committed Jul 25, 2016
  ba54ad19 Browse Files
- Merge pull request #12895 from edx/jia/MA-2552 · 42337f80
```
MA-2552: create revoke_token endpoint for oauth
```
  wajeeha-khalid committed Jul 25, 2016
  42337f80 Browse Files
- Merge pull request #13055 from edx/shr/bug/plat-1048-mongo-courses-restriction-split-key · d1ce8d39
```
Mongo courses wrong course_key restriction
```
  Syed Hasan raza committed Jul 25, 2016
  d1ce8d39 Browse Files
- Mongo courses wrong course_key restriction · 79df5456
  Syed Hassan Raza committed Jul 25, 2016
  
  79df5456 Browse Files
- MA-2552: create revoke_token endpoint for oauth · f90bf596
  wajeeha-khalid committed Jul 25, 2016
  
  f90bf596 Browse Files
- Merge pull request #13012 from edx/jia/MA-2076 · cd0df9e5
```
MA-2076: add due date to course block API
```
  wajeeha-khalid committed Jul 25, 2016
  cd0df9e5 Browse Files
- Merge pull request #12988 from edx/jia/MA-2591 · 733abe37
```
MA-2591 update oauthlib version to 1.0.3
```
  wajeeha-khalid committed Jul 25, 2016
  733abe37 Browse Files
- MA-2076: add due date to course block API · 98ba4b77
  wajeeha-khalid committed Jul 25, 2016
  
  98ba4b77 Browse Files
- update oauthlib version to 1.0.3 · 03cee389
  wajeeha-khalid committed Jul 25, 2016
  
  03cee389 Browse Files