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

5164 Commits

Author SHA1 Message Date
Kevin Falcone
9967b6fd58 Revert "[PERF-325] Add versioned course asset URLs when canonicalizing asset paths." 
We're seeing errors in NR from objects read out of the cache lacking the
'StaticContent' object has no attribute 'content_digest'
File "/edx/app/edxapp/edx-platform/common/djangoapps/contentserver/middleware.py",
    line 70, in process_request

This reverts commit 849ebc5f22.
 2016-06-22 12:11:35 -04:00
mdinino
0a7c534d56 Merge pull request #12824 from edx/release 
Release
 2016-06-22 11:31:34 -04:00
Michael Frey
6efc461fb6 mjfrey/micro-settings-merge: Override base dictionary keys with microsite configuration keys 
* mattdrayer: Add helpers.get_value test
* mattdrayer: Change to simpler implementation, per @douglashall
* mattdrayer: Address quality violations and test failures
 2016-06-21 23:28:36 -04:00
Clinton Blackburn
03095643c6 Exposed admin for LogoutViewConfiguration 
ECOM-4610
 2016-06-21 14:13:16 -04:00
Renzo Lucioni
10ad29f33c Merge pull request #12757 from edx/renzo/link-to-detail 
Link program listing cards to detail pages
 2016-06-21 09:37:02 -04:00
Douglas Hall
132d576e97 Merge pull request #12799 from edx/ibrahimahmed443/override-language-selector 
allow SHOW_LANGUAGE_SELECTOR to be overridden by MICROSITE_CONFIGURATION
 2016-06-21 05:36:33 -04:00
Renzo Lucioni
9cd7c93223 Link program listing cards to detail pages 
When program detail pages are enabled, cards on the listing page will link to their respective detail pages. Includes extensive cleanup of program listing tests. ECOM-4227.
 2016-06-20 16:34:57 -04:00
Kyle Crawshaw
47401742a9 Added 'unusable_password' argument to 'manage_user' management command 2016-06-20 11:30:56 -04:00
Ibrahim
ee70ea99fc allow SHOW_LANGUAGE_SELECTOR to be overridden by MICROSITE_CONFIGURATION 2016-06-20 17:15:08 +05:00
Andy Armstrong
df399de186 Merge pull request #12781 from eduNEXT/fmo/coffee_to_js_tabs 
Converting views/tabs.coffee in the cms to js
 2016-06-17 12:56:49 -07:00
Ibrahim
603546a04a replace references to settings.PLATFORM_NAME in edx-platform with theme overrides 2016-06-17 18:33:19 +05:00
Felipe Montoya
43ea4e21bb Converting views/tabs.coffee in the cms to js 
Linting the compiled file
 2016-06-16 18:35:34 -07:00
David Ormsbee
5f1595910d Merge pull request #12784 from edx/release 
Release to Master (2016-06-16 hotfix)
 2016-06-16 18:50:18 -04:00
David Ormsbee
255267d42c Create forums config model for adjusting connection timeouts. 2016-06-16 13:50:13 -04:00
Usman Khalid
781623205e Added a named outer_atomic option. 
A named outer is suitable when dealing with IntegrityErrors. It only
checks that it is not nested under an atomic only if it is nested
under enable_outer_atomic(name=<name>). This way only the view which
is causing IntegrityErrors needs to have its automatic transaction
management disabled and other callers are not effected.
 2016-06-16 14:18:21 +05: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
Toby Lawrence
9abce102ff Merge pull request #12573 from edx/PERF-325 
[PERF-325] Add versioned course asset URLs when canonicalizing asset paths.
 2016-06-15 09:05:13 -04:00
Toby Lawrence
849ebc5f22 [PERF-325] Add versioned course asset URLs when canonicalizing asset paths. 2016-06-15 08:04:52 -04:00
Tasawer
eb3517c27e Fixing IntegrityError happened on concurrent requests for course enrollment 
ECOM-1730
 2016-06-15 12:14:03 +05:00
