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

5200 Commits

Author SHA1 Message Date
Ben Patterson
32071af4b6 TE-468 JS test improvement: test for attributes specifically 
This test is failing in a different test environment (Solano) because
the built html has reversed the order of the width and height attributes
from what we are expecting. This change focuses the assertion to the
pieces that are important (as noted in the unchanged comment above
the assertion).
 2014-09-10 16:59:28 -04:00
Piotr Mitros
a12c795944 Merge pull request #5120 from edx/pmitros/aws-djpyfs 
AWS settings for XBlocks to have filesystem-like storage
 2014-09-08 11:59:23 -04:00
Piotr Mitros
31176aeb37 AWS settings for XBlocks to have filesystem-like storage 
Upgrades to latest pyfs to support auth not through environment variables
 2014-09-08 10:46:18 -04:00
zubair-arbi
fc7d491cdc show upload progress on import course view + display last import status on import page load 
STUD-2017
 2014-09-08 17:51:51 +05:00
Piotr Mitros
5364508e48 Merge pull request #5108 from edx/pmitros/retrofix-xargs 
XBlock argument passing support backport from SDK
 2014-09-07 12:51:56 -04:00
Piotr Mitros
167f4171c4 XBlock argument passing support 2014-09-07 12:01:25 -04:00
Adam Palay
cfeb76e67f Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
 2014-09-05 13:20:15 -04:00
Brian Talbot
7b2275358f Merge pull request #5076 from edx/talbs/fix-studio-systemfb-ui 
FIX: Studio - System Feedback Icon Styling
 2014-09-05 11:37:11 -04:00
Don Mitchell
b28af4fdaa Temporarily disable bulk operations b/c old mongo 
does too much work on exit and doesn't handle nesting
 2014-09-04 17:28:17 -04:00
Nimisha Asthagiri
08a0c6392e Merge pull request #5070 from edx/reruns/error-handling 
Course Rerun: include stack trace in errors and Log errors.
 2014-09-04 16:25:43 -04:00
Nimisha Asthagiri
bdd91daeb6 Include stack trace in Course Rerun errors; Log errors. 2014-09-04 14:31:07 -04:00
Brian Talbot
dfbcd76885 Studio: resolves layout issues with icons in system feedback UI 2014-09-04 11:07:54 -04:00
Nimisha Asthagiri
b6590228a3 LMS-11342 Fix Split reimport issue. 2014-09-03 23:03:00 -04:00
Calen Pennington
48bdeeeae8 Merge pull request #5052 from edx/split/bulk-rerun-LMS-11332 
Enable bulk operations on split
 2014-09-03 11:18:23 -04:00
Nimisha Asthagiri
bd54cd8c57 LMS-11332 Unit test 2014-09-03 09:15:01 -04:00
Don Mitchell
96bc5cc83a Merge pull request #5001 from edx/split/edit_info 
Split/edit info
 2014-09-03 08:28:31 -04:00
Don Mitchell
85fa712fdf Change published_date to published_on 
to make consistent with other edit info timestamps
LMS-11184
 2014-09-02 13:20:23 -04:00
Don Mitchell
7b52d45aa6 Move edit info into xblock and runtime mixins 
LMS-11183, LMS-11184
 2014-09-02 10:08:39 -04:00
Andy Armstrong
7b26e85478 Merge branch 'release' into andya/merge-hotfix-2014-08-29 
Conflicts:
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	lms/djangoapps/courseware/tests/test_module_render.py
 2014-08-29 16:50:10 -04:00
Andy Armstrong
c14891e920 Pre-cache has_changes when computing ancestors 2014-08-29 14:09:42 -04:00
Don Mitchell
1db107c2ce Add memoization for has_changes 2014-08-29 14:09:41 -04:00
Calen Pennington
3afc125ecb Add test to verify bad query behavior of xblock_handler 2014-08-29 14:09:41 -04:00
Calen Pennington
8dc7f34295 Improve debuggability when call-count numbers don't match up 2014-08-29 14:09:35 -04:00
Sarina Canelake
64c94cf3cf Merge pull request #4686 from Stanford-Online/stv/i18n/gettext 
Monkey patch 'django.utils.translation'
 2014-08-28 17:39:51 -04:00
Brian Talbot
335298c8e3 Studio: adding in usage note to UX reference templates 2014-08-28 15:37:48 -04:00
Sarina Canelake
d233570c48 Remove i18n from ux reference templates 2014-08-28 15:37:48 -04:00
muhammad-ammar
2efee4eb88 Merge pull request #4939 from edx/ammar/bok-choy-transcript-tests-batch3 
Bok-Choy Video Transcript Tests Batch3
 2014-08-28 19:44:24 +05:00
Muhammad Ammar
6b2874de2b Bok-Choy Video Transcript tests Batch3 2014-08-28 09:10:13 +00:00
stv
86633df3db Monkey patch 'django.utils.translation' 
Modify Django's translation library, such that the gettext family of
functions return an empty string when attempting to translate a
falsey value. This overrides the default behavior [0]:
> It is convention with GNU gettext to include meta-data as the
> translation for the empty string.

This patch provides a holistic solution to replace the current piecemeal
approach [1][2].

Affected Methods:
    - gettext
    - ugettext

[0] https://docs.python.org/2.7/library/gettext.html#the-gnutranslations-class
[1] bad803e451
[2] https://github.com/edx/edx-platform/pull/4653
 2014-08-27 15:27:34 -07:00
Calen Pennington
0e7e266a5b Push bulk_write_operations up into ModuleStoreRead, and rename to remove reference to writes 2014-08-27 16:29:48 -04:00
Calen Pennington
a205788c4d Work around for split not having a coherent way to work with/track updated versions of structures 2014-08-27 16:29:48 -04:00
Calen Pennington
3672c9a292 Make find_matching_* work during split bulk operations 2014-08-27 16:29:47 -04:00
Calen Pennington
e7ce41061e Improve debuggability when call-count numbers don't match up 2014-08-27 16:29:47 -04:00
Calen Pennington
337b0b48aa Improve check_number_of_calls family of methods 2014-08-27 16:29:47 -04:00
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