Commits · a1e93f613aef3ea58a6a87a5a923c6c3d9e3443a · edx / edx-platform · GitLab

26 Jul, 2016 4 commits
- 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
- 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
- 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 #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
25 Jul, 2016 19 commits
- [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
- 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
- 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
- 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
22 Jul, 2016 17 commits
- Merge pull request #12237 from edx/mushtaq/maintenance · d4ff39a3
```
Maintenance app and force publish course view
```
  Mushtaq Ali committed Jul 23, 2016
  d4ff39a3 Browse Files
- add formatting and indentation best practices (#12850) · f84d05b9
```
add_missing_semicolon

simple SpaceBeforeBrace
```
  Daniel Naranjo committed Jul 22, 2016
  f84d05b9 Browse Files
- Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force… · 27646b7e
```
Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46
```
  Mushtaq Ali committed Jul 22, 2016
  27646b7e Browse Files
- Retry-while-retrying is not an error in bulk email (#13068) · 1af5e2ab
```
This code will be hit if, during a retry of the send_email task, an error
is encountered that means we need to retry the task again. Since the task will
be retried with timed backoff up to predefinied limits, this is an expected
situation and does not need to be logged as an exception.
```
  Eric Fischer committed Jul 22, 2016
  1af5e2ab Browse Files
- generalizing proctored exam transformer to handle all milestones · 87a9ebce
  Sanford Student committed Jul 22, 2016
  
  87a9ebce Browse Files
- Merge pull request #13073 from edx/zoldak/TNL-5051 · 056d27f8
```
Comment out flaky lettuce test  TNL-5051
```
  Jesse Zoldak committed Jul 22, 2016
  056d27f8 Browse Files
- Merge pull request #13074 from edx/merge-release-to-master · 2cd40c31
```
Merge release to master
```
  Eric Fischer committed Jul 22, 2016
  2cd40c31 Browse Files
- Merge remote-tracking branch 'origin/release' into merge-release-to-master · 9125ae2f
  Eric Fischer committed Jul 22, 2016
  
  9125ae2f Browse Files
- Get rid of the extra parse_bokchoy_opts step for passing arguments to a BokChoySuite · 5f05c66d
  Calen Pennington committed Jul 22, 2016
  
  5f05c66d Browse Files
- Split actions needed for bok_choy tests into smaller tasks to get more granular timing information · 8c3d4ce8
  Calen Pennington committed Jul 22, 2016
  
  8c3d4ce8 Browse Files
- Move the definition of shared bok_choy task options into a separate file · fa525732
  Calen Pennington committed Jul 22, 2016
  
  fa525732 Browse Files
- [EV-62] Add the ability to log timing information during paver tasks · f94530ba
  Calen Pennington committed Jul 22, 2016
  
  f94530ba Browse Files
- Merge pull request #13072 from edx/ned/update-translations · 3799890b
```
Update translations (autogenerated message)
```
  Ned Batchelder committed Jul 22, 2016
  3799890b Browse Files
- Initial check of removing feature flag (#13058) · 2fddd2bd
  Kevin Kim committed Jul 22, 2016
  
  2fddd2bd Browse Files
- Update translations (autogenerated message) · eaece533
  Ned Batchelder committed Jul 22, 2016
  
  eaece533 Browse Files
- Comment out flaky lettuce test TNL-5051 · 4906bde0
  Jesse Zoldak committed Jul 22, 2016
  
  4906bde0 Browse Files
- Merge pull request #13053 from edx/tnl/grades-app · b04a6a6a
```
Create Grades djangoapp
```
  Nimisha Asthagiri committed Jul 22, 2016
  b04a6a6a Browse Files