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

2044 Commits

Author SHA1 Message Date
Will Daly
ba00a442d7 Merge pull request #3037 from edx/will/tim-installation-rebase 
Install new ORA (edx-tim)
 2014-03-25 10:59:05 -04:00
Will Daly
440d9ddb89 Install edx-ora2 
Support for displaying submissions API scores in Progress page.
 2014-03-25 09:42:55 -04:00
Alexander Kryklia
de15848e9b Merge pull request #2622 from edx/alex/fix_duplicate_code_in_transcripts_ajax 
Remove duplicate code in transcripts_ajax.
 2014-03-25 10:36:21 +02:00
zubair-arbi
22205c35c8 Merge pull request #2985 from edx/zub/story/deletecoursefromlocmapper 
remove course location from loc_mapper on delete
 2014-03-25 12:44:04 +05:00
Valera Rozuvan
1c8eed853e Moved all YouTube related URLs to a separate namespace. 
All YouTube urls are defined on backend side.
 2014-03-24 18:40:28 +02:00
Andy Armstrong
664f78dcb1 Merge pull request #2657 from edx/christina/tinymce-upgrade 
Upgrade TinyMCE and switch to CodeMirror plugin
 2014-03-24 11:53:17 -04:00
Alexander Kryklia
c9e9f6e6d5 Remove duplicate code in transcripts_ajax. 2014-03-24 17:23:30 +02:00
cahrens
7b24172614 Update tests for minor UI changes. 
Code editor button no longer shows an icon, and code style toolbar button location has moved.
 2014-03-24 10:45:09 -04:00
zubiar-arbi
9d04a9270b remove course location from loc_mapper on delete 2014-03-24 19:26:19 +05:00
Jay Zoldak
a00007b837 Merge pull request #3024 from edx/zoldak/update-se-version 
Update selenium version
 2014-03-22 07:45:02 -04:00
Jay Zoldak
cd81b5aa2b Temporarily disable video autoplay selenium tests 2014-03-21 15:47:24 -04:00
cahrens
a6b18dea80 Fire events before and after the link dialog is shown. 
This allows us to convert the static links.
 2014-03-21 15:39:44 -04:00
cahrens
bb0a58abf7 Code review feedback. 2014-03-21 15:00:31 -04:00
cahrens
b0c35982a6 Change the event handling for image plugin. 
Fixes FireFox bug, and allows us to correct the image path when we show the plugin (as opposed ot only correcting path when we close the plugin).
 2014-03-21 14:49:12 -04:00
cahrens
d623a4e480 Updates from code review. 2014-03-21 14:42:00 -04:00
cahrens
fb6afc708d pep8 2014-03-21 14:42:00 -04:00
cahrens
e1908b5ab2 Fire an event with the link plugin closes so we can rewrite links. 2014-03-21 14:41:59 -04:00
cahrens
09643c8738 Add test for code format toolbar button. 2014-03-21 14:41:59 -04:00
cahrens
07d54be64d Add tests for toolbar buttons and converting links. 2014-03-21 14:41:59 -04:00
cahrens
cc2fec2e1a Allow TinyMCE to create p's, else formatting doesn't work. 2014-03-21 14:41:59 -04:00
cahrens
b1f4d28e46 Test for style block being maintained. 2014-03-21 14:41:58 -04:00
cahrens
f31f936041 Update acceptance test for image plugin. 2014-03-21 14:41:58 -04:00
Nimisha Asthagiri
e86b4a12dc Changes for viewing built-in tabs in studio 
Changed "Status Page" -> "Page".

UX:
    support for displaying built-in tabs
    restored drag and drop on Studio Pages
    additional styling for fixed state on Studio Pages
    add a new page action added to bottom of Studio Pages

Dev
    changes for viewing tabs in studio,
    refactored the tab code,
    decoupled the code from django layer.
    is_hideable flag on tabs
    get_discussion method is needed to continue to support
external_discussion links for now since used by 6.00x course.
    override the __eq__ operator to support comparing with
dict-type tabs.

Test
    moved test code to common,
    added acceptance test for built-in pages
    added additional unit tests for tabs.
    changed test_split_modulestore test to support serializing objects
