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

21640 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zubiar-arbi
c17cb38cd9 add location of handouts in loc_mapper 
STUD-1248
 2014-03-06 15:53:45 +05: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
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
cahrens
653df428f1 Improve code clarity. 2014-03-05 12:59:09 -05:00
cahrens
9b2a78b12d Increase max-width for breadcrumb trail. 2014-03-05 12:06:37 -05:00
cahrens
efe3833a30 Use display_name_with_default instead of display_name. 2014-03-05 12:01:24 -05:00
Mark Hoeber
edafb7c09a Merge pull request #2800 from edx/ahodges/documentation/reformatevents 
Reformatted event type info to get it out of wide tables
 2014-03-05 11:04:55 -05:00
Alison Hodges
cefb47669a Reformatted event type info to get it out of wide tables 2014-03-05 11:02:50 -05:00
Jay Zoldak
ad714a1435 Merge pull request #2517 from ionis-education-group/remove-video-autoplay 
Remove autoplay for video in course about page
 2014-03-05 10:19:52 -05:00
Alexander Kryklia
6772faa0a5 Merge pull request #2796 from edx/alex/no_default_subs_en 
Catch exception if for en no default subs is uploaded.
 2014-03-05 16:49:54 +02:00
Ned Batchelder
f5eb5286a2 Merge pull request #2802 from ionis-education-group/gender-education-translation 
Translate gender and education level from user profile
 2014-03-05 07:35:54 -05:00
cahrens
0dbabc7ad8 Support xblocks with children on the container page. 
STUD-1363
 2014-03-04 17:11:01 -05:00
John Jarvis
40fbbdf1e4 Merge pull request #2804 from edx/jarv/update-jsdraw-commit 
updating commit
 2014-03-04 16:49:38 -05:00
Jay Zoldak
469bf774b0 Merge pull request #2809 from edx/zoldak/bok-choy-coverage 
Create coverage reports for bok choy tests in Jenkins
 2014-03-04 16:42:36 -05:00
Jay Zoldak
810883c1ef Create coverage reports for bok choy tests in Jenkins 2014-03-04 15:36:03 -05:00
Bertrand Marron
10688f99f4 Add translator comments for 'other' and 'none' strings 2014-03-04 16:40:27 +01:00
Dave St.Germain
92411bd291 Merge pull request #2754 from edx/dcs/a11y-shorter-titles 
Display only the first component name in the page (and nav) title.
 2014-03-04 10:05:52 -05:00
John Jarvis
04ff0b4fe2 updating commit 2014-03-04 09:04:51 -05:00
Alexander Kryklia
ccb776e928 Catch exception if for en no default subs is uploaded. 2014-03-04 15:41:46 +02:00
Will Daly
a6d0c78d3f Merge pull request #2785 from edx/will/studio-oa-validation-fix 
Studio OA validation dialog
 2014-03-04 08:00:42 -05:00
Bertrand Marron
6cb458b46a Translate gender and education level from user profile 2014-03-04 11:22:32 +01:00
Dave St.Germain
601b5a8ceb Merge pull request #2518 from edx/dcs/a11y-code-grader 
Upgrade CodeMirror to 3.21.0
 2014-03-03 17:57:46 -05:00
Greg Price
1d2175dce0 Merge pull request #2774 from edx/gprice/edit-forum-comment-bok-choy 
Add bok choy tests for forum comment editing
 2014-03-03 15:37:05 -05:00
Jason Bau
35a3ebd92f Merge pull request #2761 from edx/jbau/add-userid-to-FieldDataCache 
Move FieldDataCache assert to check both get and get_or_create
 2014-03-03 12:08:09 -08:00
Greg Price
db8ad0d20b Add bok choy tests for forum comment editing 2014-03-03 14:26:25 -05:00
Mark Hoeber
61bf75bb16 Merge pull request #2788 from edx/sylvia/documentation/DOC-65 
Corrected info about angle brackets in labels
 2014-03-03 14:26:10 -05:00
Sylvia Pearce
42f4f948c3 Corrected info about angle brackets in labels 2014-03-03 14:25:09 -05:00
Mark Hoeber
b44d902594 Merge pull request #2787 from edx/markhoeber/documentation/stud-1332 
Removed all Push mode information
 2014-03-03 13:24:43 -05:00