Adam Palay
44636fe62d fix variable ordering issue with error message 2016-06-14 14:39:07 -04:00
Brian Jacobel
52450e9828 Merge pull request #12731 from edx/bjacobel/requirejs-sync 
Fixes to #12266
 2016-06-14 12:25:09 -04:00
Clinton Blackburn
77f605b30a Corrected usage of the title block for the main_django template 
ECOM-4610
 2016-06-13 19:11:36 -04:00
Brian Jacobel
17a19d2180 Can't reference a %def from another %def 2016-06-13 11:21:42 -04:00
Christina Roberts
81e5be2246 Merge pull request #12699 from edx/christina/config-models 
New XBlock Configuration Models
 2016-06-10 10:49:50 -04:00
cahrens
39cf70ecf4 Add new xblock config models. 
TNL-4666
 2016-06-10 09:52:57 -04:00
David Ormsbee
249467c9bb Merge pull request #12527 from cpennington/enable-concurrency-in-lms-tests 
Enable concurrency (but not randomization) in LMS unit tests
 2016-06-10 09:19:59 -04: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
Calen Pennington
a7ed99ba79 Add __init__.py to tests folders to make them proper modules 2016-06-09 14:38:33 -04:00
Calen Pennington
cfd1620703 Merge pull request #12630 from cpennington/dont-leak-current-requests-in-tests 
Dont leak current requests in tests
 2016-06-09 12:03:34 -04:00
Calen Pennington
97136768f9 Empty the RequestCache if the request ends in an exception 2016-06-09 10:10:40 -04:00
Calen Pennington
a88fa5c07a Remove mako_middleware_process_request, which doesn't cleanup after itself 2016-06-09 10:10:40 -04:00
Calen Pennington
029f4a5ef5 Use a contextmanager to cleanup after manipulating the current request in email rendering tests 2016-06-09 10:10:39 -04:00
Calen Pennington
71bb7f0ba0 Use a contextmanager to cleanup after manipulating the current request in create_account tests for external auth 2016-06-09 10:10:39 -04:00
Calen Pennington
6760ac44e8 Use a contextmanager to cleanup after manipulating the current request in password_policy tests for external auth 2016-06-09 10:10:39 -04:00
Calen Pennington
d77025c873 Use a contextmanager to cleanup after manipulating the current request in third_party_auth tests 2016-06-09 10:10:39 -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
Calen Pennington
86902e87af Use the Django TestClient for external_auth shib unit tests, so that middleware is cleaned up properly 2016-06-08 16:43:31 -04:00
Calen Pennington
437b249d68 Use django_crum to access the current request in request_cache 2016-06-08 16:35:25 -04:00
Calen Pennington
93970f3473 Allow edxmako to be passed an explicit request to create the RequestContext from 2016-06-08 16:35:25 -04:00
Calen Pennington
0e8af4cccc Use the non-deprecated functions for edxmako to access the request_cache 2016-06-08 16:35:24 -04:00
Calen Pennington
25c4398125 Convert edxmako to use django_crum to get the current request 2016-06-08 16:35:24 -04:00
Peter Fogg
3c223d106a Correct destination of management command args. 2016-06-08 15:48:27 -04:00
Waheed Ahmed
817a1585ef Merge pull request #12543 from edx/waheed/ecom-2361-complete-order-history-for-students 
Complete Order History tab for students on account settings page
 2016-06-08 22:53:59 +05:00
Brian Jacobel
6589139e29 Merge pull request #12266 from edx/bjacobel/requirejs-sync 
Load requirejs bundles synchronously
 2016-06-08 13:49:18 -04:00
Ahsan Ulhaq
d31b7cbd68 Complete Order History area for students 
ECOM-2361
 2016-06-08 21:45:07 +05:00
Waheed Ahmed
b2f21ef4f3 Complete Order History tab for students on account settings page. 
ECOM-2361
 2016-06-08 21:45:07 +05:00
Peter Fogg
17fb925cd4 Correct help text for the bulk_change_enrollment command. 2016-06-08 09:59:59 -04:00
Calen Pennington
df2f347ac2 Merge pull request #12670 from cpennington/reset-urls-favicon-tests 
Reset urls favicon tests
 2016-06-07 12:02:45 -04:00