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

1253 Commits

Author SHA1 Message Date
E. Kolpakov
33b3dfcc92 Converts Discussion XModule to Discussion XBlock 
* Renames discussion_module to discussion_xblock
* Moves common/lib/xmodule/xmodule_discussion to openedx/core/lib/xblock_builtin/xblock_discussion
 2016-06-29 06:47:04 +12:00
Douglas Hall
56055cc47e Merge branch 'release' into douglashall/merge_patch_2016_06_22_to_master 2016-06-24 11:07:43 -04:00
Christopher Lee
d794fc5c4d Merge pull request #12842 from edx/clee/update-oauth 
Upgrade edx-oauth2-provider to v1.1.3
 2016-06-24 10:58:47 -04:00
christopher lee
084a5bdddd Upgrade edx-oauth2-provider to v1.1.3 2016-06-24 08:15:22 -04:00
Douglas Hall
e2fd776aab Upgrading edx-proctoring to 0.12.21 to pull in additional fix 2016-06-23 15:27:36 -04:00
Kevin Falcone
dbc4eccf8e Convert to tag syntax for version 2016-06-23 14:34:11 -04:00
christopher lee
141276e925 Upgrade edx-oauth2-provider to v1.1.2 2016-06-23 14:19:57 -04:00
christopher lee
92a48dfe71 Upgrade edx-oauth2-provider to v1.1.2 2016-06-23 14:13:21 -04:00
Jesse Zoldak
bbd0a82920 Revert "Upgrade edx-oauth2-provider to v1.1.2" 2016-06-23 12:46:45 -04:00
christopher lee
76bdacdde8 Upgrade edx-oauth2-provider to v1.1.2 2016-06-23 12:34:20 -04:00
Douglas Hall
40543ca0de Upgrade edx-proctoring to 0.12.20 2016-06-22 13:54:56 -04:00
Ned Batchelder
0d8cf05d17 Merge pull request #12788 from edx/ned/update-transifex-client 
Use the latest version of the transifex client
 2016-06-22 09:36:54 -04:00
Douglas Hall
f8ac8c1aaa Merge pull request #12815 from edx/douglashall/SOL-1844 
SOL-1844 Upgrade edx-proctoring to 0.12.20
 2016-06-21 15:24:26 -04:00
