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

574 Commits

Author SHA1 Message Date
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
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
muzaffaryousaf
71e267eb69 Changing the edx-submission repo version to the latest commit. 
TNL-1125
 2015-02-12 15:54:30 +05:00
John Eskew
b3cc2f576f Merge pull request #6716 from edx/jeskew/update_pycontracts_version 
Updated version of PyContracts.
 2015-02-11 16:10:06 -05:00
Calen Pennington
b93b541733 Add our custom pylint plugin 
So far, it checks:

* Whether setUp is called in TestCase setUp methods.
* If _("translate me") functions are called with only string literals.
 2015-02-06 11:58:37 -05:00
Jesse Zoldak
1042e47e3c Revert "Add pylint plugin to check whether setUp is called in TestCase setUp methods." 
This reverts commit a92ca9d79a.
 2015-02-05 12:45:47 -05:00
Calen Pennington
2bb1aafaaf Merge pull request #6752 from cpennington/modulestore-test-case-cleanup 
Clean up ModuleStoreTestCase
 2015-02-04 15:57:01 -05:00
Calen Pennington
a92ca9d79a Add pylint plugin to check whether setUp is called in TestCase setUp methods. 2015-02-04 09:09:14 -05:00
Calen Pennington
a69c4efd21 Add the ability to send SIGPROF to an edx-platform process to obtain a memory dump 2015-02-02 13:12:58 -05:00
Calen Pennington
03594aa3f4 Upgrade pip 2015-02-02 13:12:58 -05:00
Greg Price
20eb84d431 Merge pull request #6828 from edx/gprice/video-upload-ordering 
Sort Studio video uploads by creation date
 2015-01-30 15:08:09 -05:00
Greg Price
3978d91644 Sort Studio video uploads by creation date 
This provides a better UX for video uploaders, because recent uploads
are readily visible at the beginning of the table.
 2015-01-30 13:23:44 -05:00
Adam Palay
bfcfbfab2f Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/github.txt
 2015-01-30 09:44:42 -05:00
Braden MacDonald
da3a3c038c Bump XBlock version 2015-01-29 17:31:07 -08:00
Adam Palay
d4d785bfd7 update codejail (TNL-1248) 
(optionally use a proxy process to spawn subprocesses)
 2015-01-29 15:10:39 -05:00
Davorin Sego
e09d47b122 Courseware Search integration 2015-01-28 21:34:58 -05:00
Matt Drayer
9d2a0a4e9d Merge pull request #6705 from edx/mattdrayer/update-milestones-hash 
Bok Choy test now passes
 2015-01-28 17:38:18 -05:00
Matt Drayer
e5f00e626a Bok Choy test now passes 2015-01-28 17:37:49 -05:00
Christine Lytwynec
739322d469 Merge pull request #6780 from edx/clytwynec/update_bokchoy_version 
updating bokchoy version
 2015-01-28 16:30:51 -05:00
swdanielli
dbec1d6fc7 Fix recommenders' bugs: template_lookup initialization, syntax error, and the incompatibility of the underscore library 2015-01-27 15:47:52 -05:00
David Baumgold
f6d0918555 Merge pull request #6441 from edx/db/update-pillow 
Update Pillow to 2.7.0
 2015-01-27 14:59:45 -05:00
Christine Lytwynec
b7e5a52d1d updating bokchoy version 2015-01-27 10:06:23 -05:00
swdanielli
ed8fea79c2 update accessibility 2015-01-23 16:13:26 -05:00
John Eskew
57fc5b37f0 Updated version of PyContracts. 2015-01-21 11:09:59 -05:00
Ben Patterson
11613bd26a Resolve run_pylint error. 2015-01-20 06:28:11 -05:00
Ned Batchelder
94ce3c0a8c Merge pull request #6514 from johnjlee/schoolyourself-xblock 
Minor fixes to the schoolyourself xblock
 2015-01-16 10:35:50 -05:00
Renzo Lucioni
c6777a5b25 Bok Choy tests for the split payment and verification flow 
Adds mode creation endpoint to course_modes app and ability to bypass media device access prompt when proceeding through verification flow in a testing environment.
 2015-01-15 17:25:25 -05:00
Matt Drayer
27fee62039 Merge pull request #6126 from edx/ziafazal/add-pre-requisite-course-via-milestones-app 
Ziafazal/add pre requisite course via milestones app
 2015-01-15 14:20:44 -08:00
Will Daly
572f155aad Merge pull request #6541 from edx/will/update-diff-cover 
Install diff-cover from pypi, update version to 0.7.3
 2015-01-15 17:09:43 -05:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17:38 -05:00