Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,986 Commits 1 Branch 0 Tags
dffd8648b3e464bdb45458f18f87cc217432c653
Commit Graph

27986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
muhammad-ammar
45c2abbb9d Merge pull request #4261 from edx/ammar/video-tests-refactoring 
Refactor Bok-Choy LMS Video Tests
 2014-08-07 12:49:48 +05:00
muhammad-ammar
f0e737a753 Merge pull request #4715 from edx/ammar/decrease-video-player-init-timeout 
Decrease Video Player Init Wait Timeout
 2014-08-07 12:47:30 +05:00
Xavier Antoviaque
e8259b8234 secure-cookies: Allow to use secure HTTPS cookies (Django setting) 
Cf https://docs.djangoproject.com/en/1.4/ref/settings/#std:setting-SESSION_COOKIE_SECURE
 2014-08-07 09:30:51 +02:00
Minh-Tue Vo
7b3bacaa47 Merge pull request #4636 from edx/mvo/update_bok_choy_db_caches 
update bok choy db caches
 2014-08-06 19:41:51 -04:00
Minh Tue Vo
54e90c944d Merge branch 'mvo/update_bok_choy_db_caches' of https://github.com/edx/edx-platform into mvo/update_bok_choy_db_caches 2014-08-06 17:55:45 -04:00
Minh Tue Vo
7f674a016f update bok choy db caches 2014-08-06 17:54:40 -04:00
Sarina Canelake
ea8fa20b33 Merge pull request #4504 from lduarte1991/lduarte-harvardx-pr11 
Annotation Tools: Added Grouping Plug-In
 2014-08-06 17:19:14 -04:00
lduarte1991
0ca9bfa7e4 Annotation Tools: Added Grouping Plug-In 
- adding comments

 - spacing issues and indentation
 2014-08-06 14:49:40 -04:00
Will Daly
86515df763 Merge pull request #4722 from edx/will/ora2-hotfix-2014-08-06 
ORA2 hotfix 2014-08-06
 2014-08-06 14:38:16 -04:00
Will Daly
41ba395900 ORA2 hotfix 2014-08-06 2014-08-06 13:59:31 -04:00
Alison Hodges
311391788f Separated August changes into new table in chg log 2014-08-06 12:30:27 -04:00
Christina Roberts
540d67a670 Merge pull request #4687 from lduarte1991/lduarte-harvardx-pr16 
TinyMCE Plugin: Added media plugin to TinyMCE for the Annotation tool
 2014-08-06 12:26:46 -04:00
Jim Abramson
fdca788845 Merge pull request #4719 from edx/waheed/lms6622-implemented-process-response-method-rc 
Implemented process_response method to clear requestcontext global variable in mako middleware.
 2014-08-06 11:41:48 -04:00
chrisndodge
2734ab767d Merge pull request #4718 from edx/cdodge/fix-visual-bug 
add space to table header
 2014-08-06 11:32:41 -04:00
Alexander Kryklia
16601d5405 Request IFRAME API every time with https scheme. 2014-08-06 11:13:26 -04:00
Waheed Ahmed
05b87fd99b Implemented process_response method to clear requestcontext global variable in mako middleware. 
LMS-6622
 2014-08-06 19:58:20 +05:00
clytwynec
22582f4931 Merge pull request #4634 from edx/clytwynec/removing_remaining_rake_references 
removing rake and  outdated references to it
 2014-08-06 10:20:30 -04:00
David Baumgold
9b99213b02 Toggle aria-expanded attribute 2014-08-06 09:59:48 -04:00
David Baumgold
3f29fe4fb0 make expanding explanation accessible 
LMS-11161
 2014-08-06 09:59:48 -04:00
Chris Dodge
ed06700afb add space to table header 2014-08-06 09:50:32 -04:00
Stephen Sanchez
b7e585c101 Merge pull request #4709 from edx/ora2/hotfix-2014-8-5 
Updating ORA2 hash for hotfix August 5th, 2014
 2014-08-06 09:26:02 -04:00
Muhammad Ammar
c23b0bc90a Decrease Video Player Init Wait Timeout 2014-08-06 13:21:41 +00:00
Muhammad Ammar
c237364e2d Refactor LMS Video Tests 2014-08-06 13:20:39 +00:00
Alexander Kryklia
2bdc4bf0a2 Merge pull request #4717 from edx/alex/fix_test 
Request IFRAME API every time with https scheme.
 2014-08-06 15:39:09 +03:00
