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

9112 Commits

Author SHA1 Message Date
jmclaus
21c4cc73a9 Merge pull request #4919 from edx/jmclaus/serving_fonts_through_platform 
Serving Fonts through Platform Assets
 2014-08-27 11:38:54 -04:00
Will Daly
a03baee25c Merge pull request #4976 from edx/will/ecom-128 
Embargo based on country code in the user's profile.
 2014-08-27 11:24:26 -04:00
jmclaus
037abb6d50 Replace reference to Google OpenSans with edX-hosted OpenSans 2014-08-27 10:34:53 -04:00
Will Daly
31a6566110 Embargo based on country code in the user's profile. 2014-08-27 08:51:45 -04:00
Andy Armstrong
d00bf940ae Merge pull request #4941 from edx/zub/story/tnl56-dragdropintocollapsedunittests 
add tests for drag and drop unit into collapsed subsection on course out...
 2014-08-26 19:13:26 -04:00
Andy Armstrong
890e25f416 Merge pull request #4454 from Stanford-Online/sjang92/advanced_settings_feedback 
Sjang92/advanced settings feedback
 2014-08-26 19:08:39 -04:00
Se Won Jang
11d260910f Implemented Validation for Course Advanced Setting 
This commit adds validation for course advanced settings. Currently when course
administrators make invalid changes in the Settings/Advanced Settings tab,
they're not notified through a new modal window of the list of invalid settings
changes.

* Extending CourseMetadata
    - Previously, we only had update_from_json method in CourseMetadata.py,
      and it was only validating one field every POST request.
    - Now we have validate_and_update_from_json method that encapsulates the
      functionality of update_from_json into a validation call
    - To avoid discrepancy of validation standards between modules, validation
      uses the from_json method implemented to each field in xblock.

* Different Response in advanced settings ajax requests
    - After receiving a POST ajax request, course.py calls
      validate_and_update_from_json, and sends a json object of either:
        1) valid course metadata model
        2) error objects

* Error Messages shown in validation-error-modal
    - error objects passed through ajax are shown in a separate modal.
 2014-08-26 11:24:38 -07:00
Don Mitchell
709012e361 Merge pull request #4965 from edx/split/lms_bugs 
Split/lms bugs
 2014-08-26 13:23:25 -04:00
Tim Babych
f347847755 Merge pull request #4973 from edx/tim/single-group-is-ok 
Update test_group_configuration_validation on single group allowed
 2014-08-26 17:29:37 +03:00
Diana Huang
3d50f4c3a7 Merge pull request #4959 from edx/diana/set-cur-lang 
Make sure that the currently-set language is the one that shows on the left sidebar if no language  preference exists.
 2014-08-26 09:43:09 -04:00
Tim Babych
df9f80ffaf Add test for at least one group before saving a group configuration 2014-08-26 16:24:01 +03:00
zubair-arbi
2ce1540a9d update/cleanup code + move verify_ordering and drag method to studio utils 2014-08-26 18:19:24 +05:00
zubair-arbi
b6a2330631 add tests for drag and drop unit into collapsed subsection on course outline page 2014-08-26 18:19:23 +05:00
polesye
5495329aab BLD-1226: enable 'delete_inactive_group' test. 2014-08-26 11:44:10 +03:00
Don Mitchell
49ed732824 JS regex's need to escape special chars 
LMS-11260
 2014-08-25 18:07:37 -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
Diana Huang
ff4fc7956e Make sure that the currently-set language is the 
one that shows on the left sidebar if no language
preference exists.

ECOM-135
 2014-08-25 17:12:29 -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
Stephen Sanchez
dd50b9d009 Merge pull request #4855 from edx/sanchez/update-platform-footer 
Updating the footer for edx.org and open edx.
 2014-08-25 12:47:37 -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
Stephen Sanchez
9ee15bf007 Updating the footer for edx.org and open edx. 
Move the open edx logo inside the div

Adding a bunch of placeholder views.

indenting.

Making some styles work against LMS sass.

Adding back the old edx footer and associated icons, with a feature flag.
 2014-08-25 15:33:43 +00: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
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