Skip to content

Fix element name conflict - #904

Merged
jkarni merged 1 commit into
masterfrom
jkarni/fix/textbook-upload
Sep 10, 2013
Merged

Fix element name conflict#904
jkarni merged 1 commit into
masterfrom
jkarni/fix/textbook-upload

Conversation

@jkarni

@jkarni jkarni commented Sep 9, 2013

Copy link
Copy Markdown

@jzoldak @dianakhuang - Hotfix for broken textbook upload.

@cahrens

cahrens commented Sep 10, 2013

Copy link
Copy Markdown

👍 I checked out the branch and tested PDF textbooks, file assets, and course image.

WooHoo for acceptance tests!

(To clarify, the bug was found by a failing acceptance test. Therefore I'm OK with no test going in with the bug fix.)

@dianakhuang

Copy link
Copy Markdown
Contributor

I don't fully understand the bug, so I don't feel comfortable reviewing this. But I would really like to get this into the release. @jzoldak ?

Also, @jkarni once this gets fully reviewed, please submit a pull request for this branch onto the rc branch (you can merge it in without another review).

@jzoldak

jzoldak commented Sep 10, 2013

Copy link
Copy Markdown
Contributor

LGTM 👍

jkarni pushed a commit that referenced this pull request Sep 10, 2013
@jkarni
jkarni merged commit 64b1f2b into master Sep 10, 2013
@jkarni
jkarni deleted the jkarni/fix/textbook-upload branch September 10, 2013 17:23
jenkins-ks pushed a commit to nttks/edx-platform that referenced this pull request Aug 25, 2016
jcdyer pushed a commit to open-craft/openedx-platform that referenced this pull request Sep 27, 2017
MCKIN-5418 Fix cohort avg calculation in new API
kluo pushed a commit to kluo/edx-platform that referenced this pull request Oct 19, 2019
* Commits:
  Blacklist Marketo opt-ins by organization/course_id
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