Eric Fischer
49add6c963 edx-submissions version bump (#12812) 2016-06-21 14:44:34 -04:00
Douglas Hall
697821e570 Upgrade edx-proctoring to 0.12.20 2016-06-21 10:47:46 -04:00
Chris
a7bd52952e Merge pull request #12729 from edx/clrux/bumping-bokchoy 
Bumping bok-choy to pick up a11y changes
 2016-06-17 14:43:21 -04:00
Ned Batchelder
cd7e79cdcb Use the latest version of the transifex client 2016-06-16 21:28:57 -04:00
Clinton Blackburn
8fa3bf327f Merge pull request #12651 from edx/clintonb/single-logout 
Added support for OpenID Connect single logout
 2016-06-15 12:56:50 -04:00
Clinton Blackburn
3f19cc0265 Updated logout view 
In addition to logging the user out of LMS, the logout view also logs users out of the IDAs to which they previously authenticated.

ECOM-4610
 2016-06-15 11:11:49 -04:00
Chris Rodriguez
92f706a642 Bumping bok-choy to pick up a11y changes 2016-06-14 14:28:29 -04:00
Ben Patterson
b8fbab67d4 Merge pull request #12725 from edx/benp/ac-488 
Pin the specific version number so the github install knows when to run.
 2016-06-14 14:08:52 -04:00
asadiqbal
d932e09c22 updated the version of recommeder xblock 2016-06-13 16:51:44 +05:00
Ben Patterson
acb3abe571 Pin the specific version number so the github install knows when to run. 2016-06-10 16:19:53 -04:00
asadiqbal
fbafa72993 updated the version from 2.0.6 to 2.0.7 2016-06-10 17:35:49 +05:00
PaulWattenberger
f5b42c8955 Initial lms changes for Sailthru (#12706) 
* Initial lms changes for Sailthru

* Fix identified code quality issues

* Fix migration failure

* Fix code quality identified issue
 2016-06-09 16:21:11 -04:00
Ned Batchelder
1ce2cbd187 Use v0.3.2 of i18n_tools 2016-06-09 10:41:40 -04:00
PaulWattenberger
9781685719 Revert "Pwattenberger/sailthru" (#12701) 2016-06-08 23:03:22 -04:00
PaulWattenberger
ca02235e64 Pwattenberger/sailthru (#12646) 
* Initial commit of Sailthru lms changes

* Field mapping changes for Sailthru integration

* Merge fix

* Add users to Sailthru list on registration

* FIx minor code format issues

* Several updates based on code review feedback

* Updates based on recomendations from Sailthru

* Clean up unit tests

* Fix last login

* Updates based on code review feedback

* Updates based on code review feedback

* Fix comment

* Cleanup
 2016-06-08 19:38:29 -04:00
Eric Fischer
ed2644a115 Bump installed edx-proctoring version (#12669) 2016-06-07 18:17:03 -04:00
Douglas Hall
98a392c301 Merge pull request #12683 from edx/douglashall/LOC-78/upgrade_lti_consumer_to_1_0_9 
LOC-78 Upgrade xblock-lti-consumer to fix i18n LTI launch parameter
 2016-06-07 11:20:26 -04:00
Douglas Hall
8ce63fef9b LOC-78 Upgrade xblock-lti-consumer to fix i18n LTI launch parameter 2016-06-07 10:24:02 -04:00
Christina Roberts
267e67d9e3 Merge pull request #12677 from edx/christina/update-ora-version 
Update for ora xblock static file handling.
 2016-06-07 10:05:55 -04:00
Ben Patterson
b9a38db626 Merge pull request #12647 from edx/benp/pa11ycrawler-update-AC-488 
AC-488. Use tip of pa11ycrawler repo to fix intermittent JSON decodin…
 2016-06-06 14:34:02 -04:00
cahrens
29db293054 Update for ora xblock static file handling. 
TNL-4710
 2016-06-06 14:25:58 -04:00
Ben Patterson
51099305e2 AC-488. Use tip of pa11ycrawler repo to fix intermittent JSON decoding error. 2016-06-03 10:31:54 -04:00
asadiqbal
9725fa94a5 updated the xblock version 2016-06-03 13:22:47 +05:00
Douglas Hall
a07a762f73 Merge pull request #12555 from edx/hasnain-naveed/MAYN-193 
MAYN-193 Use django_sites_extensions.middleware.RedirectMiddleware to enable redirects
 2016-06-01 21:18:01 -04:00
Hasnain
11454640da Added middleware to redirect the user from expired course page to all courses page. 2016-06-01 14:56:27 -04:00
Douglas Hall
0d49527607 Upgrading xblock-lti-consumer to v1.0.7 2016-06-01 13:41:57 -04:00
Afzal Wali
eadd656df0 SOL-1802 Allow proctoring service to create support ticket. 2016-05-27 09:29:06 -04:00
Ben Patterson
3764521ba9 Upgrade radon to repair import issue. 2016-05-26 09:13:48 -04:00
Fred Smith
b3462e5b1c Merge pull request #12544 from edx/derf/override_SES_email_region 
override SES email region
 2016-05-25 11:16:47 -04:00
Fred Smith
8a9df36809 update django-ses 2016-05-25 10:12:50 -04:00
Ned Batchelder
83155840aa Merge pull request #12520 from edx/ned/oops-messages-po 
Two tweaks because we keep django.po and djangojs.po now.
 2016-05-24 06:40:10 -04:00
Ned Batchelder
2245a8f577 Use the latest non-clobbering i18n_tools 2016-05-20 13:28:29 -04:00
Jillian Vogel
83c58c603d Bump Drag-and-Drop-v2 v2.0.6 2016-05-20 17:23:46 +09:30
Calen Pennington
2aa9967189 Merge pull request #12386 from cpennington/cale/concurrent-unit-tests 
[EV-12] Run LMS unit tests concurrently on jenkins
 2016-05-19 14:25:24 -04:00
Ned Batchelder
6142c76ce8 Merge pull request #12471 from edx/ned/release-translations 
Support named-release translation files.
 2016-05-19 10:41:06 -04:00
Calen Pennington
9c6e404bd1 Disable rednose, which is incompatible with multiprocessing 2016-05-18 14:10:29 -04:00
Calen Pennington
ad54c05407 Add plugin for test-order randomization 2016-05-18 14:10:29 -04:00