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

37497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
christopher lee
141276e925 Upgrade edx-oauth2-provider to v1.1.2 2016-06-23 14:19:57 -04:00
Adam Palay
07f5bacce2 Revert "AC-454 adding visual clarify for selected menu options" 
This reverts commit 55d84d34b8.
 2016-06-23 14:13:48 -04:00
Douglas Hall
51d8580982 Fix default from email lookups 2016-06-22 13:54:57 -04:00
Douglas Hall
7b86da02f7 Check theme overrides when retrieving platform name from settings 2016-06-22 13:54:57 -04:00
Michael Frey
ad45681a53 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-22 13:54:56 -04:00
Douglas Hall
40543ca0de Upgrade edx-proctoring to 0.12.20 2016-06-22 13:54:56 -04:00
Kevin Falcone
a5a235bd70 Merge pull request #12826 from edx/jibsheet/revert-pr-12573 
Revert "[PERF-325] Add versioned course asset URLs when canonicalizin…
 2016-06-22 13:38:45 -04:00
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
8f69f62c64 Merge pull request #12808 from edx/rc/2016-06-21 
Rc/2016 06 21
 2016-06-21 22:04:58 -04:00
Clinton Blackburn
03095643c6 Exposed admin for LogoutViewConfiguration 
ECOM-4610
 2016-06-21 14:13:16 -04:00
