Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,680 Commits 1 Branch 0 Tags
76ae57c7ec0021e12750b3f07ca59d9478daa20e
Commit Graph

21680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Antoviaque
76ae57c7ec Update import location of prefer_xmodules 2014-03-06 18:49:39 -04:00
Xavier Antoviaque
62628f6bd2 Only add mentoring application to INSTALLED_APPS when in virtualenv 2014-03-06 18:23:33 -04:00
Han Su Kim
0db4a899f4 Merge branch 'release' 2014-03-06 16:57:06 -05:00
Han Su Kim
bdfd81d2f3 Merge remote-tracking branch 'origin/master' into release, conflicts resolved 
Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt
 2014-03-06 16:56:16 -05:00
Carson Gee
b0af8ff421 Merge pull request #2702 from carsongee/cg/cas_fixes 
Correct misaligned django-cas integration
 2014-03-06 16:17:13 -05:00
Ned Batchelder
07cec31887 Add Han Su Kim to AUTHORS 2014-03-06 15:20:36 -05:00
Ned Batchelder
166748a340 Fix Paul-Olivier Dehaye's AUTHOR entry. 2014-03-06 14:26:45 -05:00
Ned Batchelder
9425974b40 Merge pull request #2837 from ionis-education-group/shopping-cart-unicode-fix 
Fix unicode issue in shopping cart
 2014-03-06 14:16:53 -05:00
Mark Hoeber
f89396fae8 Merge pull request #2799 from edx/markhoeber/documentation/release-notes-3-4-14 
First Draft release notes 3-3-14
 2014-03-06 14:02:11 -05:00
Mark Hoeber
4db9d0c1a4 Merge pull request #2719 from edx/markhoeber/documentation/stud-1314 
External URL change in Files & Upoads
 2014-03-06 13:04:36 -05:00
Mark Hoeber
dd19ac64e1 External URL change in Files & Upoads 
STUD-1314
 2014-03-06 12:58:26 -05:00
Mark Hoeber
72f127de55 Release notes 3-3-14 
DOC-72
 2014-03-06 12:44:37 -05:00
David Adams
028e6a013f Merge pull request #2835 from edx/dcadams/fix_class_dashboard_setting 
Moved CLASS_DASHBOARD setting into the FEATURES dict.
 2014-03-06 09:06:27 -08:00
Sarina Canelake
d1442e7b2a Merge pull request #2839 from edx/sarina/fix-rake-i18n 
Skip generation of 'eo' files in i18n test suite
 2014-03-06 10:30:07 -05:00
Sarina Canelake
fbc76c5c48 i18n tests don't regenerate checked-in eo files 2014-03-06 09:54:01 -05:00
zubair-arbi
06c0aa530a Merge pull request #2803 from edx/zub/bugfix/std1248-handoutlocmapp 
add location of handouts in loc_mapper
 2014-03-06 16:43:15 +05:00
Valera Rozuvan
b4c8e63f9f Merge pull request #2744 from edx/valera/move_slider_and_vcr_to_start_time_2 
Show start time or starting position on slider and VCR
 2014-03-06 13:42:40 +02:00
zubiar-arbi
c17cb38cd9 add location of handouts in loc_mapper 
STUD-1248
 2014-03-06 15:53:45 +05:00
zubair-arbi
01def12de4 Merge pull request #2762 from edx/zub/bugfix/std1336-switcheditors 
properly set tinymce editor startContent
 2014-03-06 15:53:43 +05:00
Bertrand Marron
01c5cd5dc4 Fix unicode issue in shopping cart 
Fails when course name contains non-ascii characters.
 2014-03-06 11:46:53 +01:00
Valera Rozuvan
b85130bb29 Show start time or starting position on slider and VCR. 
When the start time is set, or a initial position is
set,the VCR timer and the time slider should jump to
correct starting point before the video starts playing.

BLD-823
 2014-03-06 12:33:22 +02:00
zubiar-arbi
84a70279f6 properly set tinymce editor startContent 
STUD-1336
 2014-03-06 15:09:04 +05:00
