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
86633df3dbd76174d7691b13e7b06ab8f9c207d2
Commit Graph

25334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nimisha Asthagiri
f3d76e69c1 Merge pull request #4989 from edx/split/revert-to-published 
LMS-11185 Split implementation of revert_to_published
 2014-08-27 15:41:40 -04:00
Nimisha Asthagiri
af9c9cd573 LMS-11185 Split implementation of revert_to_published 2014-08-27 15:41:14 -04:00
srpearce
10deae916c Merge pull request #2751 from edx/markhoeber/documentation/stud-1260 
WIP:  Content Experiments Documentation
 2014-08-27 14:29:54 -04:00
Mark Hoeber
fb1ed6ed80 Doc for nested components and content experiments 2014-08-27 14:28:48 -04:00
Alison Hodges
c08d43b16c Merge pull request #4813 from edx/markhoeber-documentation-doc829 
Publishing Update Round Two
 2014-08-27 14:01:55 -04:00
Mark Hoeber
f816cc8b7a Update for hiding sections and subsections and bulk publishing 2014-08-27 14:00:27 -04:00
Alison Hodges
afd0d9c37c Merge pull request #4978 from edx/ahodges/doc/relnotes20140826 
Ahodges/doc/relnotes20140826
 2014-08-27 13:54:43 -04:00
Alison Hodges
d7ebe0e606 release notes spacing fix 2014-08-27 13:46:47 -04:00
Stephen Sanchez
ac162dbaf0 Merge pull request #4994 from edx/sanchez/aws_social_link_overrides 
Adding social media link overrides for AWS.
 2014-08-27 13:34:54 -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
Adam
0c47a74b45 Merge pull request #4784 from edx/adam/track-bulk-email-memory 
Adam/track bulk email memory
 2014-08-27 12:53:13 -04:00
Alison Hodges
69064d108c Merge pull request #4982 from edx/ahodges/doc/DOC839 
Ahodges/doc/doc839
 2014-08-27 12:09:31 -04:00
Alison Hodges
e6a63f99e5 release notes wrapping 2014-08-27 12:05:54 -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
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
Stephen Sanchez
9186f39eb6 Adding social media link overrides for AWS. 2014-08-27 15:23:12 +00:00
Adam Palay
22a8ce39e2 add tracking for memory usage in creating subtasks (LMS-6488) 2014-08-27 11:12:52 -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
Will Daly
31a6566110 Embargo based on country code in the user's profile. 2014-08-27 08:51:45 -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
Waheed Ahmed
e810426f94 Merge pull request #4932 from edx/waheed/lms11266-modify-request-type-for-change-enroll-and-bulk-beta 
Modified request method for change enrollment and bulk beta modify access on instructor dashboard.
 2014-08-27 14:19:08 +05:00
Waheed Ahmed
57bc5c9314 Modified request method for change enrollment and bulk beta modify access on instructor dashboard. 
LMS-11266
 2014-08-27 13:20:04 +05: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
Alison Hodges
64774b18fb email history sender images 2014-08-26 16:30:50 -04:00
Alison Hodges
867b2d2f03 release nets include Sylvia's comments 2014-08-26 16:12:33 -04:00
Don Mitchell
a13ad0f43f Fixup of Bug/djpyfs 2014-08-26 15:59:34 -04:00
Alison Hodges
4ecd0458ce Merge pull request #4935 from edx/ahodges/doc/DOC914 
Removed grading and drag'n'drop
 2014-08-26 15:16:05 -04:00
Don Mitchell
40d68c7a29 Merge pull request #4974 from edx/bug/djpyfs 
Bug/djpyfs
 2014-08-26 14:45:50 -04:00
Alison Hodges
b39b0772e8 release notes initial draft 2014-08-26 14:42:00 -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
Sarina Canelake
9e27ff41b9 Merge pull request #4972 from open-craft/doc-byte-sized-tasks 
doc-byte-sized-tasks: Add link to the byte-sized tasks in CONTRIBUTING
 2014-08-26 13:52:49 -04:00
Don Mitchell
709012e361 Merge pull request #4965 from edx/split/lms_bugs 
Split/lms bugs
 2014-08-26 13:23:25 -04:00
Xavier Antoviaque
3459ee2f50 doc-byte-sized-tasks: Add link to the byte-sized tasks in CONTRIBUTING 
Thanks to @adampalay, we now have a list of byte-sized tasks, which are
useful for new contributors who want a gentle introduction to the
platform. This PR adds a link to the tasks tagged as byte-sized in the
public tracker.
 2014-08-26 18:22:17 +02:00
Ben Patterson
f5f4326ba9 Merge pull request #4969 from edx/benp/fix-js-tests 
Pin coffee-script version to 1.6.1.

1.6.3 is causing some issues.
 2014-08-26 11:15:47 -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
Anton Stupak
876fdbb3bd Merge pull request #4970 from edx/anton/enable-bok-choy-test 
Enable Bok Choy split test.
 2014-08-26 14:28:19 +03:00
polesye
5495329aab BLD-1226: enable 'delete_inactive_group' test. 2014-08-26 11:44:10 +03:00
Ben Patterson
5b7633366e Pin coffee-script version to 1.6.1. 2014-08-25 21:39:51 -04:00
Don Mitchell
49ed732824 JS regex's need to escape special chars 
LMS-11260
 2014-08-25 18:07:37 -04:00
Don Mitchell
4465b26a43 Use opaque_keys w/ model vars not parsing of url 
to generate url.
LMS-11209
 2014-08-25 18:07:37 -04:00