Commit Graph

9087 Commits

Author SHA1 Message Date
swdanielli
cba117d547 Merge branch 'danielli/pyfs' of https://github.com/edx/edx-platform into danielli/pyfs 2014-08-25 15:40:06 -04:00
swdanielli
a7d78e755d fix test case for pyfs 2014-08-25 15:38:35 -04:00
swdanielli
8378422f3d code clean 2014-08-25 12:25:03 -04:00
swdanielli
504a7a21ba add pyfs service 2014-08-25 12:25:03 -04:00
jmclaus
15cbd1944c Merge pull request #4745 from stvstnfrd/circuit/clean
Remove JavaScript variables from global namespace
2014-08-25 11:56:28 -04:00
Don Mitchell
ad8ece5134 Split get_block uses the passed in id rather than constructed
on returned block so that branch/version awareness is inherited.
LMS-11263
2014-08-25 10:30:40 -04:00
Nimisha Asthagiri
5c6a846784 Merge pull request #4936 from edx/benmcmorran/bokchoy-course-reruns
Add bokchoy tests for course reruns
2014-08-22 19:05:07 -04:00
stv
1aeadcda97 Avoid use of Array/Object constructors
Array and Object constructors, as opposed to their literal values ('[]'
and '{}'), incur additional overhead and are less effectively optimized
by the compiler.
2014-08-22 15:25:25 -07:00
stv
2f0a51b479 Remove superfluous whitespace and comments 2014-08-22 15:25:15 -07:00
stv
b858d846da Unpollute JavaScript global namespace
As these variables were being assigned without being explicitly
declared, they were implicitly added to the global namespace.

This commit removes 59 variables from the global namespace.
2014-08-22 15:24:57 -07:00
Ben McMorran
098c1d59cd Add bokchoy tests for course reruns 2014-08-22 17:41:41 -04:00
Alexander Kryklia
095b07275e Unflag Group Configurations, Render only existing children in staff view of split_test. 2014-08-22 16:43:54 -04:00
Ben McMorran
e8fd9c08c1 Merge pull request #4934 from edx/benmcmorran/course-settings-error
Fix error when changing course details on split
2014-08-22 14:47:15 -04:00
Ben McMorran
e933c9fe18 Fix error when changing course details on split 2014-08-22 10:22:57 -04:00
Sarina Canelake
9b1301df05 Merge pull request #4927 from mitocw/cg/add_missing_endif
Add missing endif in crystallography mako template
2014-08-22 09:20:46 -04:00
muhammad-ammar
4815adb641 Merge pull request #4869 from edx/ammar/bok-choy-video-transcript-tests-batch2
Bok-Choy Video Transcript Tests Batch 2
2014-08-22 15:39:27 +05:00
Muhammad Ammar
75a0d52472 Bok-Choy Video Transcript Tests Batch 2 2014-08-22 07:28:48 +00:00
Waheed Ahmed
f686e7d0b9 Passed cls=EdxJSONEncoder on json.dumps to fix save, edit and import.
STUD-2096
2014-08-22 12:23:46 +05:00
Andy Armstrong
3ac3a3152a Merge pull request #4913 from edx/andya/handle-component-errors
Fix Studio to gracefully handle xblock JavaScript errors
2014-08-21 18:20:16 -04:00
Andy Armstrong
d451c3e91d Fix Studio to gracefully handle xblock JavaScript errors
TNL-46

I've changed Studio to catch JavaScript errors when rendering xblocks, log the error, but to then continue as normal. This means that the user is still able to interact with the xblock to delete, duplicate etc. This seems reasonable as the xblock is only rendered as a WYSIWYG representation so if it isn't fully interactive that shouldn't be a big problem.
2014-08-21 17:31:19 -04:00
Ben McMorran
30fc0441d1 Merge pull request #4782 from edx/reruns/ui
Reruns/ui
2014-08-21 16:57:00 -04:00
Renzo Lucioni
fa2154a694 Merge pull request #4893 from edx/web-analytics/pass-ga-cookie
Re-use GA cookie when sending server-side events to Segment.io
2014-08-21 16:28:06 -04:00
Carson Gee
7dbea40f84 Add missing endif in crystallography mako template 2014-08-21 14:12:09 -04:00
Ben McMorran
883aedb51b Add blank=True to rerun state display name 2014-08-21 12:11:29 -04:00
Don Mitchell
85f5c49bb7 Unit tests for rerun
along w/ fixes to make them work
LMS-11011
2014-08-21 12:11:29 -04:00
Don Mitchell
24cdd7a481 Assume any non-xml modulestore is r/w
LMS-11235
2014-08-21 12:11:27 -04:00
Don Mitchell
78879ebc18 Asset urls must start w/ slash
LMS-11233
2014-08-21 12:11:27 -04:00
Ben McMorran
2839ad8711 PR cleanup 2014-08-21 12:11:26 -04:00
Mathew Peterson
9f8f64cffe Course Reruns UI
Studio: adding course re-run-centric static template rendering

