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

10706 Commits

Author SHA1 Message Date
Braden MacDonald
c35cd5d841 Merge pull request #7420 from open-craft/fix-library-analytics 
Fix two content library analytics issues (SOL-521)
 2015-03-20 21:40:35 -07:00
Braden MacDonald
7764f364cd Fix two content library analytics issues (SOL-521) 2015-03-20 20:47:03 -07:00
Nimisha Asthagiri
289469dd3a Merge pull request #7353 from edx/mobile/third-party-oauth-reg 
Mobile registration with Google/FB
 2015-03-20 17:04:37 -04:00
Ned Batchelder
f396c11579 Fix unidiomatic type checking 2015-03-20 15:48:54 -04:00
Nimisha Asthagiri
dfcef9ddcb MA-95: Update Registration endpoint to support 3rd party credentials 
Automatically link edX account with social account in login mobile API path
 2015-03-20 15:43:40 -04:00
Jesse Zoldak
5d65f577eb Merge pull request #7431 from edx/zoldak/SOL-336 
Decorate flaky test SOL-336
 2015-03-20 13:20:22 -04:00
Adam
d012428c34 Merge pull request #7426 from edx/adam/merge-release-to-master 
Adam/merge release to master
 2015-03-20 10:42:22 -04:00
Jesse Zoldak
bb4e57762f Decorate flaky test SOL-336 2015-03-20 10:13:11 -04:00
Ahsan Ulhaq
60cb7cf33a Merge pull request #7325 from edx/ahsan/tnl-1693-standarize-button-on-assessment-types 
Standrize buttons in assessment problems
 2015-03-20 18:50:27 +05:00
Sarina Canelake
90a0459e50 Merge pull request #7380 from OmarIthawi/edraak/platform-name-in-password-reset-confirm 
Keep platform_name in the password_reset_confirm.html always TNL-1654
 2015-03-20 09:14:40 -04:00
Adam Palay
b5c4b6388c Merge remote-tracking branch 'origin/release' into adam/merge-release-to-master 
Conflicts:
	common/djangoapps/cors_csrf/helpers.py
	common/djangoapps/enrollment/views.py
	lms/djangoapps/commerce/constants.py
	lms/djangoapps/commerce/tests.py
	lms/djangoapps/commerce/views.py
 2015-03-19 16:30:46 -04:00
Martyn James
7c942dddb5 Merge pull request #7219 from edx/mjames/SOL-289 
Addresses problem with 'up' and 'down' errors within SOL-289
 2015-03-19 09:51:36 -04:00
alawibaba
9b79797b28 Created performance logging endpoint, changed CDN experiment to point to it. 2015-03-19 07:53:01 -04:00
Ned Batchelder
a64d926845 Merge pull request #7399 from edx/ned/plat-462 
Make sure slashes in JSON content don't end script tags. PLAT-462
 2015-03-18 22:47:50 -04:00
Ned Batchelder
6928035cd1 Make sure slashes in JSON content don't end script tags. PLAT-462 
The string "</script>" in JSON data would end the script element we're
embedding the data in.  To make sure the data doesn't disrupt the
script, we escape the slash as \/ .
 2015-03-18 21:55:36 -04:00
Brian Wilson
243e2660b0 Merge release to master for 20150317 release. 2015-03-18 18:48:56 -04:00
Will Daly
4860837eae Merge pull request #7418 from edx/sanchez/revert_201_status_for_enrollments 
Reverting the change to add a 201_CREATED status to the enrollment API.
 2015-03-18 18:30:29 -04:00
Ned Batchelder
6ac1b82bb2 Merge pull request #7356 from edx/ned/fix-or-remove-teardown 
Fix or remove tearDown methods that don't use super.
 2015-03-18 17:36:17 -04:00
Nimisha Asthagiri
d0624b272f Merge pull request #7298 from edx/mobile/ab-test-support 
MA-7: A/B test and cohorted content support
 2015-03-18 16:33:01 -04:00
Stephen Sanchez
4acfbbdf21 Reverting the change to add a 201_CREATED status to the enrollment API. 2015-03-18 20:31:58 +00:00
Chris
551c382238 Merge pull request #7328 from edx/clrux/ux-1642-logistration-updates 
UX-1642 Making visual tweaks and enhancements to the logistration form
 2015-03-18 15:35:02 -04:00
David Ormsbee
ff77505f42 Add caching to partitions_service. 2015-03-18 14:55:16 -04:00
Nimisha Asthagiri
eca523e01e Mobile API MA-7: Support A/B test and cohorted content 2015-03-18 14:55:15 -04:00
Stephen Sanchez
af4d288f95 Merge pull request #7377 from edx/sanchez/enrollment_api_course_modes 
XCOM-45 Enrollment API supports creating modes other than honor.
 2015-03-18 14:30:55 -04:00
Will Daly
f0b4492065 Merge pull request #7381 from edx/will/ecom-601 
Copy changes to the activation email
 2015-03-18 14:30:32 -04:00
