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

602 Commits

Author SHA1 Message Date
Clinton Blackburn
9bf2712512 Updated edx-oauth2-provider to 0.5.1 2015-04-01 12:22:01 -04:00
Greg Price
c860f790c2 Merge pull request #7508 from edx/gprice/export-import-val 
Include VAL data in video module export/import
 2015-03-31 20:28:31 -04:00
Greg Price
cfcb304885 Include VAL data in video module export/import 
This is required so that an a video module exported by one Open edX
deployment and imported by another will work correctly if it contains an
edx_video_id but does not populate other URL fields.

JIRA: MA-110
 2015-03-31 19:35:06 -04:00
Calen Pennington
8f133f6696 Merge pull request #6035 from edx/jeskew/xmodule_to_xblock_vertical 
Convert Vertical XModule to pure Vertical XBlock.
 2015-03-31 11:10:22 -04:00
Calen Pennington
1f17538d42 Clean up tests in preparation for switching Vertical from an XModule to an XBlock 2015-03-30 16:37:53 -04:00
Adam
dad4b673e2 Merge pull request #7505 from edx/release 
Release
 2015-03-27 16:46:33 -04:00
Adam Palay
cb9c89e168 update ORA2 to fix TNL-1758 2015-03-27 10:35:46 -04:00
Christopher Lee
4423510807 Merge pull request #7480 from edx/clee/MA-169_MA-77 
Clee/ma 169 ma 77
 2015-03-26 13:31:49 -04:00
Christine Lytwynec
3a8716a36f update bokchoy with fix for TNL-1770 2015-03-25 17:02:10 -04:00
christopher lee
3b150da1d7 MA-169 return requested val encoded video profiles 
MA-169 Mobile api now calls for mobile_low (default), mobile_high,
 and youtube profiles instead of only mobile_low.
 2015-03-25 15:40:58 -04:00
Martyn James
e8cf0a35df Merge pull request #7423 from edx/mjames/update_search_hash 
Updating edx-search hash to include bugfixes
 2015-03-23 10:39:31 -04:00
Ned Batchelder
6c70f30dec pylint --> 1.4.2, and pin astroid 2015-03-20 14:35:11 -04:00
Martyn James
10ca5affcf Updating edx-search hash to include bugfixes for SOL-289 and SOL-217 2015-03-19 12:05:50 -04:00
Brian Wilson
243e2660b0 Merge release to master for 20150317 release. 2015-03-18 18:48:56 -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
Max Rothman
1f3a4a87ab Update newrelic agent for monitoring celery tasks 2015-03-18 10:52:47 -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
Calen Pennington
9379fd2711 Add tests of XBlocks/XModules with filtered children 2015-03-17 10:55:06 -04:00
Jesse Zoldak
e4a08fb868 Update the bok-choy version being used. TE-783 2015-03-16 11:57:06 -04:00
Clinton Blackburn
cff9a5aa78 Merge pull request #7318 from edx/clintonb/register-with-oscar 
Enrolling via E-Commerce API for combined login-registration page
 2015-03-13 01:32:26 -04:00
Clinton Blackburn
eaa7a22058 Added commerce/purchase endpoint 
This new endpoint is intended to replace enrollment API call used on the login+registration page. Instead of directly enrolling students, the view will contact the external e-commerce API (Oscar) to create a new order. Oscar will be responsible for completing the order and enrolling the student.

This behavior will only apply to course modes with associated SKUs. All other course mode enrollments will be processed directly by LMS.
 2015-03-13 00:25:13 -04:00
Adam Palay
bb2f7dedfd update schoolyourself xblock (TNL-1395) 2015-03-12 10:50:32 -04:00
Ned Batchelder
f8c9fdf6c8 Merge pull request #7196 from edx/ned/tweaked-pylintrc 
Use 'edx_lint write' to create our pylintrc from pylintrc_tweaks
 2015-03-06 09:50:59 -05:00
Ben Patterson
1d00508671 Merge pull request #7147 from edx/benp/static-code-analysis-radon 
Benp/static code analysis radon
 2015-03-05 06:48:25 -05:00
