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

6365 Commits

Author SHA1 Message Date
Calen Pennington
d2ffca2cf7 Remove unneccesary checks for method existence 2014-08-27 16:00:52 -04:00
Nimisha Asthagiri
af9c9cd573 LMS-11185 Split implementation of revert_to_published 2014-08-27 15:41:14 -04:00
Don Mitchell
ee8fc41b62 compute_publish_state -> has_published_version 
LMS-11213
 2014-08-27 11:48:10 -04:00
Don Mitchell
a0e697235d Merge pull request #4966 from edx/split/html_id 
Update opaque-keys library to use block_id for html_id for new keys.
 2014-08-25 18:06:02 -04:00
Nimisha Asthagiri
e42a3f15db Update opaque-keys library to use block_id for html_id for new keys. 
Catch more places where get_children was giving us version aware references.
LMS-11237
 2014-08-25 17:41:57 -04:00
Jesse Zoldak
b90e947b8d Revert "Update opaque-keys library to use block_id for html_id for new keys." 2014-08-25 17:11:39 -04:00
Piotr Mitros
b166503749 Merge pull request #4889 from edx/danielli/pyfs 
Adds pyfilesystem service from XBlocks to edx-platform
 2014-08-25 16:37:46 -04:00
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
Nimisha Asthagiri
f7efb50ffb Update opaque-keys library to use block_id for html_id for new keys. 
Catch more places where get_children was giving us version aware references.
LMS-11237
 2014-08-25 14:21:49 -04:00
Don Mitchell
0976f8031f Merge pull request #4931 from edx/reruns/check_answer 
Fix check and show answer for split
 2014-08-25 13:10:28 -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
Don Mitchell
4d701bebef Fix check and show answer for split 
LMS-11237
 2014-08-25 10:29:50 -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
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
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
Carson Gee
7dbea40f84 Add missing endif in crystallography mako template 2014-08-21 14:12:09 -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
78879ebc18 Asset urls must start w/ slash 
LMS-11233
 2014-08-21 12:11:27 -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
Jonathan Piacenti
8918217df2 path_to_location now returns 404 on orphaned items. Resolves LMS-9661. 2014-08-20 13:12:47 +00:00
swdanielli
9d55cf3637 code clean 2014-08-19 15:29:34 -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
swdanielli
ff4c2c17c2 add pyfs service 2014-08-19 10:23:47 -04:00
Don Mitchell
3c3a316f08 Make it branch agnostic 
LMS-11210

Conflicts:
	common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py
 2014-08-18 16:19:46 -04:00
Don Mitchell
23d78fe7fc Merge pull request #4803 from edx/dhm/import_split_test 
Dhm/import split test
 2014-08-15 17:23:33 -04:00
Don Mitchell
3b43f34b20 XML export maps keys into xml expected format 2014-08-15 16:02:48 -04:00
Alexander Kryklia
ccf85a9431 Merge pull request #4777 from edx/anton/sync-groups-and-verticals 
Anton/sync groups and verticals
 2014-08-15 20:15:12 +03:00
Christina Roberts
33815f1cc5 Merge pull request #4853 from edx/christina/stud-2093 
Add a request-token to identify which xblock html was rendered as part o...
 2014-08-15 12:55:34 -04:00
polesye
867a5c051f Sync children vertical names with group names in split test module. 2014-08-15 19:34:55 +03:00
Will Daly
3cd4610b5a Merge pull request #4824 from edx/will/auto-register 
Auto enroll students even if there are multiple course modes
 2014-08-15 11:11:19 -04:00
Calen Pennington
50082387eb Add a request-token to identify which xblock html was rendered as part of the current request 
[STUD-2903]
 2014-08-15 11:04:52 -04:00
Jesse Zoldak
4d5b948928 Merge pull request #4748 from Stanford-Online/jbau/parallel-unit-tests 
make unit tests respect mongo port/host settings (with default)
 2014-08-15 10:56:52 -04:00
Will Daly
714f9bb69f Auto enroll students even if there are multiple course modes 
Add session middleware to an external auth test to fix a test failure with the auto-registration AB-test changes
 2014-08-15 10:26:27 -04:00
Sarina Canelake
f3a0327541 Merge pull request #4841 from edx/sarina/minor-i18n-fixes 
Minor i18n fixes prompted by translators
 2014-08-14 18:03:54 -04:00
Sarina Canelake
19ca6c845c Minor i18n fixes prompted by translators 2014-08-14 14:58:26 -04:00
Oleg Marshev
a94e942480 BLD-1125: Validation of content experiments after managing a group. 2014-08-14 16:34:21 +02:00
lduarte1991
5c859c7128 Annotation Tools: Adding Annotator to CMS 2014-08-13 21:35:37 -04:00
Don Mitchell
aa1b9fece9 Properly (de)serialize references in old mongo 
LMS-11204
 2014-08-13 11:26:12 -04:00
Don Mitchell
5789b98b63 Merge pull request #4759 from edx/dhm/key_munging 
Remove hardcoding of key syntax for base url
 2014-08-13 09:36:08 -04:00
Jesse Zoldak
2edf1aef31 Merge pull request #4798 from edx/zoldak/rmtree-cleanup 
Ignore errors on rmtree cleanup
 2014-08-12 17:05:20 -04:00
cahrens
ee836d4c40 Merge branch 'release' from 2014-08-12 release. 2014-08-12 13:51:58 -04:00