Will Daly
4d2969b0a8 Merge pull request #7312 from edx/will/quiet-cors-middleware-logging 
Downgrade CORS middleware warning to info
 2015-03-18 14:30:05 -04:00
Will Daly
c37dc913a0 Copy changes to the activation email 2015-03-18 13:45:15 -04:00
Stephen Sanchez
8c9f6370b8 Allow Enrollment API supports creating and upgrade course modes other than honor. 
Fixing tests, cleaning up POST handler to be easier to read.

Wording fixed for unit test comments.
 2015-03-18 17:12:02 +00:00
Clinton Blackburn
ae5cbf8b70 Merge pull request #7347 from edx/clintonb/commerce-events 
Validating event emission by the commerce app
 2015-03-18 12:47:26 -04:00
Chris Rodriguez
5ae7cc7ee1 UX-1642 Making visual tweaks and enhancements to the logistration form 2015-03-18 12:14:31 -04:00
Clinton Blackburn
a76fd944cd Merge pull request #7410 from edx/clintonb/course-mode-admin 
Added SKU column to CourseMode table in Django admin
 2015-03-18 12:00:18 -04:00
Stephen Sanchez
321544efe6 Merge pull request #7407 from edx/sanchez/server-to-server-throttling 
Allow services to ignore user throttling. Set a more realistic throttle for users.
 2015-03-18 11:24:07 -04:00
Clinton Blackburn
9436eacb35 Added SKU column to CourseMode table in Django admin 2015-03-18 11:10:37 -04:00
Ned Batchelder
649e45b40a Merge pull request #7388 from edx/ned/remove-more-test-data-mock-modulestore 
Remove useless override_settings of MODULESTORE
 2015-03-18 11:08:25 -04:00
Jonathan Piacenti
568acb56b0 Library setting for show/hide children previews + client-side code to toggle it. 2015-03-18 08:59:58 -05:00
Stephen Sanchez
d901b1d3e3 Allow services to ignore user throttling. 2015-03-18 13:48:32 +00:00
Awais Qureshi
263dbdafb3 Merge pull request #7363 from edx/awais786/ECOM-1162-ga-event 
Awais786/ecom 1162 ga event
 2015-03-18 17:47:20 +05:00
Ned Batchelder
425b766965 Remove TEST_DATA_MOCK_MODULESTORE 2015-03-17 17:21:52 -04:00
Awais
3a996155f5 ECOM-1162 2015-03-18 01:24:27 +05:00
Jonathan Piacenti
40bb70e9d1 Remove use of to_deprecated_string in sandbox regex check. 2015-03-17 16:16:11 -04:00
Brian Wilson
5f6ee428f8 Merge remote-tracking branch 'origin/release' into rc/2015-03-17 2015-03-17 15:59:54 -04:00
Ned Batchelder
81d17c516e Fix or remove tearDown methods that don't use super. 
Update edx-lint to the version that checks if tearDown uses super.

Convert a number of tearDown methods into addCleanup.

Remove some unneeded tearDown methods: no need to call patch.stopall if
none of them were started with patch.start.
 2015-03-17 15:14:52 -04:00
Martyn James
a495bb5f9e Addresses problem with 'up' and 'down' errors within SOL-289 2015-03-17 15:12:38 -04:00
brianhw
bafc7c53d3 Merge pull request #7392 from open-craft/library-capa-problems 
Remove use of to_deprecated_string in sandbox regex check.
 2015-03-17 14:17:19 -04:00
brianhw
7f5c54dd31 Revert "Remove use of to_deprecated_string in sandbox regex check." 2015-03-17 14:09:55 -04:00
Calen Pennington
60bbfc5a9c Add @contract to _load_item 2015-03-17 13:15:19 -04:00
Calen Pennington
11dcf12f14 Make XModule use the same get_children that XModuleDescriptor and XBlock do, and make it returned the same CombinedSystem 2015-03-17 13:15:18 -04:00
Calen Pennington
8a73a736e3 Correctly escape backslashes in docstring for get_content_titles 2015-03-17 13:15:18 -04:00
Calen Pennington
473420429d Allow MongoModuleStore to use an existing CachingDescriptorSystem. 
Prior to this change, if a CachingDescriptorSystem was prepopulated
with XBlock field data (`module_data`), then it would be used as
the DescriptorSystem for blocks loaded through it. On the other hand,
if it had to fetch new data from the modulestore, then a new
CachingDescriptorSystem would be created by the modulestore, and used
by the newly returned object.

This commit allows the modulestore get_item and get_items methods
to accept an existing CachingDescriptorSystem to augment with data
from the backing mongo store, and to use as the DescriptorSystem
for newly loaded XBlocks.
 2015-03-17 13:15:18 -04:00
Calen Pennington
4ef53135ae Add and clean up __repr__ and __str__ for XModule-related things 2015-03-17 13:15:18 -04:00