Commits · cd0df9e55f6a0a37534d0e5222c020c4a05532a6 · edx / edx-platform · GitLab

25 Jul, 2016 4 commits
- 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 13 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
- 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
- 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
- Create Grades djangoapp · 1ada5c34
```
https://openedx.atlassian.net/browse/TNL-5008
```
  Nimisha Asthagiri committed Jul 22, 2016
  1ada5c34 Browse Files
21 Jul, 2016 15 commits
- Merge pull request #12950 from edx/christina/studio-support-levels · 467bc55d
```
Studio support level of components/xblocks
```
  Christina Roberts committed Jul 21, 2016
  467bc55d Browse Files
- Revert "genericizing transformer" (#13063) · f2a1984f
```
This reverts commit 4e65b1f1.
```
  sanfordstudent committed Jul 21, 2016
  f2a1984f Browse Files
- ECOM-4906 Add the program editor fix to allow creation of Micromasters programs (#13064) · d27bec61
  Simon Chen committed Jul 21, 2016
  
  d27bec61 Browse Files
- Merge pull request #13032 from edx/renzo/program-utility-cleanup · 719edc76
```
Handle unavailable course runs on the program detail page
```
  Renzo Lucioni committed Jul 21, 2016
  719edc76 Browse Files
- Support level support for Studio xblock creation. · d4cc7b8f
```
TNL-4670
```
  cahrens committed Jul 21, 2016
  d4cc7b8f Browse Files
- Handle unavailable course runs on the program detail page · 4c997601
```
Includes a refactor of the program data extension utility. ECOM-4807.
```
  Renzo Lucioni committed Jul 21, 2016
  4c997601 Browse Files
- Merge pull request #13037 from OmarIthawi/edraak/calculator-2-fixups · 05700243
```
Calculator wording and translation improvements
```
  Adam committed Jul 21, 2016
  05700243 Browse Files
- Revert "moving milestones check to access.py" (#13060) (#13061) · cae03d03
```
This reverts commit 5db58c00.
```
  Eric Fischer committed Jul 21, 2016
  cae03d03 Browse Files
- Revert "moving milestones check to access.py" (#13060) · 9ab92d58
```
This reverts commit 5db58c00.
```
  Eric Fischer committed Jul 21, 2016
  9ab92d58 Browse Files
- edx-ora2 1.1.6 (#13051) · b0408014
  Eric Fischer committed Jul 21, 2016
  
  b0408014 Browse Files
- Merge pull request #12945 from edx/kkim/ora_tz_date · 1ab52f8b
```
Convert ORA Due Dates
```
  Kevin Kim committed Jul 21, 2016
  1ab52f8b Browse Files
- Merge pull request #13046 from edx/release · 67e15e22
```
Release 2016-07-20 back to Master
```
  Robert Raposa committed Jul 21, 2016
  67e15e22 Browse Files
- Convert ORA due dates to user preferred time zone · 94100f59
  Kevin Kim committed Jul 21, 2016
  
  94100f59 Browse Files
- Merge pull request #13013 from edx/mushtaq/ecom4926-unactivated-user-msg · d4f359d4
```
Show user activation message if he has activation incomplete.
```
  Mushtaq Ali committed Jul 21, 2016
  d4f359d4 Browse Files
- Merge pull request #13049 from edx/zoldak/TNL-5051 · 893d1f5d
```
Skip flaky CMS.Course updates lettuce tests  TNL-5051
```
  Jesse Zoldak committed Jul 20, 2016
  893d1f5d Browse Files
20 Jul, 2016 8 commits
- New CMS visibility settings (#12940) · 35ae67b5
```
TNL-4906 Subsections now use radio buttons, to allow for "hide after due" as a
visibility option. Also, all tabs have been consolidated to "Basic" and
"Advanced", and visibility options have moved there.

Documentation links are updated to assist course authors with the new
visibility options. Tests have also been updated, and the changes suggested
in TNL-4951 are included.
```
  Eric Fischer committed Jul 20, 2016
  35ae67b5 Browse Files
- Merge pull request #13045 from edx/diana/flaky-course-page-test · f3a46bfb
```
Fix flaky asset page test
```
  Diana Huang committed Jul 20, 2016
  f3a46bfb Browse Files
- Skip flaky CMS.Course updates lettuce tests TNL-5051 · 8cdac6c9
  Jesse Zoldak committed Jul 20, 2016
  
  8cdac6c9 Browse Files
- Merge pull request #13005 from edx/unawaz/ECOM-4787-account-settings-page-header · 733cf06c
```
unawaz/ECOM-4787-account-settings-page-header
```
  Umar Nawaz committed Jul 21, 2016
  733cf06c Browse Files
- Merge pull request #13033 from edx/renzo/handle-missing-catalog-config · f0644abe
```
Allow program detail pages to function when catalog config is missing
```
  Renzo Lucioni committed Jul 20, 2016
  f0644abe Browse Files
- Merge pull request #12795 from eduNEXT/fmo/coffee_to_js_cms_main · 51bb4d4e
```
Convert cms/coffee/src/main to js
```
  Andy Armstrong committed Jul 20, 2016
  51bb4d4e Browse Files
- Merge pull request #13006 from edx/rc/2016-07-19 · 80c361f1
```
Release Candidate rc/2016-07-19
```
  Robert Raposa committed Jul 20, 2016
  80c361f1 Browse Files
- Allow program detail pages to function when catalog config is missing · 935be271
  Renzo Lucioni committed Jul 20, 2016
  
  935be271 Browse Files