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

33604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Greg Price
59f72b554f Enable VAL URLs even when mobile API is disabled 
JIRA: MA-799
 2015-06-04 12:56:22 -04:00
Sarina Canelake
bdd51e6779 Merge pull request #8370 from edx/sarina/add-tim 
Add Tim Krones to AUTHORS.
 2015-06-04 12:49:51 -04:00
Tim Krones
b590a6271d Add Tim Krones to AUTHORS. 2015-06-04 12:48:08 -04:00
Peter Fogg
a9187e81c5 Merge pull request #8339 from edx/peter-fogg/teams-header 
Implement teams header component
 2015-06-04 12:45:09 -04:00
Piotr Mitros
b58f0b4de8 Merge pull request #8369 from edx/hotfix-2015-06-03-redux 
Fixed Recommender XBlock uploads
 2015-06-04 12:25:52 -04:00
swdanielli
ea8aa99a7b handle more exceptions for file uploading 2015-06-04 12:22:29 -04:00
Xiaolu Xiong
4f45839211 Merge pull request #8325 from beardeer/master 
Merge pull request #8325 from beardeer/edx-platform
 2015-06-04 11:45:15 -04:00
Daniel Friedman
8dfb774565 Merge pull request #8336 from edx/dan-f/expose-edxnotes-interface-setting 
Add support for public/internal edx-notes-api endpoints
 2015-06-04 11:32:33 -04:00
