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

26516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christina Roberts
ad37d93d24 Merge pull request #4775 from edx/alex/fix-reenable-user-partitions 
Reenable user partition in Advanced Settings.
 2014-08-11 10:39:06 -04:00
Alexander Kryklia
9643120390 Reenable user partition in Advanced Settings. 2014-08-11 16:41:29 +03:00
Chris Rossi
88af00904f Release edx-jsme 1.0 2014-08-11 09:04:27 -04:00
Alison Hodges
cd5b3bf230 wrapping 2014-08-11 08:34:26 -04:00
Alison Hodges
27927a78d8 cleanup 2014-08-11 07:22:45 -04:00
muhammad-ammar
452d69654e Merge pull request #4386 from edx/ammar/bok-choy-cms-video-tests 
Bok-Choy CMS Video Tests
 2014-08-11 14:42:17 +05:00
Muhammad Ammar
936bd4d5ad Bok-Choy CMS Video Tests 2014-08-11 07:50:19 +00:00
Sarina Canelake
9885b106af Remove banner from instructor dashboard 2014-08-10 00:46:10 -04:00
Alison Hodges
2bc6f1d8b5 ORA2 events 2014-08-08 18:11:34 -04:00
David Baumgold
619f72f39c Merge pull request #4767 from edx/release-script-validation-failed 
Improvements to the release.py script
 2014-08-08 18:00:18 -04:00
Julia Hansbrough
b9a285f1e7 Merge pull request #4756 from edx/flowerhack/prof-ed-reg-button 
Redirect to show_reqs for prof ed
 2014-08-08 17:03:29 -04:00
Julia Hansbrough
91e90b3673 Update redirect and wording for prof ed 
- Changes registraiton button text for professional ed courses
- Professional ed courses do not see "choose your track" page; go straight to verification flow
 2014-08-08 21:02:16 +00:00
David Baumgold
f4bfe464e2 Friendly error message if you don't have dependencies installed 2014-08-08 16:57:47 -04:00
David Baumgold
938b4f8111 Handle Validation Failed for release script 2014-08-08 16:57:47 -04:00
Christina Roberts
d6522e52e7 Merge pull request #4762 from edx/annotations-js-fix 
Annotator Tools: Fix major logic bug in code (RC)
 2014-08-08 16:37:54 -04:00
Renzo Lucioni
37598e605e Merge pull request #4763 from edx/lms/add-optimizely 
Lms/add optimizely
 2014-08-08 16:28:55 -04:00
Feanil Patel
2a9c9ee7c8 Merge pull request #3894 from mtyaka/patch-3 
Update xblock-mentoring.
 2014-08-08 16:23:22 -04:00
Diana Huang
83f7acffca Merge pull request #4764 from edx/diana/show-cert-without-end-date 
Show Certificates Before End
 2014-08-08 15:36:39 -04:00
Christina Roberts
562ec03696 Merge pull request #4760 from edx/oleg/turn-off-cdn-rc 
Allow turning off Video CDN in Studio.
 2014-08-08 15:12:54 -04:00
Don Mitchell
21c6812bd3 More branch override precedence refinement 2014-08-08 15:00:48 -04:00
Don Mitchell
f69ef41c21 Disable fetching by version guid for now 2014-08-08 15:00:48 -04:00
Don Mitchell
67d6347e50 Use continue version for create course side effects 2014-08-08 15:00:48 -04:00
Nimisha Asthagiri
ba8d390fd7 Support import of ErrorDescriptors. 2014-08-08 15:00:48 -04:00
Don Mitchell
ae4277c402 Use new check counter & bump count 2014-08-08 15:00:48 -04:00
Don Mitchell
7a75b94ff7 Support xml blocks w/ multiple parents 2014-08-08 15:00:47 -04:00
Don Mitchell
e900a47b3f Provide workarounds for skip_draft where other code doesn't want its behavior 2014-08-08 15:00:47 -04:00
Renzo Lucioni
2380235fd7 Add Optimizely widget 2014-08-08 14:58:18 -04:00
Diana Huang
0c3c7b5ab5 Merge pull request #4754 from edx/diana/show-cert-without-end-date 
Show Certificates Before End
 2014-08-08 14:58:02 -04:00
