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

9146 Commits

Author SHA1 Message Date
Greg Price
7470e60004 Unify forum thread views (and templates) 2014-08-29 15:59:31 -04:00
Greg Price
ab2b7f344d Clean up dead forums front-end code 2014-08-29 15:59:31 -04:00
Greg Price
854621be60 Update forum new post form 
Add help text to several fields, update visual styling, and make it
appear in the right-hand pane of the discussion tab instead of sliding
down from the top.

Co-authored-by: jsa <jsa@edx.org>
Co-authored-by: marco <marcotuts@gmail.com>
 2014-08-29 15:59:31 -04:00
Stephen Sanchez
20a66ee2ef The main django template needs header and footer feature flags. 2014-08-29 15:38:28 +00:00
zubair-arbi
dbe1ba095a Merge pull request #4805 from edx/zub/bugfix/std2007-jumptoid 
update get_parent_location method to select non-orphan parents from mult...
 2014-08-29 16:01:14 +05:00
zubair-arbi
89e03d5225 update get_parent_location method to select non-orphan parents from multiple parents 
STUD-2007
 2014-08-29 14:52:46 +05:00
Waheed Ahmed
048984ba1d Fixed InvalidKeyError on change enrollment. 
LMS-11132
 2014-08-29 14:45:54 +05:00
Daniel Friedman
8a7fef072d Merge pull request #4937 from edx/dan-f/improve-course-group-coverage 
Improve test coverage for course groups
 2014-08-28 19:08:56 -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
Daniel Friedman
a01e57ee71 Improve test coverage for course groups 2014-08-28 17:07:22 -04:00
Will Daly
83bfb17807 Use new-style course locators consistently when setting the donation amount in the session 
Update devstack settings to use new CyberSource API
 2014-08-28 13:55:31 -04:00
Will Daly
9a554ec39b Merge pull request #5008 from edx/will/style-fixups-in-student-tests 
Pep8 and Pylint fixes to the student tests
 2014-08-28 12:14:28 -04:00
Dave St.Germain
7d6c466c52 Merge pull request #4612 from edx/dcs/matlab-api-tweak 
A better check for the existence of matlabinput element.
 2014-08-28 12:07:12 -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
Will Daly
fcc27003dc Pep8 and Pylint fixes to the student tests 2014-08-28 08:05:36 -04: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
Don Mitchell
e624ff3b04 Make path_to_location use bulk_write_operation for performance. 2014-08-27 16:29:47 -04:00
Calen Pennington
e00a8afc6b Remove qualifiers from get_courses 2014-08-27 16:29:47 -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
Calen Pennington
db2abf4068 Make it so that versioning a structure that was read from the database works correctly 2014-08-27 16:29:46 -04:00
Calen Pennington
c292f3c609 Add tests to show that reading a structure before versioning it breaks versioning 2014-08-27 16:29:46 -04:00
Calen Pennington
4f4ef959e7 Extensive testing of bulk operations 2014-08-27 16:29:46 -04:00
Calen Pennington
562f0e3197 Add bulk operations to split modulestore 2014-08-27 16:29:46 -04:00
Calen Pennington
f731d5feda Clarify thread-safety of bulk_write context manager 2014-08-27 16:00:52 -04:00
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
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
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