Adam
5952906e72 Merge pull request #8349 from edx/adam/fix-capa-devstack 
disable contracts that were breaking capa problems on devstack (TNL-2…
 2015-06-04 11:22:17 -04:00
Peter Fogg
ebafdb1d03 TNL-1900 Implement teams header component 2015-06-04 11:01:18 -04:00
Greg Price
73d891313a Add thread editing to discussion API 
This is done via PATCH on a thread instance endpoint.
 2015-06-04 10:56:43 -04:00
Chris Rodriguez
9af7cb9b97 Removing uppercase requirement 2015-06-04 10:55:32 -04:00
Chris Rodriguez
c6e8ef010b Reducing size of error message heading 2015-06-04 10:55:32 -04:00
Jim Abramson
373d948c8b Merge pull request #8356 from edx/jsa/xcom-388 
Add tests for enrollment deactivation under various modes.
 2015-06-04 10:48:12 -04:00
David Baumgold
32749a661a Merge pull request #8351 from edx/learners-dont-need-to-be-lean 
Learners don't need to be lean
 2015-06-04 10:43:27 -04:00
Calen Pennington
7c0709ce5b Merge pull request #8322 from cpennington/document-read-metrics 
Add metrics around all split-mongo database operations measuring coun…
 2015-06-04 10:08:10 -04:00
David Baumgold
37064cf191 Learners don't need to be lean 2015-06-04 09:42:27 -04:00
jsa
445a0c938b Add tests for enrollment deactivation under various modes. 
A bug with the creation of inactive honor enrollment modes was caught and fixed along the way.

XCOM-388
 2015-06-04 09:40:54 -04:00
Kevin Falcone
8f016414f9 Merge pull request #8348 from edx/release-2015-06-02-conflict 
Release 2015 06 02 conflict
 2015-06-04 09:20:12 -04:00
Xiaolu Xiong
a4b4e27427 add Xiaolu's name 2015-06-04 08:31:14 -04:00
Xiaolu Xiong
aa1bca6b41 Change the misleading doc string (str doesn't has attr 'name' ) 2015-06-04 08:30:38 -04:00
Sarina Canelake
1c1484071e Merge pull request #8359 from edx/colinfredricks/doc-2044 
Fixing typo in default numerical problem
 2015-06-04 08:18:22 -04:00
frances botsford
446e2aa7f3 Merge pull request #7859 from edx/frances/teams-ux 
UX templates for Teams
 2015-06-04 08:07:05 -04:00
Colin-Fredericks
8e440d77f6 Adding myself to AUTHORS 2015-06-04 07:14:49 -04:00
Colin-Fredericks
cc2d4cad01 DOC-2044 Fixing factor-of-ten error 2015-06-04 07:14:28 -04:00
Calen Pennington
94185e9c6f Add metrics around all split-mongo database operations measuring count, duration, and approximate size 
[PLAT-645]
 2015-06-04 07:12:45 -04:00
Awais Jibran
c1807c66d6 Merge pull request #8216 from edx/aj/tnl2159-studio-grade-range-bug 
Unconsistant view in Overall Grade Range
 2015-06-04 15:48:23 +05:00
Waheed Ahmed
97c90e5c07 Merge pull request #8332 from edx/waheed/tnl2314-fix-wiki-pointing-to-old-wiki-after-rerun 
Fixed wiki pointing to old course's wiki in rerun courses.
 2015-06-04 15:26:21 +05:00
Waheed Ahmed
c0f4c26e06 Fixed wiki pointing to old course's wiki in rerun courses. 
TNL-2314
 2015-06-04 14:36:30 +05:00
Mushtaq Ali
e9f997bdf1 Merge pull request #8233 from mushtaqak/mushtaq/tnl2055-unicode-url-issue 
Fix - Unicode character in tab number shouldn't return 500  -TNL-2055
 2015-06-04 12:47:37 +05:00
Mushtaq Ali
c575c89853 Bug - Unicode character in tab number shouldn't return 500 #TNL-2055 
Adding user to AUTHORS file
 2015-06-04 12:33:06 +05:00
Clinton Blackburn
c2999af883 Merge pull request #8353 from edx/clintonb/disable-csrf-checkout-cancel 
Disabled CSRF Validation for checkout cancel page
 2015-06-03 20:35:22 -04:00
Chris Dodge
ceb0fc79d0 update tests to match text changes 2015-06-03 19:00:46 -04:00
Peter Fogg
d47fe7918d Merge pull request #8352 from edx/peter-fogg/fix-bio-field-migrations 
Add student bio max_length to migrations.
 2015-06-03 17:58:50 -04:00
Clinton Blackburn
dbfd77e661 Disabled CSRF Validation for checkout cancel page 
CyberSource will POST to this view if the user cancels payment. CSRF validation cannot be enabled when this happens.

ECOM-1689
 2015-06-03 17:14:21 -04:00
Peter Fogg
63c3af737c Add student bio max_length to migrations. 2015-06-03 17:07:02 -04:00
Sylvia Pearce
2c7405940e Update enrollment code confirmation emails 2015-06-03 16:35:23 -04:00
Sylvia Pearce
99dfe98ac1 Update Instructor Dashboard UI text for enrollment codes 2015-06-03 16:35:23 -04:00
Sylvia Pearce
c482fce9d6 Update UI text for Saudi e-commerce features on the Instructor Dashboard 2015-06-03 16:35:22 -04:00
chrisndodge
bfe7527686 Merge pull request #8292 from edx/muhhshoaib/SOL-916-invalidate-revalidate-registration-codes 
SOL 916 invalidate revalidate registration codes
 2015-06-03 16:24:38 -04:00
Adam Palay
6012a34765 disable contracts that were breaking capa problems on devstack (TNL-2343) 2015-06-03 16:17:30 -04:00
Kevin Falcone
fecd3d55a7 Merge branch 'release' 2015-06-03 16:12:32 -04:00
Phil McGachey
ee70d45976 [LTI Provider] Basic LTI authentication 
This change cleans up the work in progress request at https://github.com/edx/edx-platform/pull/8176

This is an initial authentication implementation that allows LTI users to log in transparently to
edX. The behavior is driven by pilot users at Harvard; this was the most requested feature.

The patch creates a new database model that maps users' LTI identifiers to newly-created edX
accounts. If an LTI launch comes in with a user_id field that is not in the database, a new edX
account is created with a random user name and password. This account is then stored in the database,
so that it is permanently associated with the LTI user ID.

This patch takes a simplistic approach to session management. If a user is logged in with a
different account when they perform an LTI launch, they will be logged out and then re-logged
in using their LTI account.

In order to keep the patch simple, I have split out some refactoring that needs to be done into
a separate branch that I'll post once this has been merged. Since we no longer redirect to the
login page, we don't need to maintain two separate LTI endpoints (one for the LTI launch and
one for authenticated users), or deal with the session management that requires. There are
also multiple fetches of the LtiConsumer object (one in the view, one in the signature
validation) that the later patch will consolidate into one.
 2015-06-03 15:41:07 -04:00
Sarina Canelake
f78be26a5e Merge pull request #8341 from mcgachey/mcgachey-lti-consumer-bugfix 
[LTI Provider] Bugfix in LtiConsumer handling code
 2015-06-03 15:36:40 -04:00
Adam Palay
67b56ae859 time how long imports take in datadog 2015-06-03 15:06:01 -04:00
Ben McMorran
f01b2f4311 Merge pull request #8243 from edx/benmcmorran/team-api-a 
TNL-1897: Implement Course Team API, Part A
 2015-06-03 14:59:36 -04:00
Frances Botsford
cf89f3a62f base teams space (template) and create team form 2015-06-03 14:51:28 -04:00
Muhammad Shoaib
4dff8ecf09 SOL-916 Add ability to query, enable, disable, unredeem Enrollment Codes 2015-06-03 14:46:01 -04:00
Calen Pennington
faff5b1acd Update XBlock dependency to use the merged commit from the edx repo 2015-06-03 14:39:19 -04:00
Phil McGachey
71ee9d3bb8 [LTI Provider] Bugfix in LtiConsumer handling code 
The line below was left in during the refactoring shuffle from PR #8205, and causes
an issue in a corner case where an LTI launch provides an instance GUID where there
wasn't one already set for the consumer. This change fixes the bug, and adds a test
to prevent it from recurring.
 2015-06-03 14:34:36 -04:00