Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,165 Commits 1 Branch 0 Tags
9cbc8564a12eaae381ebefeb7c98b420f7265b68
Commit Graph

11688 Commits

Author SHA1 Message Date
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
Jonathan Piacenti
85c81e4579 Remove use of to_deprecated_string in sandbox regex check. 2015-03-17 16:43:53 +00:00
Calen Pennington
8fbb64322b Clarify grading variables in the CourseModule 2015-03-17 10:55:06 -04:00
Calen Pennington
de23d6defe Clear cached children when binding an XModuleDescriptor/XBlock to a particular user 2015-03-17 10:55:06 -04:00
Adam Palay
71ab971c72 Revert "Lms should be independent of mathjax" 
This reverts commit 4a086f54d5.
 2015-03-17 10:44:48 -04:00
Ned Batchelder
7d799e34f3 Remove unused imports 2015-03-17 07:10:31 -04:00
Omar Al-Ithawi
3d107c04eb Keep platform_name in the password_reset_confirm.html always TNL-1654 2015-03-17 10:24:20 +02:00
Andy Armstrong
37dd0ec840 Merge pull request #7327 from edx/andya/preferences-api 
Implement full preferences API
 2015-03-17 00:57:01 -04:00
Andy Armstrong
6976a33a85 Add the preferences endpoint to the User API 
TNL-1493

See https://openedx.atlassian.net/wiki/display/TNL/User+API for details
 2015-03-16 23:34:35 -04:00
Will Daly
2cbe6fdecb Merge pull request #7371 from edx/will/django-rest-framework-cors-csrf 
Skip CSRF referer check for cross-domain requests.
 2015-03-16 12:30:30 -04:00
Will Daly
b625e8e37e Skip CSRF referer check for cross-domain requests. 
This commit extends the workaround in `cors_csrf` middleware
to Django Rest Framework's SessionAuthentication, which
calls Django's CSRF middleware directly.

The workaround checks the cross domain whitelist and
skips the CSRF referer check for domains on the whitelist.
 2015-03-16 11:48:09 -04:00
Waqas Khalid
1b44f1e237 Merge pull request #7044 from edx/waqas/make-lms-mathjax-independent 
Lms should be independent of mathjax
 2015-03-16 18:47:32 +05:00
Waqas Khalid
a8457c4fb4 Merge pull request #6871 from edx/waqas/studio-mathjax-unit-problem 
Unit page doesn't load when mathjax is down
 2015-03-16 18:47:06 +05:00
Waqas Khalid
729dd24c82 Unit page doesn't load when mathjax is down 
When mathjax is down studio page doesn't work as
it wait for mathjax to load. I replaced the hard
dependency with soft dependency now unit page can
load with mathjax.
 2015-03-16 15:12:01 +05:00
Waqas Khalid
4a086f54d5 Lms should be independent of mathjax 
When cdn is down specially in the country like china
and others user face problem as application doesn't
work as intended. Instead of making mathjax hard
dependecy I have converted it into soft dependey
so that it won't cause user problem to use application
smothly if mathjax is not present.

TNL-1498
 2015-03-16 15:10:25 +05:00
stv
181eed241f Silence unrelated warnings 2015-03-14 13:35:18 -07:00
stv
79f9d1a70f Fix Pylint: E1121(too-many-function-args) 2015-03-13 20:20:04 -07:00
stv
b9ed4b6561 Fix Pylint: E1305(too-many-format-args) 2015-03-13 20:20:04 -07:00
stv
6c06f8ce5d Fix Pylint: C1001(old-style-class) 2015-03-13 20:20:04 -07:00