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

5166 Commits

Author SHA1 Message Date
Don Mitchell
d935c778f9 Merge pull request #4980 from edx/split/compute_publish_state 
compute_publish_state -> has_published_version
 2014-08-27 13:01:38 -04:00
Don Mitchell
ee8fc41b62 compute_publish_state -> has_published_version 
LMS-11213
 2014-08-27 11:48:10 -04:00
Nimisha Asthagiri
dfe23f9c68 Merge pull request #4991 from edx/split/spell-dismiss 
LMS-11298 Course reruns spelling correction
 2014-08-27 11:39:33 -04:00
jmclaus
037abb6d50 Replace reference to Google OpenSans with edX-hosted OpenSans 2014-08-27 10:34:53 -04:00
Nimisha Asthagiri
4081f48885 LMS-11298 Course reruns spelling correction 2014-08-27 10:26:30 -04:00
Don Mitchell
12e2d442e9 Merge pull request #4981 from edx/bug/djpyfs 
Fixup of Bug/djpyfs
 2014-08-27 08:01:53 -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
Don Mitchell
a13ad0f43f Fixup of Bug/djpyfs 2014-08-26 15:59:34 -04:00
Don Mitchell
9c946f2245 djpyfs is installed app not middleware 2014-08-26 14:38:55 -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
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
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
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
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
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
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
b875a42971 Merge pull request #4938 from edx/benmcmorran/reword-rerun-note 
Reword course rerun notification
 2014-08-22 16:07:04 -04:00
Sarina Canelake
657610dd73 Merge pull request #4944 from edx/sarina/make-studio-reg-copy-match 
Make Studio and LMS register pages use the same language
 2014-08-22 15:29:28 -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
Sarina Canelake
e57a1551c3 Make Studio and LMS register pages use the same language 2014-08-22 14:23:07 -04:00
Christina Roberts
85ede381c5 Merge pull request #4923 from edx/zub/bugfix/tnl56-dragdropintocollapsedunit 
populate children of unit collapsed drop location
 2014-08-22 13:03:37 -04:00
Ben McMorran
9cb87cfd61 Reword course rerun notification 2014-08-22 11:35:03 -04:00
cahrens
4946d601d2 Verify children are rendered before allowing drop into collapsed parent. 
TNL-56
 2014-08-22 11:20:13 -04:00
Ben McMorran
e933c9fe18 Fix error when changing course details on split 2014-08-22 10:22:57 -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
Oleg Marshev
7506a479c6 Allow one group in a group configuration. 2014-08-22 11:52:35 +03: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
Ben McMorran
62643a5941 Fix broken rerun test 2014-08-21 15:43:22 -04:00
Ben McMorran
d38bd2ea95 Reword rerun notification 2014-08-21 14:11:43 -04:00
Brian Talbot
b69aa64c0e Merge pull request #4904 from edx/talbs/studio-fix-font-weight 
Studio: FIX - Font Weights
 2014-08-21 13:53:24 -04:00
Ben McMorran
ff525bea96 Fix field serialization 2014-08-21 12:11:30 -04:00
Ben McMorran
bb90c30767 Make refresh clickable while courses are processing 2014-08-21 12:11:30 -04:00
Ben McMorran
b6d9ef3ed7 More PEP8/pylint cleanup 2014-08-21 12:11:29 -04:00
Don Mitchell
3b6b4668dd On rerun, override the course start date 
LMS-11011
 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
Ben McMorran
4bc672b93d Fix broken unicode char in CSS 2014-08-21 12:11:29 -04:00
Ben McMorran
de52f82352 PEP8/pylint cleanup 2014-08-21 12:11:28 -04:00
Ben McMorran
ab3a8c96d3 Add test for failed course creation 2014-08-21 12:11:28 -04:00
Ben McMorran
4e41a42c76 Rename unsucceeded to in_process 2014-08-21 12:11:28 -04:00
Ben McMorran
d943204199 Fix i18n on course outline and show error message for long names 2014-08-21 12:11:28 -04:00