that are fields in a Course.

Env:
    updated environment configuration settings so they are
    consistent for both cms and lms.
 2014-03-21 13:58:01 -04:00
zubiar-arbi
00bf5e4fce use unicode strings for slug and regex 
STUD-1433
 2014-03-21 15:48:29 +05:00
Jay Zoldak
c5a7911b87 Fix pylint disable pragmas that were pep8 violations 2014-03-20 10:18:40 -04:00
polesye
14b1266e06 Fix flaky acceptance test. 2014-03-19 13:06:10 +02:00
Adam
76566be21b Merge pull request #2939 from edx/zub/story/disableunicodecourseids 
Enable/disable unicodes in course id's
 2014-03-17 12:04:51 -04:00
zubiar-arbi
714da6ab23 Enable/disable unicodes in course id's 2014-03-17 20:24:59 +05:00
Don Mitchell
e13d167045 Merge pull request #2918 from edx/dhm/meld_pretty_factory 
Dhm/meld pretty factory
 2014-03-17 09:44:19 -04:00
Alexander Kryklia
dd20e84c84 Fix donwload subs for non youtube videos and non-en language. 
Check for status in test.
Add test for track url.
Fix test to use cookie.
Use download_track in feature file.
Add new tests for get_transcript.
Add html5 test.
Add content check.
Add tests for available_translations dispatch.
Disable flaky cms test.
Add  w/o english transcript tests.
Add to changelog.
 2014-03-14 18:30:42 +02:00
Christina Roberts
cbbf38b40a Merge pull request #2838 from edx/andya/container-publishing 
Support publishing of nested xblocks
 2014-03-13 12:34:22 -04:00
Alexander Kryklia
e457135ee7 Merge pull request #2931 from edx/alex/allow_uppercase_srt_extension 
Allow uppercase transcripts srt extension.
 2014-03-13 18:27:35 +02:00
cahrens
1453a86122 Minor code cleanup. 2014-03-13 11:57:30 -04:00
Alexander Kryklia
7fe675b1d0 Allow uppercase transcripts srt extension. 2014-03-13 17:06:17 +02:00
Andy Armstrong
58483c0649 Fix split_test xblock so that it can render in Studio 
This change addresses STUD-1403 where split_test modules could not render in Studio.
It changes Studio to pass a new parameter 'runtime-type' of 'studio' when rendering
 an xblock. In split_test, this will then cause all of the children to be rendered,
 rather than just the one that matches the conditional.
 2014-03-12 17:21:04 -04:00
Frances Botsford
089a1db677 adjusted Studio container publishing status message 2014-03-12 16:56:54 -04:00
cahrens
dd22bf49a3 Update tests and minor cleanup. 2014-03-12 16:13:07 -04:00
Andy Armstrong
6d2cd987dc Merge release-2014-03-12 back to master. 
https://edx-wiki.atlassian.net/wiki/display/ENG/Release+Page%3A+2014-03-12
 2014-03-12 16:07:00 -04:00
Andy Armstrong
3bb4be7d95 Add publishing sidebar to container page 2014-03-12 19:33:52 +00:00
Andy Armstrong
ad27107343 Support making drafts of nested xblocks 2014-03-12 19:33:52 +00:00
Don Mitchell
0895e90ab8 Generate split test data via split 2014-03-12 15:15:47 -04:00
Valera Rozuvan
c2de0a1346 Fix typo in Video acceptance test. 2014-03-12 18:50:55 +02:00
Don Mitchell
542b146f2f Split: add schema version and drop pretty_id (was placeholder looking for purpose) 
STUD-1359
 2014-03-12 11:30:44 -04:00
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
Don Mitchell
adb7fbcb4b Merge pull request #2849 from edx/dhm/split_course_id 
Make course_id a required arg to split.create_course
 2014-03-11 10:22:46 -04: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
Don Mitchell
d754791213 Make course_id a required arg to split.create_course 
and remove attempt to make it unique. Instead raise exception on dupe.
STUD-1359
 2014-03-06 17:21:10 -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