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

415 Commits

Author SHA1 Message Date
Ahsan Ulhaq
08165e8823 Update ICRV version 2015-07-30 14:35:11 +05:00
Carson Gee
1df53ac348 Merge pull request #9080 from mitocw/feature/cg/rfc6266_logger_issue 
Resolved LogHandler bug in rf6266
 2015-07-28 17:17:08 -04:00
Carson Gee
c19a683f15 Resolved LogHandler bug in rf6266 2015-07-28 16:25:36 -04:00
Renzo Lucioni
82fd897a8b Update edx-oauth2-provider to 0.5.6 2015-07-24 13:48:29 -04:00
chrisndodge
5e195c8eeb Merge pull request #8962 from edx/cdodge/proctoring-studio 
Integrate timed and proctored exam authoring into Studio
 2015-07-23 15:53:17 -04:00
Chris Dodge
3748119961 Integrate timed and proctored exam authoring into Studio 2015-07-23 14:43:17 -04:00
Davorin Sego
a43cf589e0 Update edx-search, fix lms filter generator and courseware index tests 2015-07-22 16:44:01 +02:00
Renzo Lucioni
527def32e4 Update edx-oauth2-provider to 0.5.5 
0.5.5 includes oauth2-provider's tests module
 2015-07-21 11:37:07 -04:00
Renzo Lucioni
45ff29653b Update edx-oauth2-provider to 0.5.4 2015-07-18 09:35:58 -04:00
Adam
2735b2b5bb Revert "Decorated instructor dashboard with sudo_required." 2015-07-17 12:11:38 -04:00
Waheed Ahmed
bc052db1ee Added DjangoSudo functionality for instructor dashboard and course team page 2015-07-16 11:14:11 +05:00
Renzo Lucioni
7f6e61b189 Merge pull request #8938 from edx/renzo/update-edx-oauth2-provider 
Update edx-oauth2-provider to 0.5.3
 2015-07-15 17:22:45 -04:00
Renzo Lucioni
ea37ada4db Update edx-oauth2-provider to 0.5.3 2015-07-15 15:58:00 -04:00
Dino Cikatic
862262bd2d SOL-974 make index and remove calls use ES bulk API 2015-07-14 11:47:08 -04:00
David Baumgold
b6af608489 Update edx-ora2 and ease for lxml version compatibility 2015-07-14 11:09:18 -04:00
Renzo Lucioni
77e0c049b8 Merge pull request #8836 from edx/renzo/edx-oauth2-provider-upgrade 
Update edx-oauth2-provider to 0.5.2
 2015-07-09 18:23:10 -04:00
Tyler Nickerson
825d99deee Merge pull request #8865 from edx/nickersoft/jwt-security 
XCOM-281: LMS now passes JWT issuer and expiration date to ecommerce API client
 2015-07-09 16:43:07 -04:00
Nickersoft
2d13e9e886 LMS now passes JWT issuer and expiration date to ecommerce API client 2015-07-09 15:06:54 -04:00
David Baumgold
8a6e310d04 don't install ease in editable mode 2015-07-09 13:33:14 -04:00
David Baumgold
28433e1d53 Don't install nltk in editable mode 2015-07-09 13:31:18 -04:00
David Baumgold
a31f68520e Use compatible versions of edx-ora2 and ease 2015-07-09 13:05:09 -04:00
David Baumgold
705fa6999a Use a forked version of NLTK 
So that we can use setuptools instead of distribute
 2015-07-09 13:04:33 -04:00
Usman Khalid
d2336ce767 Update edx-ora2 to release-2015-07-09T14.47. 2015-07-09 19:59:29 +05:00
Renzo Lucioni
82c96c87cb Update edx-oauth2-provider to 0.5.2 2015-07-08 16:09:38 -04:00
Awais Jibran
ded7682090 Studio "Schedule & Details" page is broken in IDBx+IDB9x+2015_T2 
TNL-2435
 2015-07-06 18:26:00 +05:00
Davorin Sego
7374624b3c Add feature flag to skip enrollment start date filtering for course search 
add flag to lms/envs/common

update edx-search release tag
 2015-07-03 13:24:25 +02:00