Don Mitchell
5fc30dc4f6 Move about overview creation to common superclass 2014-08-08 14:56:57 -04:00
lduarte1991
71e9f4488b Annotator Tools: Fix major logic bug in code 2014-08-08 14:56:21 -04:00
Nimisha Asthagiri
70c77f48b8 fixup - re-enable Asset checking. 2014-08-08 14:54:15 -04:00
Don Mitchell
9254cfa9ce Import depth first to help w/ publishing 2014-08-08 14:53:37 -04:00
Don Mitchell
2726b437bc Trying to get split to work 2014-08-08 14:53:37 -04:00
Calen Pennington
b87d469c89 Add make_course_key to modulestores, so that external clients don't need to assume a CourseKey subtype. 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
 2014-08-08 14:44:53 -04:00
Nimisha Asthagiri
84992cdfa5 Refactor xml_importer.py for easier reading. 
Remove post-publish step.
 2014-08-08 14:41:57 -04:00
Don Mitchell
47851c5041 Replace create_xmodule with create_xblock 
Refactor all callers (often replacing with more appropriate fn)

Also, added for_branch_setting method to old mongo and removed some
branch verification tests

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
 2014-08-08 14:40:27 -04:00
Oleg Marshev
0577b9d8b9 Allow turning off Video CDN in Studio. 
BLD-1207
 2014-08-08 14:39:19 -04:00
Don Mitchell
0d21381001 Remove hardcoding of key syntax for base url 
and /static and /jump_to_id link substitutions
LMS-11198
 2014-08-08 14:33:59 -04:00
Diana Huang
7865e2fb3c Move certificates_show_before_end into a new variable 
Mark it as deprecated, but maintain backwards compatibility.

ECOM-11
 2014-08-08 14:29:57 -04:00
Nimisha Asthagiri
9efe5d92c5 Merge pull request #4720 from edx/split/add-and-fixes 
Split/add and fixes
 2014-08-08 14:12:02 -04:00
Adam
26b08a0205 Merge pull request #4736 from edx/usman/lms11205-embargomiddleware-invalidkeyerror 
Catch InvalidKeyError in course_id_from_url().
 2014-08-08 13:27:25 -04:00
Nimisha Asthagiri
d2b59cb6e0 get_items API: have qualifiers be a separate parameter instead of assuming kwargs. 2014-08-08 12:38:42 -04:00
Filippo Valsorda
5c455f2a02 Add my name to AUTHORS 2014-08-08 09:14:49 -07:00
Filippo Valsorda
6378c01a47 enforce-type: set the edx/XBlock#200 merge hash 2014-08-08 09:14:10 -07:00
Filippo Valsorda
a9930bf34a Make enforce_type an optional flag, to avoid conflicts 2014-08-08 09:14:10 -07:00
Filippo Valsorda
5edfc479b1 Add xmodule fields enforce_type tests 2014-08-08 09:14:10 -07:00
Filippo Valsorda
0482038756 Enforce type of the XBlocks Fields when set 
This updates the XBlock dependency to edX/XBlock@***
and add the newly introduced enforce_type methods
 2014-08-08 09:14:10 -07:00
Usman Khalid
f9ee21f434 Incomplete course ids should return a 404. 2014-08-08 20:34:44 +05:00
Julia Hansbrough
1d64b50df2 Merge pull request #4743 from edx/flowerhack/fix-upgrade-message 
Basic fix for upgrade text bug
 2014-08-08 11:24:43 -04:00
Anton Stupak
5bf38806f8 Merge pull request #4716 from edx/anton/studio-tooltip-manager 
Studio: Add tooltips.
 2014-08-08 18:04:49 +03:00