Rc/2013 12 18 - #1972

Closed

e0d wants to merge 228 commits into

Commits on Aug 28, 2013

make edit link use static_asset_path in xmodule_modifiers.py
ichuang
committed

Commits on Oct 8, 2013

Merge branch 'master' of github.com:edx/edx-platform into bugfix/ichuang/make-edit-link-use-static-asset-path
ichuang
committed

Commits on Oct 16, 2013

Commits on Oct 17, 2013

Merge branch 'master' of github.com:edx/edx-platform into bugfix/ichuang/make-edit-link-use-static-asset-path
ichuang
committed

Commits on Nov 26, 2013

Change video transcripts to use locators instead of locations.
cahrens
committed

Commits on Dec 3, 2013

Fix LTI max_score method.
polesye
committed
Add min value.
polesye
committed
Make has_score to be XField insted of decriptor property.
auraz
committed
Fix LTI tests.
auraz
committed
Merge branch 'release'
Ned Batchelder
committed
Show full diffs in ResponseType tests.
Ned Batchelder
committed
Make runone work with more test output.
Ned Batchelder
committed
mitxmako => edxmako
singingwolfboy
committed
Add basic tests of gradeset iteration.
David Ormsbee
committed
Merge pull request #1816 from edx/ormsbee/grading_tests
David Ormsbee
committed
Merge pull request #1824 from edx/ned/show-full-diff-in-responsetype-tests
nedbat
committed
fix typo in ORA template (ORA-136)
adampalay
committed
Merge pull request #1823 from edx/db/mitxmako-edxmako
singingwolfboy
committed
settings.MITX_FEATURES => settings.FEATURES
singingwolfboy
committed
Fall back on MITX_FEATURES env variable if FEATURES isn't found
singingwolfboy
committed
Encode header row (LMS-197)
sarina
committed

Commits on Dec 4, 2013

Commits on Dec 5, 2013

BLD-438: Fix clear and download buttons.
polesye
committed
Merge pull request #1807 from edx/anton/transcripts
polesye
committed
Merge pull request #1819 from edx/anton/fix-lti-scores
auraz
committed
Merge pull request #1845 from edx/flowerhack/update-devstack-settings
Julia Hansbrough
committed
Merge pull request #1817 from edx/sarina/lms-197
sarina
committed
Merge pull request #1814 from edx/adam/fix-ora-typo
adampalay
committed
Change forum role granted to staff on enrollment
Greg Price
committed
Refactor textbooks to use locator URLs
singingwolfboy
committed
Use window.course instead of window.section
singingwolfboy
committed
Merge pull request #1850 from edx/gprice/change-staff-forum-role
Greg Price
committed
Pass PDF textbooks to template separately
singingwolfboy
committed
course.save() is no longer necessary
singingwolfboy
committed
update npm package name to edx
singingwolfboy
committed
Removed extra trailing slash from STATIC_URL in devstack
Will Daly
committed
more i18n work
singingwolfboy
committed
Events for entering verified flow & buying
Julia Hansbrough
committed
Added refund datetime info to Orders, OrderItems
Julia Hansbrough
committed
Response to CR
Julia Hansbrough
committed
Quick fix
Julia Hansbrough
committed
Response to CR
Julia Hansbrough
committed
Added alternate upsell copy flag
Julia Hansbrough
committed
Merge pull request #1757 from edx/will/static-url-double-slash
Will Daly
committed
Merge master in prep for merging back the hotfix changes.
Ned Batchelder
committed
Update factory_boy to 2.2.1
singingwolfboy
committed
Merge pull request #1865 from edx/ned/merge-hotfix-2013-12-04-to-master
nedbat
committed
SplitMongo publish method
Don Mitchell
committed
Fixed test to ensure deletion on publish
Don Mitchell
committed
Merge pull request #1867 from edx/db/update-factory-boy
singingwolfboy
committed
Merge pull request #1772 from edx/db/locator-refactor-textbooks
singingwolfboy
committed
Merge pull request #1832 from edx/dhm/publish
dmitchell
committed
New release notes project
mhoeber
committed

Commits on Dec 6, 2013

test
srpearce
committed
New Release Notes
mhoeber
committed
Upgrade pymongo usage from deprecated connection to client
Don Mitchell
committed
Added segment.io tracking
Julia Hansbrough
committed
Change mitx.db to edx.db for dev sqlite
singingwolfboy
committed
update LocMemCache location to use edx instead of mitx
singingwolfboy
committed
Merge pull request #1879 from edx/db/mitx-edx-sqlite
singingwolfboy
committed
Merge pull request #1880 from edx/db/mitx-edx-locmem
singingwolfboy
committed
On export error, handle quotes within string.
cahrens
committed
import GlobalStaff to legacy.py (LMS-1599)
adampalay
committed
Merge pull request #1869 from edx/christina/export-error
Christina Roberts
committed
ORA documentation updates
srpearce
committed
Disabled AJAX Errors Course Overview JS test
Will Daly
committed
Merge pull request #1881 from edx/adam/fix/instr-dash-500
adampalay
committed
Activate Markdown editor buttons on keypress
Greg Price
committed
Shorten collection name to keep index name w/in limit
Don Mitchell
committed
Merge pull request #1884 from edx/will/disable-js-course-overview-test
Will Daly
committed
Merge pull request #1878 from edx/dhm/pymongo_client
dmitchell
committed
rn for 12/9/13
mhoeber
committed
response to cr
Julia Hansbrough
committed

Commits on Dec 8, 2013

Release notes for 12-9-2013
mhoeber
committed

Commits on Dec 9, 2013

Commits on Dec 10, 2013

Commits on Dec 11, 2013

Commits on Dec 12, 2013

Commits on Dec 13, 2013

Commits on Dec 16, 2013

Add sysadmin dashboard

carsongee
authored and
a
committed
Revert "Merge pull request #1889 from tusbar/studio-https-fonts"
singingwolfboy
committed
Merge pull request #1959 from edx/db/revert-tusbar-merge
singingwolfboy
committed
Fix typo in peer grading messages.
Stephen Sanchez
committed
Merge pull request #1958 from edx/sanchez/peer-grading-typo
Stephen Sanchez
committed
Merge pull request #1942 from carsongee/feature/mitx/sysadmin-dashboard
carsongee
committed
loc_mapper memoize all translations
Don Mitchell
committed
Merge pull request #1935 from edx/will/ignore-symlink-staticfiles
Will Daly
committed
Location map uses a separate cache and defaults to general
Don Mitchell
committed
Document performance optimization and auth generality changes.
Don Mitchell
committed
Merge pull request #1954 from edx/dhm/loc_mapper_memoize
dmitchell
committed
fixing merge conflicts
e0d
committed
Update version of django-staticfiles library
singingwolfboy
committed
Merge pull request #1966 from edx/db/update-staticfiles-commit
singingwolfboy
committed
Merge pull request #1960 from edx/e0d/release-merge
e0d
committed