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

35625 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Douglas Hall
fd318e05db Merge pull request #11767 from edx/ibrahimahmed443/SOL-1691 
return course end date in credit service and rename flag
 2016-03-10 05:52:06 -05:00
Douglas Hall
2c3b728c08 Merge pull request #11749 from edx/hasnain-naveed/SOL-1654 
SOL-1654 / Testing flakiness
 2016-03-09 16:34:51 -05:00
sanfordstudent
5c0ca8c6ea Merge pull request #11756 from edx/sstudent/MA-2103 
Sstudent/ma 2103
 2016-03-09 11:04:08 -05:00
Peter Fogg
ab8fc07bbd Merge pull request #10645 from CourseTalk/coursetalk_widget 
Integration CourseTalk widgets with OpenEdx.
 2016-03-09 10:41:02 -05:00
Hasnain
5e24225cd8 Removing Flaky decorator from lms instructor dashboard test 2016-03-09 10:18:10 -05:00
erm0l0v
4142438372 add CourseTalk widget 
Move tests to one test class
 2016-03-09 13:32:07 +03:00
Peter Fogg
91fd6dbea2 Merge pull request #11769 from edx/peter-fogg/disable-order-closed-course 
Prevent ordering closed courses, and give a good user message.
 2016-03-08 20:32:25 -05:00
Peter Fogg
fd2f3b69ef Prevent ordering closed courses, and give a good user message. 
When Drupal attempts to enroll a user in a closed course, a 406 will
be returned. This causes the marketing site to redirect to the track
selection page for that course, which will then redirect to the
dashboard with a nice message.

ECOM-2317
 2016-03-08 16:45:49 -05:00
Sanford Student
6490551f1b MA-2103 2016-03-08 16:17:01 -05:00
clrux
7f7886be90 Merge pull request #11770 from edx/release 
Weekly release for 08 Mar 2016
 2016-03-08 16:09:46 -05:00
Ned Batchelder
d127fb4bad Merge pull request #11626 from ubc/ubcpi-0.5.1 
Update UBCPI Xblock to 0.5.1
 2016-03-08 15:53:30 -05:00
Ned Batchelder
a17eff7795 Merge pull request #11757 from stvstnfrd/debt/ie67 
Remove deprecated IE6/7 polyfill
 2016-03-08 14:45:52 -05:00
clrux
cf5e4c9b59 Merge pull request #11754 from edx/rc/2016-03-08 
Release Candidate rc/2016-03-08
 2016-03-08 14:07:41 -05:00
Toby Lawrence
23ae5f762f Merge pull request #11743 from edx/PERF-272 
Send 'Vary: Origin' so XHR/CORS requests can work properly.
 2016-03-08 10:16:10 -05:00
Ibrahim
97ef7397ce return course end date in credit service and rename flag 2016-03-08 19:12:19 +05:00
Toby Lawrence
5a20f0b589 Merge branch 'master' into PERF-272 2016-03-08 08:53:36 -05:00
Syed Hasan raza
7bdc762ebd Merge pull request #11662 from edx/shr/bug/AN-6713-decoding-errors 
Add latin1 decoding to HTTP Headers
 2016-03-08 16:08:46 +05:00
Waheed Ahmed
ca936a7ff7 Merge pull request #11580 from edx/waheed/ecom-2947-support-entire-password-reset-flow-in-logistration 
Fixed the other half of forgot password flow accourding to logistration.
 2016-03-08 14:43:10 +05:00
Syed Hassan Raza
0d6e0ac779 Add latin1 decoding to HTTP Headers 2016-03-08 12:44:55 +05:00
Waheed Ahmed
178f5a6056 Fixed the other half of forgot password flow accourding to logistration. 
ECOM-2947
 2016-03-08 12:14:24 +05:00
Toby Lawrence
1a3464152f Switch to header_control in contentserver. 2016-03-07 18:51:14 -05:00
Braden MacDonald
5f51db0a61 Merge pull request #11762 from open-craft/smarnach/update-dndv2-version 
Bump the version of the Drag&Drop XBlock to 2.0.3.
 2016-03-07 13:29:19 -08:00
Hassan
fb2998172d Merge pull request #11660 from edx/hassan/dump-course-ids-fix 
Include CCX courses in dump_course_ids.
 2016-03-08 01:45:06 +05:00
Michael Frey
5dcdf9a46b Merge pull request #11755 from edx/SOL-1690 
Redirect to otto checkout for prof ed courses if enabled
 2016-03-07 15:09:23 -05:00
