Commits · 562f35bc92ca37066958730cb35dda13da77129b · edx / edx-platform · GitLab

22 Dec, 2016 6 commits
- Merge pull request #14181 from edx/mdikan/add-utm-tracking-to-free-purchases · 562f35bc
```
Adding support for UTM Tracking to apply to free purhases
```
  mikedikan committed Dec 22, 2016
  562f35bc Browse Files
- Merge pull request #14202 from edx/TNL-6203-duplicate-button · 7daf1df9
```
TNL-6203 Fix Duplicate button in Studio if user language is changed.
```
  Attiya Ishaque committed Dec 22, 2016
  7daf1df9 Browse Files
- TNL-6203 Fix Duplicate button in Studio if user language is changed. · 8eb81ea5
  attiyaishaque committed Dec 22, 2016
  
  8eb81ea5 Browse Files
- Merge pull request #14140 from edx/mushtaq/video-upload-restrict · 07c93a8e
```
Video upload restrictions
```
  Mushtaq Ali committed Dec 22, 2016
  07c93a8e Browse Files
- Adding support for UTM Tracking to apply to free purhases · 8f4cf682
```
ECOM-6450

Updating commerce api endpoint to capture user UTM cookies and resend them in the server request to the ecommerce IDA.
Currently, the non-free purchases are tracked because the user makes the request directly on ecommerce and user cookie
contains UTM data, but for free purchases, the UTM cookie isn't sent in the background server request to the ecommerce
IDA.
```
  Mike Dikan committed Dec 21, 2016
  8f4cf682 Browse Files
- Merge pull request #14192 from edx/bjacobel/a11y-discussions-test-broken · a56b3049
```
Flaky inline discussions test marked with @flaky
```
  Brian Jacobel committed Dec 21, 2016
  a56b3049 Browse Files
21 Dec, 2016 23 commits
- Merge pull request #14195 from edx/cdyer/save-cl-data · b3051ced
```
Save content library selected blocks during transform phase.
```
  Cliff Dyer committed Dec 21, 2016
  b3051ced Browse Files
- Skip this test until it can be fixed, in TNL-6215 · 86975faa
  Brian Jacobel committed Dec 21, 2016
  
  86975faa Browse Files
- Merge pull request #14199 from cpennington/revert-wajeeha · 4ead911f
```
Fix quality issues
```
  Calen Pennington committed Dec 21, 2016
  4ead911f Browse Files
- Merge pull request #14196 from edx/release · bd87061f
```
Merge Release back into master
```
  Calen Pennington committed Dec 21, 2016
  bd87061f Browse Files
- Merge pull request #14197 from cpennington/fix-release-merge-conflict · 147639ab
```
Fix release merge conflict
```
  Calen Pennington committed Dec 21, 2016
  147639ab Browse Files
- Ensure selected blocks get saved into StudentModule when running · b90c21b1
```
transform phase

TNL-6198
```
  Nimisha Asthagiri committed Dec 21, 2016
  b90c21b1 Browse Files
- Merge pull request #14189 from edx/yro_student-acct-timezone-fix · 59daa1c0
```
change variable name
```
  Gregory Martin committed Dec 21, 2016
  59daa1c0 Browse Files
- Merge remote-tracking branch 'edx/master' into release · a24ac515
  Calen Pennington committed Dec 21, 2016
  
  a24ac515 Browse Files
- Merge pull request #14193 from edx/release-candidate · b34d110b
```
Release candidate
```
  Calen Pennington committed Dec 21, 2016
  b34d110b Browse Files
- Fix quality issues · 3e0c8fb7
  Calen Pennington committed Dec 21, 2016
  
  3e0c8fb7 Browse Files
- Merge pull request #14190 from cpennington/revert-wajeeha · e6190c99
```
Revert Marketing URL changes
```
  Calen Pennington committed Dec 21, 2016
  e6190c99 Browse Files
- Revert "Merge pull request #13235 from edx/jia/MA-2684" · 04115bfe
```
This reverts commit bde0f7b2, reversing
changes made to 71693c3a.
```
  Calen Pennington committed Dec 21, 2016
  04115bfe Browse Files
- Revert "Merge pull request #14177 from edx/naa/fix-marketing-pr" · 7f942bfc
```
This reverts commit dec4034b, reversing
changes made to ef55cc4f.
```
  Calen Pennington committed Dec 21, 2016
  7f942bfc Browse Files
