Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

put block around main_vendor js in main_django.html #396

Merged
merged 1 commit into from
Jul 17, 2013

Conversation

jbau
Copy link

@jbau jbau commented Jul 13, 2013

should be a no-op for edx-east, but allow edx-west to remove
vendor.js (with an empty {% block %}) in our password_reset_confirm.html to fix a bug

@frrrances @talbs

should be a no-op for edx-east, but allow edx-west to remove
vendor.js with a blank {% block %}
in our password_reset_confirm.html to fix a bug
@frrrances
Copy link
Contributor

seems okay to me, but you should probably run this by @cpennington. 👍 if he's okay with it.

@talbs
Copy link
Contributor

talbs commented Jul 15, 2013

Thanks @jbau. Looks good here as well - I'd just echo @frrrances's thoughts on getting @cpennington's approval.

👍

@jbau
Copy link
Author

jbau commented Jul 16, 2013

@cpennington a quick ping on this one: its changes should be a no-op, as nothing else is using a main_vendor_js block.

@cpennington
Copy link
Contributor

👍

jbau added a commit that referenced this pull request Jul 17, 2013
…ndor-js

put block around main_vendor js in main_django.html
@jbau jbau merged commit c789642 into master Jul 17, 2013
chrisrossi pushed a commit to jazkarta/edx-platform that referenced this pull request Mar 31, 2014
Provide content QA (quality assessment) interface
kawaguchi-ks added a commit to nttks/edx-platform that referenced this pull request Oct 6, 2015
diegomillan pushed a commit to eduNEXT/edx-platform that referenced this pull request Sep 14, 2016
…regen-cert

Fix KeyError: 'designation' error oversight
jfavellar90 pushed a commit to eduNEXT/edx-platform that referenced this pull request Apr 11, 2018
* ADD: microsite config file config and generation of file from microsite endpoint

* ADD: comments

* FIX: calling safe after microsite creation.
dgamanenko referenced this pull request in raccoongang/edx-platform Jun 14, 2018
* ADD: microsite config file config and generation of file from microsite endpoint

* ADD: comments

* FIX: calling safe after microsite creation.
xavierchan added a commit to xavierchan/edx-platform-1 that referenced this pull request May 20, 2019
MoisesGSalas pushed a commit to eduNEXT/edx-platform that referenced this pull request Jan 12, 2022
…-arabic-translation

[FAL-2358] Update 'View Course' arabic translation
jbcurtin pushed a commit to jbcurtin/edx-platform that referenced this pull request Jan 31, 2022
…-arabic-translation

[FAL-2358] Update 'View Course' arabic translation

(cherry picked from commit 00c5165)
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.

4 participants