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

1999 Commits

Author SHA1 Message Date
Usman Khalid
cb2243a495 Do not remap the wiki_slug if reimporting into the same course. 
LMS-2136
 2014-03-11 20:47:21 +05:00
Usman Khalid
8f3cfa5a5f When creating a course in studio set a unique wiki_slug for it. 
Currently wiki_slug is set to course number. However, since multiple
courses can have the same number this may lead to clashes. So wiki_slug
will be set to org.course.name. To maintain the active wiki_slugs for
xml courses this cannot be changed in the CourseDescriptor.

LMS-2136
 2014-03-10 16:13:18 +05:00
Andy Armstrong
2c9585ea5d Merge pull request #2811 from edx/andya/container-unit-tests 
Add more tests for the container page
 2014-03-07 11:31:41 -05: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
zubiar-arbi
c17cb38cd9 add location of handouts in loc_mapper 
STUD-1248
 2014-03-06 15:53:45 +05:00
Andy Armstrong
bc12869a00 Add more tests for the container page 2014-03-05 17:41:10 -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
David Adams
d821ac77f3 Merge pull request #2737 from edx/dcadams/fix_tinymce 
Fixes tinymce bug:
 2014-03-05 13:20:37 -08:00
Don Mitchell
e915a32aed xblock save only affects draft 
Fix test which caused error
 2014-03-05 14:40:36 -05:00
Don Mitchell
f371c4f5ae Pass user id to update_item 2014-03-05 14:40:34 -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
Diana Huang
bce7d9e43d Add tests and clean up A/B testing 
Also fixes STUD-1351
 2014-03-05 13:46:03 -05:00
cahrens
653df428f1 Improve code clarity. 2014-03-05 12:59:09 -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
cahrens
0dbabc7ad8 Support xblocks with children on the container page. 
STUD-1363
 2014-03-04 17:11:01 -05:00