- Revert "Merge pull request #14187 from edx/jia/MA-3052" · 07865ce0
```
This reverts commit f7a0c1d9, reversing
changes made to dec4034b.
```
  Calen Pennington committed Dec 21, 2016
  07865ce0 Browse Files
- Merge pull request #14191 from edx/beryl/content_library_access · e860205e
```
Test retrieving subsection grade after losing access to block in subsection
```
  sanfordstudent committed Dec 21, 2016
  e860205e Browse Files
- Test retrieving subsection grade after losing access to block in subsection · d1d8d31b
  Nimisha Asthagiri committed Dec 21, 2016
  
  d1d8d31b Browse Files
- Merge pull request #14187 from edx/jia/MA-3052 · f7a0c1d9
```
MA-3052: avoid catalog integration for individual course when cached
```
  Calen Pennington committed Dec 21, 2016
  f7a0c1d9 Browse Files
- MA-3052: avoid catalog integration for individual course when cached · b5edd018
  wajeeha-khalid committed Dec 21, 2016
  
  b5edd018 Browse Files
- change variable name · ce76e2c3
  Gregory Martin committed Dec 21, 2016
  
  ce76e2c3 Browse Files
- Merge pull request #14151 from edx/sstudent/TNL-6178 · 74a66664
```
context manager for course id in context
```
  sanfordstudent committed Dec 21, 2016
  74a66664 Browse Files
- Merge pull request #14089 from asadazam93/asadazam/tnl-5487-invalid-usage-key · fc79fae5
```
TNL-5487 – Fix InvalidKeyError on render xblock
```
  AsadAzam committed Dec 21, 2016
  fc79fae5 Browse Files
- Prevent files larger than 5 GB · 2c7941d1
```
Prevent file containig containing non-ascii or special characters in file name
TNL-5855 TNL-5957
```
  Mushtaq Ali committed Dec 21, 2016
  2c7941d1 Browse Files
- Merge pull request #14178 from edx/yro_set-default-timezone-settings · ff8c4a6e
```
add blankTitle option
```
  Gregory Martin committed Dec 20, 2016
  ff8c4a6e Browse Files
20 Dec, 2016 11 commits
- add blankTitle option · 909f35bb
  Gregory Martin committed Dec 20, 2016
  
  909f35bb Browse Files
- Merge pull request #14078 from edx/yro_remove-datetimetext-functions · 8c009881
```
remove datetext utils
```
  Gregory Martin committed Dec 20, 2016
  8c009881 Browse Files
- Merge pull request #14173 from edx/alisan/discussion-styles-fix-TNL-6187 · 5b6e2dd5
```
new inline discussion style fixes
```
  alisan617 committed Dec 20, 2016
  5b6e2dd5 Browse Files
- Merge pull request #14179 from edx/adam/fix-stringresponse-issue · 30c84118
```
Revert "tnl-4141 only whitespaces not allowed in answer and fixed the…
```
  Adam committed Dec 20, 2016
  30c84118 Browse Files
- context manager for course id in context · ac9b8fba
  Sanford Student committed Dec 20, 2016
  
  ac9b8fba Browse Files
- discussion img upload dialog RTL and other clean-up · e28f42b1
  alisan617 committed Dec 20, 2016
  
  e28f42b1 Browse Files
- Revert "tnl-4141 only whitespaces not allowed in answer and fixed the pep8 violation." · c4c5a8e8
```
This reverts commit 3ad2f092.
```
  Adam Palay committed Dec 20, 2016
  c4c5a8e8 Browse Files
- Merge pull request #14177 from edx/naa/fix-marketing-pr · dec4034b
```
Fix Enrollment database access in Marketing Course URL PR
```
  Nimisha Asthagiri committed Dec 20, 2016
  dec4034b Browse Files
- Fix Enrollment database access in Marketing Course URL PR · f2483091
  Nimisha Asthagiri committed Dec 20, 2016
  
  f2483091 Browse Files
- delete datetext functions, implement dateutils · b0bf19a7
  Gregory Martin committed Dec 20, 2016
  
  b0bf19a7 Browse Files
- Merge pull request #14176 from edx/ora_1_1_13_release · ef55cc4f
```
ORA2 1.1.13 release
```
  Albert (AJ) St. Aubin committed Dec 20, 2016
  ef55cc4f Browse Files