Skip to content

Merged master to rc/2013-11-21, so we can merge it back to master. - #1802

Merged
nedbat merged 7 commits into
masterfrom
ned/merge-master-to-rc-2013-11-21-again
Nov 27, 2013
Merged

Merged master to rc/2013-11-21, so we can merge it back to master.#1802
nedbat merged 7 commits into
masterfrom
ned/merge-master-to-rc-2013-11-21-again

Conversation

@nedbat

@nedbat nedbat commented Nov 27, 2013

Copy link
Copy Markdown
Contributor

No description provided.

cpennington and others added 7 commits November 26, 2013 16:29
Updates to depend on the latest version of XBlock, which includes
support for service-to-service (thirdparty) handler urls, which aren't
authenticated with a user (unlike handler requests coming from the
xblock client-side javascript).

Co-author: Ned Batchelder <ned@edx.org>
This does not yet replace the existing per-student anonymous id, but
is intended to do so in the future.

Co-author: Alexander Kryklia <kryklia@edx.org>
Co-author: Ned Batchelder <ned@edx.org>
Co-author: Oleg Marchev <oleg@edx.org>
Co-author: Valera Rozuvan <valera@edx.org>
Co-author: polesye
…configured user

Co-author: Ned Batchelder <ned@edx.org>
Co-author: Alexander Kryklia <kryklia@edx.org>
Co-author: Ned Batchelder <ned@edx.org>
Co-author: Oleg Marchev <oleg@edx.org>
Co-author: Valera Rozuvan <valera@edx.org>
Co-author: polesye
[BLD-384]
nedbat added a commit that referenced this pull request Nov 27, 2013
…gain

Merged master to rc/2013-11-21, so we can merge it back to master.
@nedbat
nedbat merged commit 39b29dc into master Nov 27, 2013
@nedbat
nedbat deleted the ned/merge-master-to-rc-2013-11-21-again branch November 27, 2013 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants