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

4456 Commits

Author SHA1 Message Date
Mark Hoeber
982f24aed1 Merge pull request #3026 from edx/markhoeber/documentation/STUD-1458 
Update to page help on new Pages page in Studio
 2014-03-23 12:38:20 -04: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
Mark Hoeber
d752894604 Update to page help on new Pages page in Studio 
STUD-1458

Modified the edit-tabs template and the preview-lms-staticpages image
used in the modal.
 2014-03-21 16:33:26 -04:00
Jay Zoldak
cd81b5aa2b Temporarily disable video autoplay selenium tests 2014-03-21 15:47:24 -04:00
Nimisha Asthagiri
3bcf619f0d Merge pull request #2910 from edx/frances/feature/studio-nav-manipulation2 
Frances/feature/studio nav manipulation2
 2014-03-21 15:13:22 -04:00
Carson Gee
767feb9396 Merge pull request #2948 from carsongee/cg/cas_attribute_callback 
Adding ability to give an attribute callback for CAS
 2014-03-21 14:26:49 -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
Frances Botsford
91c0b8ee86 UX changes for course navigation manipulation 2014-03-21 13:18:31 -04:00
frances botsford
32ea61857d Merge pull request #3007 from edx/frances/feature/ui-loading 
added loading pattern to studio
 2014-03-21 10:15:11 -04:00
zubiar-arbi
00bf5e4fce use unicode strings for slug and regex 
STUD-1433
 2014-03-21 15:48:29 +05:00
Jay Zoldak
b695bceeeb Merge pull request #2997 from edx/zoldak/fix-pragma-pep8 
Fix pylint disable pragmas that were pep8 violations
 2014-03-20 13:56:00 -04:00
Jay Zoldak
c5a7911b87 Fix pylint disable pragmas that were pep8 violations 2014-03-20 10:18:40 -04:00
polesye
790d359b89 BLD-581: add highlighting of entire field on focus. 2014-03-20 13:40:11 +02:00
polesye
14b1266e06 Fix flaky acceptance test. 2014-03-19 13:06:10 +02:00
Frances Botsford
d685baf478 added loading pattern to studio 2014-03-18 17:11:51 -04: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
Carson Gee
ccbb909b0d Adding ability to give an attribute callback for CAS 2014-03-14 13:22:14 -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
5166461c62 Don't translate reference code. 2014-03-13 11:58:26 -04:00
cahrens
496a6b8be6 Improve text referencing link for translators. 2014-03-13 11:58:08 -04: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
Frances Botsford
b59d7ba9ec first stab at publishing status for the 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
Will Daly
acea6c83fa Merge pull request #2891 from edx/will/allow-advanced-components-local-dev 
Enable advanced components by default in devstack
 2014-03-12 09:56:28 -04:00
Andy Armstrong
750640b6f0 Merge pull request #2902 from edx/usman/lms2136-wiki-slug-renamespacing-fix 
Do not remap the wiki_slug if reimporting into the same course.
 2014-03-11 13:08:03 -04:00
marco
2f2ce555c1 adjusted visual styling for editing state of xblocks, html, and video components which had extra padding applied to it from the container page xblock styling 
STUD-1410
 2014-03-11 12:00:17 -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
Dave St.Germain
be239bdbca remove old version of codemirror, to prevent confusion 2014-03-11 09:31:29 -04:00
Waheed Ahmed
f16efbb285 Don't close modal on click outside new course update modal. 
STUD-1404
 2014-03-11 17:53:27 +05:00
Will Daly
12d32489fe Enable advanced components by default in devstack 2014-03-10 18:52:03 -04:00
Dave St.Germain
cc76690db7 Merge pull request #2874 from edx/dcs/remove-old-codemirror 
remove old version of codemirror css, to prevent confusion
 2014-03-10 17:13:16 -04:00
marco
f50e58ad7f adjusted visual styling for editing state of xblocks, html, and video components which had extra padding applied to it from the container page xblock styling 
STUD-1410
 2014-03-10 16:39:46 -04:00
Dave St.Germain
aaf4515ac3 remove old version of codemirror, to prevent confusion 2014-03-10 09:43:56 -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
Han Su Kim
f42d42d1f8 Merge branch 'master' into release 
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
 2014-03-07 14:39:09 -05:00
jmclaus
3a740c0479 BLD-844: Add possibility to download transcripts in different formats. 2014-03-07 19:22:22 +01:00