Commits · cddb8d9145f24847d74787056210ebc5cb486f49 · edx / edx-platform

06 Oct, 2014 6 commits
- Merge pull request #7 from mitocw/mitx-hotfix-rc-20140919 · cddb8d91
```
Mitx hotfix rc 20140919
```
  Brandon DeRosier committed Oct 06, 2014
  cddb8d91 Browse Files
- Added handling in gitlog for missing import logs · ad21ac75
```
Fixes a template error that occurs when viewing a course's detailed
git import log. The problem happens for courses imported using methods
other than the `git_add_course` command.
```
  Brandon DeRosier committed Oct 06, 2014
  ad21ac75 Browse Files
- Check REQUEST_CONTEXT.context exists before accessing it. · 923f519e
```
LMS-11226
```
  Waheed Ahmed committed Oct 06, 2014
  923f519e Browse Files
- Rewrote inline discussions hotfix from 58553a7f · 59eb751b
```
In general, this is a very straight forward fix - I decided not to
cherry-pick directly from 58553a7f
as the diff exposes very radical differences.
```
  Brandon DeRosier committed Oct 06, 2014
  59eb751b Browse Files
- Fixed problems with psychometrics · d4aeb78a
```
- Update key comparisons for Opaque Keys
- Search for 'problem_check' instead of 'save_problem_check' when
  filtering TrackingLogs.
```
  Brandon DeRosier committed Oct 06, 2014
  d4aeb78a Browse Files
- Moved imports to startup.py. · e9977792
```
Conflicts:
	cms/startup.py
	lms/startup.py
```
  Usman Khalid committed Oct 06, 2014
  e9977792 Browse Files
02 Sep, 2014 4 commits
- Merge pull request #5 from mitocw/mitx-hotfix-rc-20140828 · a0904cff
```
Mitx hotfix rc 20140828
```
  Carson Gee committed Sep 02, 2014
  a0904cff Browse Files
- Corrected log type for LTI per @cpennington review · de9ff565
  Carson Gee committed Sep 02, 2014
  
  de9ff565 Browse Files
- Merge pull request #4 from mitocw/bugfix/ichuang/custom_tag_workaround · 005599aa
```
workaround for custom_tag being broken in residential MITx
```
  Carson Gee committed Sep 02, 2014
  005599aa Browse Files
- Annotator Tools: Fix major logic bug in code · 4eb004aa
```
(cherry picked from commit 71e9f448)
```
  lduarte1991 committed Sep 02, 2014
  4eb004aa Browse Files
01 Sep, 2014 1 commit
- workaround for custom_tag being broken in residential MITx · 091536ed
  ichuang committed Aug 31, 2014
  
  091536ed Browse Files
29 Aug, 2014 1 commit

OAuth signature should be verified against URL provided to the tool. There is… · df9541f4

OAuth signature should be verified against URL provided to the tool. There is possibility that a proxy will change URL along the way (for example protocol from https to http) which would invalidate signature.

(cherry picked from commit 8494473a0592908b948e17a9204b91f36bb20c28)

committed Aug 29, 2014

df9541f4 Browse Files

28 Aug, 2014 1 commit
- update export_all_courses management command to count and list all failed export courses · 308f33c1
```
(cherry picked from commit 70e5044f)
```
  zubair-arbi committed Aug 28, 2014
  308f33c1 Browse Files
22 Aug, 2014 1 commit
- Add missing endif in crystallography mako template · c99ac45a
```
(cherry picked from commit 7dbea40f)
```
  Carson Gee committed Aug 22, 2014
  c99ac45a Browse Files
20 Aug, 2014 2 commits
- Addressed comments. · d1cb8c14
```
(cherry picked from commit f85b0d0bc23ff4458a783302f3a6900bb08619e9)
```
  jmclaus committed Aug 20, 2014
  d1cb8c14 Browse Files
- Supply loading_timeout attribute for jsinput tag. · 25e0627e
```
(cherry picked from commit b7ee0233c9a370428d7473e8ce7c7d73fc471519)
```
  jmclaus committed Aug 20, 2014
  25e0627e Browse Files
07 Aug, 2014 2 commits
- Update SGA to current HEAD for RC · 53346ffd
```
(cherry picked from commit 6613becefa162041c694a732f5c23fad73e9718e)
```
  Carson Gee committed Aug 07, 2014
  53346ffd Browse Files
- Add Staff Graded Assignments XBlock to edx-platform · 13f8611c
```
(cherry picked from commit da1c87a47051da85fdd5bbc3e8677762884608d6)
```
  Carson Gee committed Aug 07, 2014
  13f8611c Browse Files
