Don Mitchell
|
c655c814e8
|
Merge pull request #1721 from MITx/feature/cdodge/add-no-inheritable-metadata-on-verticals-to-xlint
add checking for metadata that we can't support editing for in Studio. T...
|
2013-03-29 12:38:42 -07:00 |
|
Don Mitchell
|
80f57db7c3
|
Merge pull request #1762 from MITx/feature/cdodge/course-overview-perf
Feature/cdodge/course overview perf
|
2013-03-29 12:35:41 -07:00 |
|
Chris Dodge
|
60e295895e
|
remove unused parameter
|
2013-03-29 15:26:21 -04:00 |
|
Vik Paruchuri
|
b8e6c94dd6
|
Add in a comment
|
2013-03-29 13:57:16 -04:00 |
|
Jay Zoldak
|
a5b1428bba
|
Merge pull request #1760 from MITx/feature/will/speed_up_unit_tests
Feature/will/speed up unit tests
|
2013-03-29 10:53:10 -07:00 |
|
Vik Paruchuri
|
5aa357938d
|
Minor fixes for things that broke in the merge
|
2013-03-29 13:48:20 -04:00 |
|
Vik Paruchuri
|
65c2fd5f0c
|
Fix some post-merge errors
|
2013-03-29 13:22:13 -04:00 |
|
Vik Paruchuri
|
20bbf75fba
|
Merge remote-tracking branch 'origin/master' into fix/vik/add-oe-tab
Conflicts:
cms/djangoapps/contentstore/utils.py
cms/djangoapps/contentstore/views.py
cms/djangoapps/models/settings/course_metadata.py
|
2013-03-29 13:10:47 -04:00 |
|
Jay Zoldak
|
b63aae221e
|
small pep8 pylint and superclass fixes
|
2013-03-29 10:41:27 -04:00 |
|
Brian Talbot
|
f85e18ed3b
|
studio - resolving local merge
|
2013-03-29 10:20:08 -04:00 |
|
Chris Dodge
|
bbb53a17f8
|
add some depth optimziations for edit subsection and unit pages as well
|
2013-03-29 09:58:03 -04:00 |
|
Will Daly
|
d92533bb51
|
Test case now drops the mongo collection
|
2013-03-28 16:41:55 -04:00 |
|
Will Daly
|
86bc70c3c2
|
Reverted cms changes back
|
2013-03-28 15:00:19 -04:00 |
|
Chris Dodge
|
ee5076bda9
|
fix incorrect comment
|
2013-03-28 14:48:12 -04:00 |
|
Chris Dodge
|
cdc353b61c
|
add back dropped import
|
2013-03-28 14:07:13 -04:00 |
|
Chris Dodge
|
8fdeee06ed
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements
Conflicts:
cms/one_time_startup.py
common/lib/xmodule/xmodule/modulestore/mongo.py
|
2013-03-28 13:27:29 -04:00 |
|
Brian Talbot
|
2cd8f448f7
|
studio - resolving merge with tender widget branch
|
2013-03-28 12:48:42 -04:00 |
|
Brian Talbot
|
bc248a1d4a
|
studio - tender widget: revised styling with spam protection back in place
|
2013-03-28 12:47:08 -04:00 |
|
Brian Talbot
|
653369e3cf
|
resolving local stash merge
|
2013-03-28 12:37:58 -04:00 |
|
Will Daly
|
6f8c9b4a9f
|
Optimized ModuleStoreTestCase to reload templates only once
over all test runs.
|
2013-03-28 12:31:46 -04:00 |
|
Chris Dodge
|
1c2a8a97cd
|
remove unnecessary debug log message
|
2013-03-28 11:38:22 -04:00 |
|
Chris Dodge
|
197f52539f
|
add some unit tests
|
2013-03-28 11:37:53 -04:00 |
|
cahrens
|
b2bda10435
|
Merge branch 'master' into bug/christina/studio
Conflicts:
cms/djangoapps/contentstore/features/common.py
cms/djangoapps/contentstore/features/section.py
cms/djangoapps/contentstore/features/subsection.feature
|
2013-03-28 11:17:47 -04:00 |
|
cahrens
|
7279f9c460
|
Bug fix for grading type not showing on course outline (#258).
|
2013-03-28 10:54:10 -04:00 |
|
Jay Zoldak
|
c9a7be6b9b
|
Merge pull request #1727 from MITx/feature/will/lettuce_test_helpers
Feature/will/lettuce test helpers
|
2013-03-28 07:26:14 -07:00 |
|
cahrens
|
2d677a834c
|
Test for due dates.
|
2013-03-28 10:24:31 -04:00 |
|
Don Mitchell
|
fece937669
|
Merge pull request #1758 from MITx/fix/cdodge/use-request-scroped-cache-for-metadata
Fix/cdodge/use request scoped cache for metadata inheritance
|
2013-03-28 06:51:20 -07:00 |
|
Chris Dodge
|
3cdd973af4
|
get _cache_children to queyr both non-draft and draft versions of the children, then overwrite all non-drafts with the draft version, if available. This conforms with the semantics of the DraftMongoModuleStore
|
2013-03-28 09:28:19 -04:00 |
|
Chris Dodge
|
6c67ed1f57
|
Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/course-overview-perf
Conflicts:
common/lib/xmodule/xmodule/modulestore/mongo.py
|
2013-03-28 09:28:12 -04:00 |
|
Chris Dodge
|
b609a96902
|
ummm. forgot to commit stuff
|
2013-03-27 22:51:52 -04:00 |
|
Brian Talbot
|
c8ab45cc57
|
studio - footer help ui revamp - animation, structure, styling - WIP
|
2013-03-27 17:40:24 -04:00 |
|
Will Daly
|
9c671163fd
|
Added exc_info=True to log.warning
Changed log.exception to log.warning
|
2013-03-27 17:11:02 -04:00 |
|
Will Daly
|
f038237ee9
|
Changed log.exception to log.warning
|
2013-03-27 16:34:08 -04:00 |
|
Jay Zoldak
|
6564cc57e6
|
Fix typo with hyphen in cms lettuce feature files
|
2013-03-27 16:29:55 -04:00 |
|
Brian Talbot
|
756f75951d
|
studio - in progress work on help UI
|
2013-03-27 16:28:49 -04:00 |
|
Will Daly
|
df1be87739
|
* Changed 404 errors to 400 errors
* Removed duplicate traceback log message
* Now provide string, not Exception, as second tuple item to raise
|
2013-03-27 15:20:40 -04:00 |
|
cahrens
|
5c78218b13
|
Don't need to convert to milliseconds.
|
2013-03-27 14:52:27 -04:00 |
|
cahrens
|
22537ffd3b
|
Don't need to convert to milliseconds.
|
2013-03-27 14:51:39 -04:00 |
|
Will Daly
|
99cd3fafdb
|
Added error handling of XModule processing errors to CMS
Added tests for SchematicResponse error handling
|
2013-03-27 14:48:44 -04:00 |
|
cahrens
|
227a5e8266
|
Delete converters, move unit tests to test_fields, add new additional test cases.
|
2013-03-27 12:56:06 -04:00 |
|
Brian Talbot
|
3a4bdf19fb
|
studio - tweaking footer navigation for tender widget label
|
2013-03-27 12:26:49 -04:00 |
|
Brian Talbot
|
754e30240d
|
studio - adjusting tender widget window height based on field removal
|
2013-03-27 11:01:25 -04:00 |
|
Victor Shnayder
|
68902b8039
|
Merge pull request #1747 from MITx/fix/cdodge/should-return-404-on-bad-asset-request
if we parse an invalid location in the content store middleware, then re...
|
2013-03-27 07:09:38 -07:00 |
|
Brian Talbot
|
e3c646492c
|
studio - made provide feedback conditional for logged in users
|
2013-03-27 01:39:24 -04:00 |
|
Brian Talbot
|
74439746cc
|
studio - made provide feedback conditional for logged in users
|
2013-03-27 01:38:36 -04:00 |
|
Brian Talbot
|
2120481738
|
studio - corrected JQ selector for smoothscrolling in-page links
|
2013-03-27 01:34:25 -04:00 |
|
Brian Talbot
|
25acab497e
|
studio - corrected JQ selector for smoothscrolling in-page links
|
2013-03-27 01:33:04 -04:00 |
|
Brian Talbot
|
6889b2015b
|
studio - added in revised footer styles and fix for smoothscroll
|
2013-03-27 01:24:31 -04:00 |
|
Chris Dodge
|
b0e2c82ad3
|
actually.. return a 400 rather than a 404 because the request is malformed. Also add unit test.
|
2013-03-26 20:02:29 -04:00 |
|
Calen Pennington
|
b975d4d90c
|
Fix tests
|
2013-03-26 16:43:58 -04:00 |
|