David Adams
dcb169fb37 Moved CLASS_DASHBOARD setting into the FEATURES dict. 2014-03-05 15:47:23 -08:00
Don Mitchell
b44780812c Merge pull request #2738 from edx/dbarch/mixed_ms_router 
Dbarch/mixed ms router
 2014-03-05 17:17:07 -05:00
Alison Hodges
a5d9ed5b04 Merge pull request #2821 from edx/ahodges/documentation/problemcheck 
Added changes for AN-609
 2014-03-05 16:36:19 -05:00
Alison Hodges
293f62a740 Added changes for AN-609 
changes to problem_check to support answer distribution; also provided
an example and nav in the introduction
 2014-03-05 16:28:04 -05:00
David Adams
d821ac77f3 Merge pull request #2737 from edx/dcadams/fix_tinymce 
Fixes tinymce bug:
 2014-03-05 13:20:37 -08:00
Alison Hodges
6689b3f4e4 Merge pull request #2826 from edx/ahodges/documentation.imageconversion 
Converted 104 existing gif files to png format
 2014-03-05 15:52:25 -05:00
cahrens
4ec669c855 Slightly reorder the toolbar buttons so that the image button is more likely to be visible. 
Hopefully we will get a better solution with the TinyMCE upgrade PR.
 2014-03-05 15:44:51 -05:00
Alison Hodges
68d4248a0e Converted 104 existing gif files to png format 2014-03-05 15:24:33 -05:00
Don Mitchell
e915a32aed xblock save only affects draft 
Fix test which caused error
 2014-03-05 14:40:36 -05:00
Don Mitchell
41f5159b37 Test special code paths in create_item 2014-03-05 14:40:35 -05:00
Don Mitchell
71ac844120 Add tests for get_orphans 2014-03-05 14:40:35 -05:00
Don Mitchell
e972b23064 Requesting an xmodule field in wrong app context raises exception rather than assertion 2014-03-05 14:40:35 -05:00
Don Mitchell
563b713a3f Test exception on read-only db 2014-03-05 14:40:35 -05:00
Don Mitchell
aecc037e2d pylint and pep8 fixes 2014-03-05 14:40:35 -05:00
Don Mitchell
fc1ca7b3a2 No longer create loc maps on create_(item|course) 2014-03-05 14:40:35 -05:00
Don Mitchell
dcc6f54409 Change get_courses default branch to draft. 
We need to figure out how apps configure what default they want or ensure they get the one they want
 2014-03-05 14:40:34 -05:00
Don Mitchell
aab5e0441b Mixed modulestore handles most modulestore functions, cont. 2014-03-05 14:40:34 -05:00
Don Mitchell
371ecb08e8 Better sorting of stores for get_courses 
May apply to all store ordering
 2014-03-05 14:40:34 -05:00
Don Mitchell
43df25d42b Point to prefer_xmodules new locn 2014-03-05 14:40:34 -05:00
Don Mitchell
f371c4f5ae Pass user id to update_item 2014-03-05 14:40:34 -05:00
Don Mitchell
c9285de433 unicode correctly and understandably 2014-03-05 14:40:33 -05:00
Don Mitchell
ca0dd8390f Mixed no longer translates 2014-03-05 14:40:33 -05:00
Han Su Kim
d2c147bfc4 Merge pull request #2824 from cpennington/rc-ab-tests 
A/B Test Module
 2014-03-05 14:38:10 -05:00
Don Mitchell
432249e9cf making mixed ms capable of front ending all modulestores for most operations including CRUD 
STUD-600
 2014-03-05 14:32:56 -05:00
David Adams
d45251164e Fixes tinymce bug: 
On using the image plugin, the image was not appearing in the
    visual editor immediately after using the command.

    Selenium test added.
 2014-03-05 11:30:32 -08:00
Christina Roberts
cc8594acd2 Merge pull request #2807 from edx/christina/containers 
Support xblocks with children on the container page.
 2014-03-05 13:57:34 -05:00
Diana Huang
bce7d9e43d Add tests and clean up A/B testing 
Also fixes STUD-1351
 2014-03-05 13:46:03 -05:00
Calen Pennington
2d5c37b2a0 Track renders of split_test children 
[LMS-2098]
 2014-03-05 13:45:08 -05:00