Calen Pennington cd862b3253 Merge remote-tracking branch 'edx/master' into opaque-keys ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/preview.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/static/js/spec/views/unit_spec.js
	cms/static/js/utils/module.js
	cms/templates/container.html
	cms/templates/studio_vertical_wrapper.html
	cms/templates/studio_xblock_wrapper.html
	common/djangoapps/student/views.py
	lms/templates/notes.html
	lms/templates/textannotation.html
	lms/templates/videoannotation.html

2014-05-22 10:52:00 -04:00

..

_static

Reorganize documentation files for i18n

2014-01-16 14:11:11 -05:00

_templates

Reorganize documentation files for i18n

2014-01-16 14:11:11 -05:00

extending_platform

JavaScript extentions doc update

2014-04-22 15:58:49 -04:00

images

Custom JavaScript Display and Grading

2014-03-28 16:01:57 -04:00

process

remove broken docs link

2014-05-19 16:35:30 -04:00

testing

added and updated pavelib/quality.py from dglance branch, deprecated rake quality tasks

2014-05-20 16:22:28 -04:00

__init__.py

Reorganize documentation files for i18n

2014-01-16 14:11:11 -05:00

analytics.rst

Added sections on documenting and debugging, clarifications

2014-05-20 12:01:29 -04:00

calc.rst

Reorganize documentation files for i18n

2014-01-16 14:11:11 -05:00

capa.rst

Reorganize documentation files for i18n

2014-01-16 14:11:11 -05:00

change_log.rst

Added sections on documenting and debugging, clarifications

2014-05-20 12:01:29 -04:00

chem.rst

Reorganize documentation files for i18n

2014-01-16 14:11:11 -05:00

cms.rst

Reorganize documentation files for i18n

2014-01-16 14:11:11 -05:00

code-considerations.rst

renamed cognitive_load.rst to code-considerations.rst

2014-05-16 09:28:50 -04:00

common-lib.rst

Add autodocs of modulestores

2014-05-19 15:48:52 -04:00

conf.py

Adding opaque keys module to system path in doc configuration

2014-05-19 13:46:07 -04:00

deploy-new-service.rst

address review comments from @nedbat

2014-05-16 09:28:05 -04:00

djangoapps-common.rst

Reorganize documentation files for i18n

2014-01-16 14:11:11 -05:00

djangoapps.rst

Reorganize documentation files for i18n

2014-01-16 14:11:11 -05:00

experiments.rst

Move experiments.rst into the en_us directory

2014-04-22 15:11:23 -04:00

i18n_translators_guide.rst

Add documentation on public sandboxes

2014-04-29 19:12:22 -04:00

i18n.rst

Very minor tweaks.

2014-02-19 14:53:45 -05:00

index.rst

renamed cognitive_load.rst to code-considerations.rst

2014-05-16 09:28:50 -04:00

lms.rst

Reorganize documentation files for i18n

2014-01-16 14:11:11 -05:00

modulestore.rst

Add autodocs of modulestores

2014-05-19 15:48:52 -04:00

opaque-keys.rst

Update opaque_keys docs

2014-05-15 16:12:40 -04:00

overview.rst

Reorganize documentation files for i18n

2014-01-16 14:11:11 -05:00

pavelib.rst

Modify paver run_all_servers to allow different settings for LMS and Studio.

2014-05-12 17:12:40 +03:00

public_sandboxes.rst

Respond to Alison comments

2014-04-29 20:30:59 -04:00

sandbox-packages.rst

Reorganize documentation files for i18n

2014-01-16 14:11:11 -05:00

symmath.rst

Reorganize documentation files for i18n

2014-01-16 14:11:11 -05:00

transcripts_acceptance_tests.odt

Reorganize documentation files for i18n

2014-01-16 14:11:11 -05:00

transcripts_workflow.odg

Reorganize documentation files for i18n

2014-01-16 14:11:11 -05:00

transcripts_workflow.pdf

Reorganize documentation files for i18n

2014-01-16 14:11:11 -05:00

transcripts.rst

Reorganize documentation files for i18n

2014-01-16 14:11:11 -05:00

video_player.rst

Move README to docs.

2014-01-21 13:56:32 +02:00

xblocks.rst

Doc: update xblock publish() function signature

2014-03-31 15:27:01 -04:00

xmodule.rst

Move README to docs.

2014-01-21 13:56:32 +02:00