Carson Gee
4099fc9af0 Correct misaligned django-cas integration 2014-03-04 09:35:08 -05: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
Chris Dodge
aa43689a93 This PR addresses the open feedback on the Microsites feature 2014-02-28 16:27:12 -05:00
Dave St.Germain
08fadac817 Upgrade CodeMirror to 3.21.0 (with accessibility changes from 
http://bgrins.github.io/codemirror-accessible/)
LMS-1802
 2014-02-28 13:44:34 -05:00
Andy Armstrong
fcc0231d4d Add new container page that can display nested xblocks 
This is the changes for STUD-1244, which introduces the ability for Studio to display
arbitrarily nested xblocks. In this change, a new container page is introduced which can
display nested xblocks. In particular, the xblock type of 'vertical' is special cased
to be shown inline as a collapsible section. The unit page is mostly unchanged, except
that container xblock's are shown as a link to their container page, rather than being
shown inline.
 2014-02-27 14:53:05 -05:00
Will Daly
fbd2e3a0bc Merge pull request #2724 from edx/will/studio-xblock-save 
Native XBlock Studio Save UI
 2014-02-27 10:50:51 -05:00
Will Daly
5f09953125 Hide save/cancel buttons for native XBlocks in Studio 
Add Studio client-side runtime notifications for saving/cancelling XBlock edits.
 2014-02-26 16:17:02 -05:00
Dave St.Germain
ce596919b4 Merge pull request #2734 from edx/dcs/a11y-course-update-delist 
Tweaks course update html to avoid using list tags inappropriately.
LMS-1724
 2014-02-26 14:01:07 -05:00
Dave St.Germain
da275eae11 Tweaks course update html to avoid using list tags inappropriately. 
LMS-1724
 2014-02-26 13:28:00 -05:00
Giulio Gratta
51632a9f0a Merge pull request #2579 from edx/giulio/studio-file-urls 
Internal/External Studio file URLs
 2014-02-26 09:32:59 -08:00
zubair-arbi
2cb3cc3621 Merge pull request #2238 from zubair-arbi/zub/bugfix/std154-courseinfohtml 
update course info module to save content without modifying
 2014-02-26 21:34:10 +05:00
cahrens
8db7b0ce21 Add test for external_url being passed to assets page. 2014-02-26 09:26:50 -05:00
zubair-arbi
7ee08eae52 Merge pull request #2688 from edx/zub/bugfix/std1294-importexportcruft 
Empty course temp folder after exporting course (export_handler)
 2014-02-26 17:53:44 +05:00
zubiar-arbi
619c144c11 Empty course temp folder after exporting course (export_handler) 
STUD-1294
 2014-02-26 15:52:48 +05:00
zubiar-arbi
cf47b6b670 assign default forum role 'Student' to user on course recreate with same name STUD-1140 
STUD-1140
 2014-02-26 15:40:44 +05:00
zubiar-arbi
cfa6b14575 update course info module to save content in new 'items' field + update import/export to handle content field other than 'data' or 'metadata' 
STUD-154
 2014-02-26 13:11:59 +05:00
Calen Pennington
a2137cec35 Merge pull request #2603 from cpennington/xblock-acid-resources-test 
Add tests of local_resource_url
 2014-02-25 16:46:10 -05:00
Calen Pennington
9126777ed7 Add test of local_resource_url in AcidBlock 2014-02-25 14:01:37 -05:00
Alexander Kryklia
25407ef3e7 BLD-642: Allow multiple transcripts with video. 2014-02-24 21:57:08 +02:00
Giulio Gratta
3ffb6715e5 Internal/External Studio file URLs 
- Changed link URL of file name to use public/LMS url
- Added toggle link to display all public URLs for instructor convenience
 2014-02-24 11:54:09 -08:00
Don Mitchell
0b262e7cea Merge pull request #2660 from edx/dbarch/parse_course_id 
Dbarch/parse course
 2014-02-24 13:24:00 -05:00
Don Mitchell
81a92e4bfc Consolidate course_id triple parsing 2014-02-24 11:45:59 -05:00
Jay Zoldak
e4b6fe2c68 Merge pull request #2695 from edx/will/revert-paver-again 
Revert "Fix sys.path manipulation in pavement.py, with detailed comment"
 2014-02-24 11:31:26 -05:00
Will Daly
812e71bbbb Revert "Fix sys.path manipulation in pavement.py, with detailed comment" 
This reverts commit 544616be4b.
 2014-02-24 11:30:40 -05:00
Ned Batchelder
6bb0eee3c6 Make the i18n service available everywhere. 
To get all dates localized, we need all runtimes to have the i18n
service, and since runtimes are made by the modulestores, we need to
pass it to them.

Soon (fingers crossed), modulestores won't be involved in making
runtimes, and many of these changes will go away.
 2014-02-24 10:06:13 -05:00
zubair-arbi
b7c557ff15 Merge pull request #2621 from edx/zub/bugfix/std1248-postrequestupdatelocmapp 
add course updates location to loc_mapper on accessing course_info_updat...
 2014-02-24 19:40:27 +05:00
Will Daly
38d403f6c9 Merge pull request #2615 from edx/will/paver-attempt-2 
Paver (Part 1) -- Attempt 2
 2014-02-24 07:51:05 -05:00
zubiar-arbi
6b3c5e7d60 get updates_location from course_location directly + update tests 
STUD-1248
 2014-02-24 12:56:09 +05:00
zubiar-arbi
62a32cda21 add course updates location to loc_mapper on accessing course_info_update_handler 
STUD-1248
 2014-02-24 12:56:09 +05:00
Calen Pennington
dbc99ef8ad Implement children for pure XBlocks in edx-platform 
This requires fixing the javascript api implementation, and adding
an implementation of get_block to the ModuleSystem api.

However, the implementation is incomplete, due to mismatches between
the expectations of XModule and XBlock.

Also adds tests using the Acid block to make sure that the javascript
and python apis for children are working correctly.
 2014-02-21 15:01:20 -05:00