Brian Jacobel
949ddb11c6 Merge pull request #12809 from edx/bjacobel/dsc-image-overflow 
Add a third fixed case where images could overflow (refs #12735)
 2016-06-20 17:47:15 -04:00
Brian Jacobel
6aba6219c3 Add a third fixed case where images could overflow (refs #12735) 2016-06-20 16:32:52 -04:00
Clinton Blackburn
b89fc91786 Merge pull request #12786 from edx/clintonb/catalog-admin-csv 
Added CSV catalog downloads
 2016-06-17 09:34:25 -04:00
Douglas Hall
6705677ba3 Merge pull request #12785 from edx/douglashall/WL-531 
WL-531 Pass purchase_workflow parameter through to post-FinishAuth views
 2016-06-17 08:29:55 -04:00
Clinton Blackburn
eab057c812 Corrected JWT data type 
ECOM-4653
 2016-06-16 23:23:36 -04:00
Clinton Blackburn
372c59e4a4 Added links to download catalog CSVs in API admin tool 
ECOM-4729
 2016-06-16 23:00:48 -04:00
Clinton Blackburn
ecf44bbeaa Removed unused template file 
ECOM-4729
 2016-06-16 23:00:46 -04:00
Clinton Blackburn
880493099f Corrected Course Catalog API URL 
Retrieving the URL from settings rather than an OAuth client that might not exist.

ECOM-4729
 2016-06-16 23:00:45 -04:00
Douglas Hall
2717167f24 Pass purchase_workflow parameter through to post-FinishAuth views 2016-06-16 21:17:05 -04: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
Eric Fischer
fdc6d91588 update_in_cache on lms worker (#12689) 
This commit "undoes"a previous hotfix, and allows a cms course_publish
signal to trigger a block_structure update_course_in_cache task, which
is run on an lms worker queue.

Changes:
    -exposes ALTERNATE_QUEUE_ENVS
    -adds routing layer in celery.py
    -moves prior dev_with_worker settings file to devstack_with_worker
    -moves course_block api functionality into openedx/core/djangoapps/content/block_structure
 2016-06-16 18:01:06 -04:00
David Ormsbee
53712a60e5 Merge pull request #12778 from edx/hotfix/2016-06-16 
Create forums config model for adjusting connection timeouts.
 2016-06-16 15:46:32 -04:00
David Ormsbee
255267d42c Create forums config model for adjusting connection timeouts. 2016-06-16 13:50:13 -04:00
Ben Patterson
d544340fde Merge pull request #12776 from edx/benp/remove-invalid-scss-calc 
Remove invalid css syntax.
 2016-06-16 13:35:38 -04:00
Ned Batchelder
b1c15af3ff Merge pull request #12779 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-06-16 13:14:07 -04:00
Ben Patterson
28a01a4d7c Merge pull request #12774 from edx/benp/fix-scss-typo-shoppingcart 
Remove improper scss syntax.
 2016-06-16 13:13:35 -04:00
Douglas Hall
7e55cc26d8 Merge pull request #12769 from edx/release 
Merging Patch Release 2016-06-15 back to master
 2016-06-16 11:35:47 -04:00
Ned Batchelder
25c195d48a Update translations (autogenerated message) 2016-06-16 14:48:20 +00:00
Ben Patterson
1044dd5965 Remove invalid css syntax. 
This line can safely be removed since it does not impact
styling (nothing is being supplied to calculate).

Reference [here](http://www.w3schools.com/cssref/func_calc.asp)
 2016-06-16 09:58:41 -04:00
Ben Patterson
602380e52d Remove improper scss syntax. 
This was a typo that was missed, and is not resulting in any styling.

Removing it is a no-op.

The original committer does not work in this code anymore, and
it is old enough such that changing it would be more disruptive.
 2016-06-16 08:38:14 -04:00
Muzaffar yousaf
08a4d11db1 Merge pull request #12378 from edx/usman/atomic-refinement 
A more considerate outer_atomic.
 2016-06-16 17:25:54 +05: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
Waheed Ahmed
70a0b063ed Merge pull request #12759 from edx/waheed/ecom-2378-change-refund-log-level 
Changed refund log level to warning.
 2016-06-16 03:45:07 +05:00
Waheed Ahmed
07ab6cc744 Changed refund log level to warning. 
ECOM-2378
 2016-06-16 02:59:37 +05:00
Chris
b725dc0d75 Merge pull request #12744 from edx/clrux/ac-455 
AC-455 adding main to PDF books; styling chapters
 2016-06-15 17:36:45 -04:00
Douglas Hall
32b8391c11 Merge pull request #12766 from edx/patch/2016-06-15 
Patch Release 2016-06-15
 2016-06-15 16:51:45 -04:00
estute
d5c0e25a19 Merge pull request #12765 from edx/release 
Merge Release to Master
 2016-06-15 15:58:30 -04:00
Calen Pennington
a2bf90f64f Merge pull request #12763 from cpennington/badge-testing-allow-missing-dir 
Don't try and cleanup a directory that doesn't exist (in badging tests)
 2016-06-15 15:57:44 -04:00
Chris Rodriguez
079b2df404 AC-455 adding main to PDF books 2016-06-15 14:05:31 -04:00
Calen Pennington
5e11f86ed7 Remove flaky-test marker from badges tests 2016-06-15 13:49:52 -04:00
Douglas Hall
5e13fb496f Get platform name via microsite configuration for forgot password page 2016-06-15 13:44:31 -04:00
Douglas Hall
64546afb6d Get platform name via microsite configuration for forgot password page 2016-06-15 13:44:08 -04:00
estute
f643f2dc2a Merge pull request #12733 from edx/rc/2016-06-14 
Release Candidate rc/2016-06-14
 2016-06-15 13:21:52 -04:00
Brian Jacobel
38bd9ad047 Merge pull request #12740 from edx/bjacobel/discussions-self-post-interaction 
Can't report or vote for your own posts
 2016-06-15 13:04:33 -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
Brian Jacobel
b6cf9d231f Disallow reporting and upvoting of your own posts in discussion forums 2016-06-15 12:01:23 -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
Ahsan Ulhaq
09cdc6f47f Merge pull request #12760 from edx/ahsan/ECOM-4217-certs-invalidate-by-instructor 
Revert "Revert Adding logic to check if cert is invalidate then user cannot see the cert"
 2016-06-15 19:48:18 +05:00
Douglas Hall
7040a741b1 Merge pull request #12758 from edx/douglashall/HULL-22 
HULL-22 Get platform name via microsite configuration for forgot password page
 2016-06-15 10:19:16 -04:00
Awais
0bd1f4ccdd Adding logic to check if cert is invalidate then user cannot see the regen button. 
ECOM-4217
 2016-06-15 19:02:06 +05:00