Ali Mohammad
eb70f2303c Merge pull request #8749 from edx/rc/2015-06-29 
Merge back into master
 2015-07-02 13:34:42 -04:00
Sven Marnach
e8398b571e Add the Poll XBlock to the requirements and ADVANCED_COMPONENT_TYPES. 2015-07-01 18:34:10 +02:00
Adam Palay
4bb4efe9d9 Merge remote-tracking branch 'origin/release' into rc/2015-06-29 
Conflicts:
	requirements/edx/github.txt
 2015-06-29 16:55:57 -04:00
Adam Palay
61431015c2 update xblock only to mark field values as dirty if they've changed (TNL-2475) 
force save "download_video" field if not set

set timezone to UTC explicitly
 2015-06-29 14:28:45 -04:00
Sarina Canelake
ed51fe0d74 Update i18n-tools to latest version 2015-06-26 17:29:25 -04:00
Calen Pennington
ba971db1ba Merge pull request #8594 from cpennington/pass-xblock-parents 
Pass xblock parents
 2015-06-26 12:15:41 -04:00
Calen Pennington
a25f91da69 Fix XBlock inheritance ordering. XBlockMixin and derivatives should always come after XBlock and derivatives 2015-06-26 11:05:38 -04:00
Calen Pennington
fdf81042f5 Pass XBlock parents down to their children when constructing them, for caching 2015-06-25 13:59:46 -04:00
Utkarsh
dac018f459 Adding dependency for edx-user-state-client 2015-06-25 03:10:50 +00:00
Jesse Zoldak
79527f8191 Update bok-choy version 2015-06-23 11:22:12 -04:00
Xavier Antoviaque
f04547cf0f Updates the XBlock utilsrequirement to the latest 
This integrates the fixes from https://github.com/edx/xblock-utils/pull/20 and https://github.com/edx/xblock-utils/pull/21 - cf the PRs for the code review & +1s.

CC @smarnach @sarina
 2015-06-22 17:29:21 +02:00
Nimisha Asthagiri
84753740e3 Merge pull request #8570 from edx/mobile/video-upload-MA-844 
MA-844 Video Upload: remove dependency on AssetMetaDataStore.
 2015-06-19 11:21:50 -04:00
Nimisha Asthagiri
26d4a15d63 MA-844 Video Upload: remove dependency on AssetMetaDataStore. 2015-06-18 18:28:48 -04:00
Matt Drayer
e710ba7ebe Update edx-milestones Github reference 2015-06-18 11:01:24 -04:00
chrisndodge
57c8072752 Merge pull request #8539 from edx/cdodge/update-edx-search-hash 
update edx-search hash to include faceted search
 2015-06-18 10:23:34 -04:00
Jesse Zoldak
d382b69954 Revert "Update bok-choy version and move to base.txt" 2015-06-17 14:50:27 -04:00
Jesse Zoldak
8f769d2345 Merge pull request #8533 from edx/zoldak/update-bok-choy 
Update bok-choy version and move to base.txt
 2015-06-17 08:25:51 -04:00
zubair-arbi
6ed4ac08d0 update reverification block version to fix error for 'skip_reverification' service method 
ECOM-1738
 2015-06-17 12:49:58 +05:00
Chris Dodge
e8b2d9961d update edx-search hash to include faceted search 2015-06-16 17:14:21 -04:00
Jesse Zoldak
c0a0505de8 Update bok-choy version and move to base.txt 2015-06-16 11:51:58 -04:00
Calen Pennington
3c2bfc70a3 Merge pull request #8259 from jazkarta/include-ccx-key-dependency 
MIT CCX add ccx-keys as a dependency of edx
 2015-06-10 09:57:45 -04:00
Sven Marnach
40b4bc65f6 Merge pull request #8411 from open-craft/smarnach/bump-submissions-hash 
Bump edx-submissions hash to latest version.
 2015-06-10 11:51:59 +02:00
cewing
a57cc930b6 add ccx-keys as a dependency of edx 2015-06-08 11:25:13 -07:00
Feanil Patel
e488896f2f Merge pull request #8409 from edx/dsego/SOL-875 
Update edx-search dependency to reference latest edx-search
 2015-06-08 13:08:50 -04:00