Alexander Kryklia
c9ef2f3efa Request IFRAME API every time with https scheme. 2014-08-06 14:59:17 +03:00
zubair-arbi
9caff20036 Merge pull request #4250 from edx/zub/story/listallexportfaildcourses 
update export_all_courses management command to count and list all faile...
 2014-08-06 16:19:10 +05:00
Don Mitchell
753c67a73a Merge pull request #4698 from mitocw/cg/fix_student_migration_35 
Correct UnboundLocalError exception in student_migration_35
 2014-08-05 18:26:45 -04:00
jmclaus
9f313fcbdd Merge pull request #4613 from edx/jmclaus/easy-access-group-configurations-page 
BLD 1020: Easy access to Group Configurations page from Content Experiment component.
 2014-08-05 23:45:55 +02:00
Stephen Sanchez
062e723e8a Updating ORA2 hash for hotfix August 5th, 2014 2014-08-05 17:41:09 -04:00
lduarte1991
fe009f5989 TinyMCE Plugin: Added media plugin to TinyMCE for the Annotation tool 
- fixed missing media and link buttons on image

 - fixed a CSS issue with the sharing button
 2014-08-05 15:05:56 -04:00
John Jarvis
043d495a90 Merge pull request #4673 from edx/jarv/rsyslog-handler 
Jarv/rsyslog handler
 2014-08-05 14:31:30 -04:00
Alison Hodges
592d786830 Added enrollment breakdown by certificate track 2014-08-05 13:46:23 -04:00
jmclaus
459c241e3b BLD 1020: Easy access to Group Configurations page from Content Experiment component. 2014-08-05 19:44:21 +02:00
David Baumgold
5457775cfe Replace check_for_get_code with assert_request_status_code 
More flexible, uses the word "assert", method instead of function
 2014-08-05 13:36:49 -04:00
Sarina Canelake
1673448d08 Merge pull request #4518 from lduarte1991/lduarte-harvardx-pr13 
Text Annotation Tool: Safari Colored Highlights Bug Fix
 2014-08-05 13:17:45 -04:00
Sarina Canelake
1184cc063a Merge pull request #4675 from lduarte1991/lduarte-harvardx-pr14 
Annotations Tools: Fixing major Firefox/Tinymce bug in annotations
 2014-08-05 13:16:33 -04:00
chrisndodge
246a431760 Merge pull request #4590 from edx/cdodge/fix-reg-codes 
eCommerce enhancements (pt. 2)
 2014-08-05 13:12:52 -04:00
lduarte1991
a1684d2e64 Text Annotation Tool: Safari Colored Highlights Bug Fix 
- fixed spacing
 2014-08-05 12:04:29 -04:00
Carson Gee
7bb780335d Correct UnboundLocalError exception in student_migration_35 2014-08-05 11:51:49 -04:00
Alexander Kryklia
9a2c96cabd Merge pull request #4693 from edx/anton/fix-video-tests 
Fix failing video tests due to wrong IFRAME_API_RESPONSE
 2014-08-05 18:28:56 +03:00
polesye
4f391f664d Update youtube api. 2014-08-05 18:27:55 +03:00
Diana Huang
1e1b321b69 Merge pull request #4655 from edx/diana/allow-only-verified 
Allow verified to be offered without audit
 2014-08-05 11:26:29 -04:00
lduarte1991
0b770e1d53 Annotations Tools: Fixing major Firefox/Tinymce bug in annotations 
- 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
 2014-08-05 11:22:37 -04:00
Calen Pennington
ea4e76b0bc Merge pull request #4254 from marcore/fix-branding-course-listing-opaque 
Fix filter with new opaque key, allowing user to set COURSE_LISTING as o...
 2014-08-05 10:31:33 -04:00
asadiqbal08
33bdf935f0 Retrieving active coupon codes from model 2014-08-05 10:01:31 -04:00
asadiqbal08
fc8ec1cc43 e-commerce UI suggested changes 2014-08-05 10:00:17 -04:00
Chris Dodge
a1248f614e add more detail to new CourseModesArchive table 2014-08-05 10:00:17 -04:00
asadiqbal08
932010df59 refund message for purchased courses 
Add little more logic for paid courses
 2014-08-05 10:00:16 -04:00
Muhammad Shoaib
33d5b49e81 added course price set/view/edit functionality 
added CoursmodeArchive model to save the old prices history

analytics -> instructor_analytics

analytics -> instructor_analytics
 2014-08-05 10:00:13 -04:00
asadiqbal08
dc46170f36 registration code checkout flow 
Redirecting to dashboard after free user enrollment.
 2014-08-05 10:00:12 -04:00