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

29226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Shrhawk
1e73c272f5 Merge pull request #7405 from edx/shr/bug/PLAT-466-Bad-course-about-page-value-500-error 
handle invalid-key exception for split courses
 2015-03-20 17:57:48 +05:00
Syed Hassan Raza
d17a0c6ad2 handle invalid-key exception for split courses 2015-03-20 16:18:27 +05:00
Carol Tong
d182b8db99 Merge pull request #7411 from edx/carol/doc/ContentLibHelpLinks 
Content Libraries: Fix Help links in Import/Export templates
 2015-03-19 11:21:14 -04:00
Carol Tong
4e9e11e4c0 Add Help links and targets for import/export libraries 2015-03-19 10:11:16 -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
Carol Tong
d413e71b88 Merge pull request #7419 from edx/carol/doc/ContentLibUserAccessHelpLinks 
DOC: ContentLib Help links for user access
 2015-03-19 09:02:05 -04:00
Clinton Blackburn
524840aa80 Merge pull request #7394 from edx/clintonb/fix-existing-enrollment 
Bypassing E-Commerce API if user is enrolled in course
 2015-03-19 08:53:46 -04:00
Clinton Blackburn
2e2fb47d59 Bypassing E-Commerce API if user is enrolled in course 
If a user is already enrolled in a course, the API is bypassed and a 409 status is returned.
 2015-03-18 23:21:18 -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
brianhw
e03813dabb Merge pull request #7414 from edx/release-merge-20150317 
Merge release to master for 20150317 release.
 2015-03-18 21:39:42 -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
Carol Tong
e749f4500b Update template and config.ini files for library user help 2015-03-18 17:43:54 -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
d7386ecc87 Use depth=0 for call to cache_for_descriptor_descendents. 2015-03-18 14:55:15 -04:00
Nimisha Asthagiri
eca523e01e Mobile API MA-7: Support A/B test and cohorted content 2015-03-18 14:55:15 -04:00
Nimisha Asthagiri
091d6aebe9 Mobile API: Modularize VideoOutline code 2015-03-18 14:55:15 -04:00
Max Rothman
40dd4f1fcb Merge pull request #7408 from edx/max/update-newrelic 
Update newrelic agent for monitoring celery tasks
 2015-03-18 14:52:32 -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
Chris Rodriguez
026501aec9 Fix 2015-03-18 14:21:21 -04:00
Will Daly
c37dc913a0 Copy changes to the activation email 2015-03-18 13:45:15 -04:00
Brian Talbot
6e3d5568bd Merge pull request #7345 from edx/talbs/certs-webview-uicleanup 
Certificates: Revising Web Templates + UI for Open edX Use
 2015-03-18 13:16:24 -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
Matt Drayer
10e9fed687 Pass required values via context to invalid template 2015-03-18 12:24:06 -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
3d520f4fa8 Merge pull request #7409 from edx/clintonb/filter-empty-string 
Fixed CourseMode Filtering Bug
 2015-03-18 12:00:49 -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
783fb23fe2 Fixed CourseMode Filtering Bug 
Commerce code has now been updated to exclude CourseMode objects with SKU set to empty string (in addition to null).
 2015-03-18 11:14:36 -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
Kelketek
b66a128c05 Merge pull request #6939 from open-craft/content_libraries/previews 
Add show/hide previews button to Content Libraries
 2015-03-18 10:05:22 -05:00
Max Rothman
1f3a4a87ab Update newrelic agent for monitoring celery tasks 2015-03-18 10:52:47 -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
Will Daly
c8825652b1 Merge pull request #7398 from edx/will/fix-broken-footer-test 
Add missing import of override_settings to fix a broken test in courseware
 2015-03-17 16:46:44 -04:00
Will Daly
2bc82367ce Add missing import of override_settings to fix a broken test in courseware 2015-03-17 16:43:29 -04:00