clrux
efa289bac6 Merge pull request #11765 from edx/efischer/ora_bump 
ORA release
 2016-03-07 14:56:55 -05:00
clrux
4f5290e464 Merge pull request #11764 from edx/clrux/ac-328-lessening-specificity 
Lessening specificity for headings
 2016-03-07 14:30:37 -05:00
Michael Frey
8502093f50 Redirect to otto checkout for prof ed courses if enabled 2016-03-07 14:16:49 -05:00
Christina Roberts
e1889fb85e Merge pull request #11763 from edx/christina/remove-unnecessary-escaping 
The escaping is unnecessary and confusing to the user.
 2016-03-07 13:58:58 -05:00
Eric Fischer
c35f5ba9d6 ORA release 2016-03-07 13:52:44 -05:00
Chris Rodriguez
6b549bf1a3 Removing importants from heading styles 2016-03-07 13:24:33 -05:00
Chris Rodriguez
08937ce5a8 Lessening specificity for headings 2016-03-07 13:07:56 -05:00
clrux
40b5f8e607 Merge pull request #11761 from edx/clrux/ac-328-removing-importants 
Removing importants from heading styles
 2016-03-07 12:11:11 -05:00
Sven Marnach
b026038574 Bump the version of the Drag&Drop XBlock to 2.0.3. 2016-03-07 18:10:04 +01:00
cahrens
2eabaccb33 The escaping is unnecessary and confusing to the user. 2016-03-07 11:58:22 -05:00
Chris Rodriguez
fed1d4b455 Removing importants from heading styles 2016-03-07 10:48:56 -05:00
Christina Roberts
e6fcfae994 Merge pull request #11751 from edx/christina/remove-profile-name 
Remove unused profile name.
 2016-03-07 10:44:34 -05:00
Kevin Falcone
ec6eccce7a Merge pull request #11748 from edx/jibsheet/course_overview_0009_on_migrate_from_scratch 
Migrate correctly from scratch also
 2016-03-07 10:30:30 -05:00
Hassan
48a5b954d5 Use CourseOverview for dump_course_ids 2016-03-07 19:44:38 +05:00
cahrens
2f3e3a55bb Remove unused profile name. 
The profile name requires escaping when displayed. Proactively removing since it is not being used. Also discovered some dead code.
 2016-03-07 09:37:39 -05:00
Christina Roberts
dbc2b4161e Merge pull request #11752 from edx/christina/remove-hinter 
Delete hinter manager.
 2016-03-07 09:35:56 -05:00
stv
1ff2ec15be Remove deprecated IE6/7 polyfill 
This polyfill was added in late 2012 [1].
The final reference appears to have been removed in mid-2013 [2].

Regardless, we certainly are no longer supporting IE6/7.

[1] bf9f9c1c48
[2] 1388684194
 2016-03-06 13:17:58 -08:00
cahrens
5432ef3b5e Make it clear that the logger methods are used by xblocks. 2016-03-05 17:14:15 -05:00
Kelketek
04cadf79bd Merge pull request #11697 from open-craft/agaylard/TNL-3429-D 
TNL-3429: implement display_name_with_default for studio text sanitation
 2016-03-04 17:54:11 -06:00
M. Rehan
11c0094f07 Merge pull request #11679 from edx/code-jail-configs-cms-demo 
TNL-4140 – Configure code jail for Studio
 2016-03-05 02:00:50 +05:00
cahrens
ba06c899de Delete crowdsource_hinter prototype xmodule. 
TNL-4195
 2016-03-04 15:34:48 -05:00
Douglas Hall
56ecc6646d Merge pull request #11607 from CredoReference/invalid-display-courseware-through-lti-iframe 
Invalid display courseware through the LTI iframe in IE 10+
 2016-03-04 15:29:42 -05:00
Jesse Zoldak
01e6fa81af Merge pull request #11654 from edx/zoldak/TE-1201 
Convert tests for adding advanced problem components from lettuce to bok-choy
 2016-03-04 15:14:25 -05:00
Jonathan Piacenti
f1c1c7c146 Fix escaping issue in studio xblock wrapper for display name. 2016-03-04 13:38:20 -06:00
Andrew Gaylard
2fe0bf5a98 Fix TNL-3429. 2016-03-04 13:38:20 -06:00
Douglas Hall
467913a450 Fixed edx-proctoring requirement 2016-03-04 13:07:22 -05:00