06 Aug, 2014 8 commits
- Merge pull request #4722 from edx/will/ora2-hotfix-2014-08-06 · 86515df7
```
ORA2 hotfix 2014-08-06
```
  Will Daly committed Aug 06, 2014
  86515df7 Browse Files
- ORA2 hotfix 2014-08-06 · 41ba3959
  Will Daly committed Aug 06, 2014
  
  41ba3959 Browse Files
- Merge pull request #4719 from edx/waheed/lms6622-implemented-process-response-method-rc · fdca7888
```
Implemented process_response method to clear requestcontext global variable in mako middleware.
```
  Jim Abramson committed Aug 06, 2014
  fdca7888 Browse Files
- Merge pull request #4718 from edx/cdodge/fix-visual-bug · 2734ab76
```
add space to table header
```
  chrisndodge committed Aug 06, 2014
  2734ab76 Browse Files
- Request IFRAME API every time with https scheme. · 16601d54
  Alexander Kryklia committed Aug 06, 2014
  
  16601d54 Browse Files
- Implemented process_response method to clear requestcontext global variable in mako middleware. · 05b87fd9
```
LMS-6622
```
  Waheed Ahmed committed Aug 06, 2014
  05b87fd9 Browse Files
- add space to table header · ed06700a
  Chris Dodge committed Aug 06, 2014
  
  ed06700a Browse Files
- Merge pull request #4709 from edx/ora2/hotfix-2014-8-5 · b7e585c1
```
Updating ORA2 hash for hotfix August 5th, 2014
```
  Stephen Sanchez committed Aug 06, 2014
  b7e585c1 Browse Files
05 Aug, 2014 14 commits
- Updating ORA2 hash for hotfix August 5th, 2014 · 062e723e
  Stephen Sanchez committed Aug 05, 2014
  
  062e723e Browse Files
- Merge pull request #4675 from lduarte1991/lduarte-harvardx-pr14 · 1184cc06
```
Annotations Tools: Fixing major Firefox/Tinymce bug in annotations
```
  Sarina Canelake committed Aug 05, 2014
  1184cc06 Browse Files
- Merge pull request #4590 from edx/cdodge/fix-reg-codes · 246a4317
```
eCommerce enhancements (pt. 2)
```
  chrisndodge committed Aug 05, 2014
  246a4317 Browse Files
- Merge pull request #4693 from edx/anton/fix-video-tests · 9a2c96ca
```
Fix failing video tests due to wrong IFRAME_API_RESPONSE 
```
  Alexander Kryklia committed Aug 05, 2014
  9a2c96ca Browse Files
- Update youtube api. · 4f391f66
  polesye committed Aug 05, 2014
  
  4f391f66 Browse Files
- Merge pull request #4655 from edx/diana/allow-only-verified · 1e1b321b
```
Allow verified to be offered without audit
```
  Diana Huang committed Aug 05, 2014
  1e1b321b Browse Files
- Annotations Tools: Fixing major Firefox/Tinymce bug in annotations · 0b770e1d
```
 - fixed issue in Firefox where the init gets called multiple times

 - fixed spacing issues and added more comments

 - fixed indentation, added missing parens in comment, and fixed typo
```
  lduarte1991 committed Aug 05, 2014
  0b770e1d Browse Files
- Merge pull request #4254 from marcore/fix-branding-course-listing-opaque · ea4e76b0
```
Fix filter with new opaque key, allowing user to set COURSE_LISTING as o...
```
  Calen Pennington committed Aug 05, 2014
  ea4e76b0 Browse Files
- Retrieving active coupon codes from model · 33bdf935
  asadiqbal08 committed Aug 05, 2014
  
  33bdf935 Browse Files
- e-commerce UI suggested changes · fc8ec1cc
  asadiqbal08 committed Aug 05, 2014
  
  fc8ec1cc Browse Files
- add more detail to new CourseModesArchive table · a1248f61
  Chris Dodge committed Aug 05, 2014
  
  a1248f61 Browse Files
- refund message for purchased courses · 932010df
```
Add little more logic for paid courses
```
  asadiqbal08 committed Aug 05, 2014
  932010df Browse Files
- added course price set/view/edit functionality · 33d5b49e
```
added CoursmodeArchive model to save the old prices history

analytics -> instructor_analytics

analytics -> instructor_analytics
```
  Muhammad Shoaib committed Aug 05, 2014
  33d5b49e Browse Files
- registration code checkout flow · dc46170f
```
Redirecting to dashboard after free user enrollment.
```
  asadiqbal08 committed Aug 05, 2014
  dc46170f Browse Files