* initial HTML for dashboard states
* initial HTML for new course re-run view/form
* initial HTML placeholder for outline alert UI

Conflicts:
	cms/templates/index.html

Studio: adding styling for course re-run-centric views

* adding new view/page mast-wizard type
* refactoring create course/element form styling
* adding course re-run view specific styling
* adding courses processing styling (w/ alerts and status)

Course rerun server-side updates: support display_name and DuplicateCourseError.

Studio: further design revisions and tweaks from feedback

* removing new window attribute from re-run control
* removing links from processing courses
* revising look/feel of dismiss action on dashboard + alert
* correcting font-weight of dashboard processing title
* adding extra space to course rerun action on dashboard
* re-wording secondary cancel action on rerun view

Conflicts:
	cms/templates/index.html

Added interation on unsucceeded courses in dashboard

Studio: removing 'rel=external' property from course re-run actions

Studio: removing hover styles for processing courses

Fixed value bug in split and set course listing to display run

moved task.py for rerun
2014-08-21 12:09:12 -04:00
Tim Babych
a986b46cb1 Merge pull request #4750 from edx/anton/publish-unit-from-course-outline
Publish sections/subsections/units from course outline.
2014-08-21 18:19:14 +03:00
Renzo Lucioni
79461722de Re-use GA cookie when sending server-side events to Segment.io 2014-08-21 10:47:35 -04:00
polesye
732bcbdeb6 STUD-1911, STUD-1932: Publish sections, subsections and units from course outline. 2014-08-21 17:34:06 +03:00
Christina Roberts
420ae2da1e Merge pull request #4857 from edx/christina/stud-2093
Add bok choy tests for bad HTML module content.
2014-08-21 09:48:24 -04:00
muhammad-ammar
06842be865 Merge pull request #4859 from edx/ammar/bok-choy-video-transcript-tests
Bok-Choy Video Transcript Tests Batch1
2014-08-21 12:01:04 +05:00
cahrens
49f4d1ee9f Disable JS error test until Andy's PR. 2014-08-20 15:54:48 -04:00
Brian Talbot
d808b742e5 Studio: revising %cont-text-sr Sass placeholder based on modern browser support 2014-08-20 14:48:37 -04:00
Adam
6a9753239d Merge pull request #4896 from Kelketek/fix_path_to_location
path_to_location now returns 404 on orphaned items. Resolves LMS-9661.
2014-08-20 13:23:30 -04:00
Ben Patterson
ea967148ed Merge pull request #4860 from edx/benp/lint-cleanup
pep8 improvements on bok-choy tests.
2014-08-20 10:08:38 -04:00
Jonathan Piacenti
8918217df2 path_to_location now returns 404 on orphaned items. Resolves LMS-9661. 2014-08-20 13:12:47 +00:00
Ben Patterson
4343a953a3 pep8 improvement on bok-choy page class. 2014-08-20 09:05:30 -04:00
Ben Patterson
a18660cabd pep8 improvements on bok-choy tests. 2014-08-20 09:05:30 -04:00
Muhammad Ammar
cfeb7102a6 Bok-Choy Video Transcript Tests 2014-08-20 12:11:21 +00:00
Waqas Khalid
01aa38fb82 Truncated markup can be displayed in forums user profile view
FOR-581
2014-08-20 14:33:23 +05:00
muhammad-ammar
ca3bd2f83f Merge pull request #4496 from edx/ammar/bok-choy-cms-video-editor-tests
Bok-Choy CMS Video Editor Tests
2014-08-20 13:19:10 +05:00
swdanielli
9d55cf3637 code clean 2014-08-19 15:29:34 -04:00
David Baumgold
b4d14a566e Merge pull request #4892 from edx/db/marcnu-quality
Cleaning up a few quality violations
2014-08-19 14:42:40 -04:00
Sarina Canelake
46051ef212 Merge pull request #3495 from eduNEXT/feature/fmo/theme-microsite-support
Microsites alongside Theme
2014-08-19 12:39:21 -04:00
David Baumgold
fb0ee690f2 Cleaning up a few quality violations 2014-08-19 11:49:43 -04:00
David Baumgold
7bb2535df2 Merge pull request #4649 from MarCnu/contentstore-streaming-range
Contentstore streaming range
2014-08-19 11:46:40 -04:00
MarCnu
77f7f26933 Add HTTP_RANGE compatibility for ContentStore file streaming
Currently, users can only download ContentStore files from first byte to
last byte.

With this change, when a request to the ContentStore includes the HTTP
"Range" parameter, it is parsed and StaticContentStream will stream the
requested bytes.

This change makes possible to stream video files (.mp4 especially) from
the ContentStore. Users can now seek a specific time in the video
without loading all the file.

This is useful for courses with a limited number of students that
doesn't require a dedicated video server.
2014-08-19 16:46:31 +02:00