Skip to content

Feature/cale/xblock init - #148

Merged
cpennington merged 2 commits into
masterfrom
feature/cale/xblock-init
Jun 17, 2013
Merged

Feature/cale/xblock init#148
cpennington merged 2 commits into
masterfrom
feature/cale/xblock-init

Conversation

@cpennington

Copy link
Copy Markdown
Contributor

@sarina @ormsbee: Review?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

self._location ?

@ormsbee

ormsbee commented Jun 13, 2013

Copy link
Copy Markdown
Contributor

Aside from comments, looks good to me.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add what arguments a CombinedOpenEndedModule expects to take? (Same reason as Dave's comments about CapaModule)

@sarina

sarina commented Jun 13, 2013

Copy link
Copy Markdown
Contributor

Looks good to me once comments addressed & CHANGELOG.rst updated as per new process

@sarina

sarina commented Jun 14, 2013

Copy link
Copy Markdown
Contributor

gofer it! :shipit:

@sarina

sarina commented Jun 17, 2013

Copy link
Copy Markdown
Contributor

You said this was merged in standup this morning - let's get it merged today!

@cpennington

Copy link
Copy Markdown
Contributor Author

Crap. Thought I had.

cpennington added a commit that referenced this pull request Jun 17, 2013
@cpennington
cpennington merged commit 3fdc02d into master Jun 17, 2013
@cpennington
cpennington deleted the feature/cale/xblock-init branch June 17, 2013 18:03
aboudreault pushed a commit to aboudreault/edx-platform that referenced this pull request Jul 30, 2014
…s-courses-roles

mattdrayer/api-users-courses-roles: Added support for setting user roles
jbau pushed a commit that referenced this pull request Jan 21, 2015
from Stanford-Online:image-modal/install
into Stanford-Online:master
CrewS pushed a commit to CrewS/edx-platform-1 that referenced this pull request Dec 28, 2018
update lms sentry front-end settings, add cms sentry settings
edx-secure pushed a commit that referenced this pull request Jan 10, 2019
…_hashing

Use secure salt for retirement username/email hashing.
rediris pushed a commit to gymnasium/edx-platform that referenced this pull request Feb 25, 2021
…x/allow-param-for-email-sending

add conditional to read boolean for email sending on user creation
macdiesel pushed a commit to macdiesel/edx-platform that referenced this pull request Mar 5, 2026
macdiesel pushed a commit to macdiesel/edx-platform that referenced this pull request Mar 5, 2026
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.

3 participants