Carson Gee
da9154d10e Add Staff Graded Assignments XBlock to edx-platform 2015-03-04 10:35:54 -05:00
Ned Batchelder
ff2bb10325 Use 'edx_lint write' to create our pylintrc from pylintrc_tweaks 2015-03-03 17:09:19 -05:00
Lee Newton
c375f666d2 bnotions contributions to mobile api 2015-03-02 22:27:27 -05:00
Calen Pennington
8e93c1891f Merge pull request #6016 from cpennington/django-toolbar-upgrade 
Upgrade django-debug-toolbar to 1.2.2
 2015-02-27 10:39:32 -05:00
Ben Patterson
30291e7511 Add radon. 2015-02-26 19:26:50 -05:00
Braden MacDonald
88747024b5 Upgrade django-debug-toolbar to 1.2.2 
This is compatible with Django > 1.5, and allows us to re-enable the ProfilingDebugPanel
 2015-02-26 15:57:03 -05:00
Nimisha Asthagiri
d757029fc8 Upgrade South to 1.0.1 2015-02-26 14:57:28 -05:00
Christine Lytwynec
8bdd90a5b1 Merge pull request #7037 from edx/clytwynec/flaky_test_decorator 
Clytwynec/flaky test decorator
 2015-02-25 16:35:01 -05:00
Martyn James
b2b56d067b Adds google drive components to whitelist, and imports xblock-google-drive and xblock-utils 2015-02-25 10:35:51 -05:00
Christine Lytwynec
d14c7cf14f Use flaky from clytwynec fork 2015-02-24 17:34:42 -05:00
Christine Lytwynec
c229fcad84 add flaky to requirements file 2015-02-24 17:29:07 -05:00
David Baumgold
3b06d71198 Merge pull request #7078 from edx/db/upgrade-pip 
Use pip 6.0.8
 2015-02-24 11:03:56 -05:00
Nimisha Asthagiri
b280e44fe1 Merge pull request #7025 from edx/mobile/oauth2-allow-inactive-user 
MA-291 Allow API access without email activation.
 2015-02-24 09:12:30 -05:00
Nimisha Asthagiri
83a3adb97b MA-291 Allow API access without email activation 2015-02-24 06:05:18 -05:00
David Baumgold
310a60ee8f Use pip 6.0.8 2015-02-23 14:51:04 -05:00
Calen Pennington
b9c9a58aac Bump MongoDBProxy to handle AutoReconnect during find_one 2015-02-23 11:40:40 -05:00
Sarina Canelake
08a74a5aca Merge pull request #7003 from schoolyourself/schoolyourself-xblock 
Update schoolyourself-xblock CSS to wrap long title text on small screens
 2015-02-18 08:57:13 -05:00
muzaffaryousaf
4a13656864 updating the edx-submission version. 
adding myself to authors.

TNL-1466
 2015-02-18 13:12:21 +05:00
Xavier Antoviaque
132cadb517 Merge pull request #2968 from edx-solutions/xblock-external-ui 
xblock-external-ui: Add XBlock API call to render XBlock views
 2015-02-18 08:58:33 +01:00
Sarina Canelake
b1d2c5c396 Update i18n-tools to fix dummy generation 2015-02-17 17:42:11 -05:00
John Lee
41a457d359 Update schoolyourself-xblock CSS to wrap long title text 2015-02-17 10:34:48 -05:00
Usman Khalid
618d8ba33c Merge pull request #6980 from edx/usman/ora-release-2014-02-12 
Update edx-ora2 to release-2015-02-12T15.27.
 2015-02-17 17:00:32 +05:00
Xavier Antoviaque
05c857478b xblock-external-ui: Adds support for CORS headers (cross-domain request) 
xblock-external-ui: Alternate referer check for CORS requests
xblock-external-ui: Allow to disable httponly on session cookies
xblock-external-ui: Add a unit test for CorsCSRFMiddleware
 2015-02-17 10:24:27 +01:00
Clinton Blackburn
052fa8eafc Merge pull request #6935 from edx/clintonb/course-structure 
Generating Course Structure Asynchronously on Course Publish
 2015-02-13 13:37:05 -05:00
Clinton Blackburn
92ca64fa2a Finishing async course structure work 
- Added tests
- Updated model field specification
- Fixed issue of multiple event emission
- Updated admin page
- Added management command to manually generate course structures
 2015-02-13 12:21:51 -05:00
Usman Khalid
93fa8cafbe Update edx-ora2 to release-2015-02-12T15.27. 2015-02-12 20:29:13 +05:00