Skip to content

Rc/2013 12 18 - #1972

Closed
e0d wants to merge 228 commits into
releasefrom
rc/2013-12-18
Closed

Rc/2013 12 18#1972
e0d wants to merge 228 commits into
releasefrom
rc/2013-12-18

Conversation

@e0d

@e0d e0d commented Dec 17, 2013

Copy link
Copy Markdown
Contributor

No description provided.

ichuang and others added 30 commits August 27, 2013 21:39
…ang/make-edit-link-use-static-asset-path

Conflicts:
	common/djangoapps/xmodule_modifiers.py
Add basic tests of gradeset iteration.
…tests

Show full diffs in ResponseType tests.
For a smoother transition to the new world
Change video transcripts to use locators instead of locations.
settings.MITX_FEATURES => settings.FEATURES
New documentation from rewrite, audit, and integration of some
documentation from edx101.  Intent to release by training on 12/5.
update to checking student progress, create new course, index, open
response assessment
Continued Editorial work
tusbar and others added 25 commits December 13, 2013 17:02
Fix bug introduced by #1919: usage of not-yet-defined AUTH_TOKENS dict.
Conflicts:
	cms/djangoapps/auth/authz.py
Fix data dash acceptance test to wait for text
Remove protocol from font URLs in Studio and Tiny MCE
For seeing overview of system status, for deleting and loading
courses, for seeing log of git imports of courseware.  Includes command
for importing course XML from git repositories.

Added a lot of tests for additional coverage with some minor fixes
those tests discovered
This reverts commit 540256b, reversing
changes made to bd04ab5.
Fix typo in peer grading messages.
Add ignore patterns for staticfiles to avoid processing symlink dirs
@e0d e0d closed this Dec 17, 2013
@e0d
e0d deleted the rc/2013-12-18 branch December 17, 2013 01:21
@e0d
e0d restored the rc/2013-12-18 branch December 17, 2013 01:47
@e0d
e0d deleted the rc/2013-12-18 branch December 17, 2013 01:52
jenkins-ks pushed a commit to nttks/edx-platform that referenced this pull request Jun 23, 2017
…openedx#1974)

* Fix review. add custom logo settings openedx#1873

* Fix bugs. add custom logo settings openedx#1972

* Fix bugs. add custom logo settings openedx#1971
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.