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

431 Commits

Author SHA1 Message Date
chrisndodge
460a4b5f99 Merge pull request #9069 from edx/cdodge/proctoring-lms-integration 
Integration of Proctoring into the LMS
 2015-08-14 07:18:14 -04:00
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04:00
Peter Fogg
eafb07552a Merge pull request #9287 from edx/release 
Release
 2015-08-12 13:06:39 -04:00
Waheed Ahmed
aff849281d Revert "Test library failed to export after import" 
This reverts commit 4c1c4619f0.
 2015-08-12 02:06:09 +05:00
Ned Batchelder
ba8fd8f082 Update the version of django-staticfiles 
This gets us:

- Static files can have non-ASCII characters in them.
- A useful log message if a file can't be found.
 2015-08-10 12:08:53 -04:00
Matt Drayer
e1ee5ac6df mattdrayer/SOL-981: Integrate edx-organizations application 
* asadiqbal08/SOL-1058: Add edx-organizations to certificate web view
  * Support organization logo asset management
  * Remove organization fields from Studio certificate configuration model

* SOL-981 pull request feedback fixes
 2015-08-10 10:29:45 -04:00
Sarina Canelake
7d0cde60f4 Update i18n-tools [LOC-88] 2015-08-07 15:45:21 -04:00
Ahsan Ulhaq
ac9a291778 Update edx reverification block on plateform 2015-08-07 22:30:15 +05:00
Syed Hassan Raza
4c1c4619f0 Test library failed to export after import 2015-08-05 12:47:27 -07:00
Nimisha Asthagiri
5a44f391b0 MA-977 Use "supports" decorator on XBlocks for multi-device support 2015-08-05 11:37:33 -04:00
Calen Pennington
704ae7139a Add a subclass-implementation of the UserStateClient tests 2015-08-01 08:12:04 -04:00
Will Daly
3e8eac90d2 Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/github.txt
 2015-07-30 11:43:19 -07:00
Ahsan Ulhaq
08165e8823 Update ICRV version 2015-07-30 14:35:11 +05:00
Kevin Falcone
898a43c49f Pin the rc6266 fork release 
If we don't pin to the version, pip will see that we have a version of
rfc6266 installed and be fine with it.

Yes, you have to say it twice.
 2015-07-29 15:41:33 -04:00
Chris Dodge
6c3a902482 switch to using tags 2015-07-29 10:49:34 -04:00
Carson Gee
4b9792a149 Resolved LogHandler bug in rf6266 2015-07-28 19:14:51 -04: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
Chris Dodge
81502176e1 Integrate timed and proctored exam authoring into Studio 2015-07-28 17:16:06 -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