Chris Dodge
|
7d22d48e14
|
disable the discussion cache update signal until we get solution for pickling
|
2013-03-21 15:52:48 -04:00 |
|
Chris Dodge
|
a5845a2087
|
remove discussion caching for now. It might be overkill and I need to figure out how to serialize out the resultset into the cache as writing modules into the cache causes a pickle error
|
2013-03-21 15:46:57 -04:00 |
|
cahrens
|
6b3b7fe277
|
Some cleanup.
|
2013-03-21 15:19:45 -04:00 |
|
Jay Zoldak
|
25ceea175c
|
Merge pull request #1710 from MITx/feature/will/speed_up_lettuce_tests
Feature/will/speed up lettuce tests
|
2013-03-21 12:17:07 -07:00 |
|
marco
|
7ecf0e5bc1
|
small positioning adjustments to inline pins;
|
2013-03-21 14:27:10 -04:00 |
|
cahrens
|
0a063342cf
|
Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists
|
2013-03-21 13:56:32 -04:00 |
|
cahrens
|
1ae9e9bde3
|
Tests for opening action links.
|
2013-03-21 13:56:11 -04:00 |
|
Arthur Barrett
|
76e338d82b
|
added template for notes view
|
2013-03-21 12:33:27 -04:00 |
|
Don Mitchell
|
e7727fcc6e
|
Pylint muting via docstrings and line wraps
|
2013-03-21 12:30:33 -04:00 |
|
Christina Roberts
|
dec9aea047
|
Merge pull request #1715 from MITx/fix/btalbot/studio-fontsizemixin
studio - fixing a mixin value used when defining font-size
|
2013-03-21 09:26:26 -07:00 |
|
cahrens
|
8ca6e324af
|
Merge branch 'master' into feature/btalbot/studio-checklists
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/sass/base-style.scss
cms/urls.py
|
2013-03-21 12:23:13 -04:00 |
|
Brian Talbot
|
caae29a8ac
|
studio - fixing a default mixin value used when defining font-size for elements
|
2013-03-21 12:21:02 -04:00 |
|
Christina Roberts
|
e8401cf2bb
|
Merge pull request #1643 from MITx/fix/btalbot/studio-sasscleanup
Studio Sass Cleanup
|
2013-03-21 08:45:48 -07:00 |
|
Don Mitchell
|
11c9028f52
|
Merge pull request #1712 from MITx/fix/cdodge/get-import-to-work-with-conditionals
import needs to enumerate through the fields for all content scopes. Als...
|
2013-03-21 08:44:16 -07:00 |
|
cahrens
|
f44989e516
|
Use Brian's open external method.
|
2013-03-21 11:17:31 -04:00 |
|
Don Mitchell
|
bc8c0b6db2
|
Added unit test for what broke the system, but won't catch such a
regression in future b/c the problem was persisting under one parser and
reading under another.
|
2013-03-21 11:09:55 -04:00 |
|
Will Daly
|
6728f16ae4
|
Merge branch 'feature/zoldak/refactor-factories' into feature/will/speed_up_lettuce_tests
Conflicts:
lms/djangoapps/courseware/features/problems.py
|
2013-03-21 10:49:04 -04:00 |
|
chrisndodge
|
37a673012f
|
Merge pull request #1701 from MITx/bug/orphan
Fix bug 249 the ugly way (decerebrate the moronically impotent model)
|
2013-03-21 07:21:16 -07:00 |
|
Brian Talbot
|
67c6852b5c
|
studio - checklists: removing not needed sass variable for animating height
|
2013-03-21 10:01:39 -04:00 |
|
Don Mitchell
|
ae55cd7533
|
One more unit test for json not containing expected fields.
|
2013-03-21 09:40:57 -04:00 |
|
jmclaus
|
d763a6fc3a
|
CSS from JSME doesn't affect surrounding content now
|
2013-03-21 12:19:40 +01:00 |
|
Chris Dodge
|
9cd38d115e
|
import needs to enumerate through the fields for all content scopes. Also add unit test
|
2013-03-20 21:37:09 -04:00 |
|
marco
|
f45cc6fb35
|
changes to textbook styling
|
2013-03-20 21:30:05 -04:00 |
|
Don Mitchell
|
9413364e55
|
Disambiguate the course_info url names.
|
2013-03-20 18:00:25 -04:00 |
|
Don Mitchell
|
3ea70eac9d
|
Also clean up children after sort saved.
|
2013-03-20 17:59:24 -04:00 |
|
Don Mitchell
|
bd2dd9408d
|
Unit tests and minor fixes to course_info_updates. Main fix was
returning the content in same form as it was saved rather than parroting
it back.
|
2013-03-20 17:49:03 -04:00 |
|
Will Daly
|
2fc96d5fb7
|
Fixed a merge issue about code response
|
2013-03-20 17:18:26 -04:00 |
|
Diana Huang
|
204f89d4dc
|
Make sure we are still showing the
message when we are queued as well.
|
2013-03-20 17:16:04 -04:00 |
|
Brian Talbot
|
481aa063c4
|
Merge branch 'master' into feature/btalbot/studio-checklists
|
2013-03-20 17:10:07 -04:00 |
|
Brian Talbot
|
2876554cd7
|
Merge branch 'master' into fix/btalbot/studio-sasscleanup
|
2013-03-20 17:09:38 -04:00 |
|
Will Daly
|
7a282a9c54
|
Edited comments, ran pep8
|
2013-03-20 17:08:19 -04:00 |
|
Will Daly
|
911308cba2
|
Changed check for unanswered problems so that it now looks for
an "unanswered" div or span. This is much faster than
asserting that correct/incorrect is NOT present.
|
2013-03-20 17:08:19 -04:00 |
|
Will Daly
|
f69778b367
|
Changed lettuce test log_in step to log in programatically
rather than using the login dialog.
|
2013-03-20 17:08:19 -04:00 |
|
Brian Talbot
|
3b80a90bd0
|
studio - sass cleanup: adding in more color variables, proofing box-sizing and older/rougher unit scss
|
2013-03-20 16:54:14 -04:00 |
|
cahrens
|
fd9c29f449
|
Merge branch 'master' into feature/btalbot/studio-checklists
|
2013-03-20 16:37:56 -04:00 |
|
cahrens
|
284cfcc941
|
Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists
|
2013-03-20 16:37:26 -04:00 |
|
cahrens
|
6d6e144c35
|
Urls working.
|
2013-03-20 16:37:08 -04:00 |
|
Brian Talbot
|
994ced3c61
|
studio - notifications: organizing base variables
|
2013-03-20 16:34:21 -04:00 |
|
Brian Talbot
|
38df54dc53
|
studio - moved handling scrollable and new window links into their own functions for use throughout the app and not just on doc.ready + removed unused js plugin reference
|
2013-03-20 16:19:45 -04:00 |
|
Calen Pennington
|
93eebdcd97
|
Merge pull request #1709 from MITx/fix/cdodge/dont-compute-inherited-metadata-on-course-loads-with-depth-zero
if we're loading a course module with depth = 0, then we don't need to f...
|
2013-03-20 12:45:18 -07:00 |
|
Christina Roberts
|
4131f867b4
|
Merge pull request #1694 from MITx/fix/cdodge/disable-metadata-inheritence-computation-on-import
add an array of courses to not refresh the metadata cache on writes. Thi...
|
2013-03-20 12:38:08 -07:00 |
|
Chris Dodge
|
133bd767d5
|
small refactoring to use a better semantic with regards to the parameter
|
2013-03-20 15:26:29 -04:00 |
|
Chris Dodge
|
f462cd6efa
|
if we're loading a course module with depth = 0, then we don't need to fetch/compute inherited metadata
|
2013-03-20 15:14:14 -04:00 |
|
Victor Shnayder
|
e4437b7abe
|
Merge pull request #1708 from MITx/content/rocha/replace-berkeley-logos
Update Berkeley logos
|
2013-03-20 11:47:41 -07:00 |
|
Carlos Andrés Rocha
|
c5385ff42c
|
Update Berkeley logos
LMS Lighthouse [#260]
|
2013-03-20 14:46:08 -04:00 |
|
Chris Dodge
|
5dbb153abe
|
ooops. didn't clean up the merge conflicts
|
2013-03-20 14:32:18 -04:00 |
|
Chris Dodge
|
8849ce084f
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/disable-metadata-inheritence-computation-on-import
Conflicts:
common/lib/xmodule/xmodule/modulestore/mongo.py
|
2013-03-20 14:29:43 -04:00 |
|
Diana Huang
|
af1af8c6d1
|
Address code review feedback:
- improve docstrings
- only pass in the state for a particular input and
not the whole dictionary
- refactor some common code
- minor syntax cleanup
|
2013-03-20 14:14:54 -04:00 |
|
David Ormsbee
|
f133d3181b
|
Merge pull request #1706 from MITx/fix/cale/simple-lazy-object
Force instantiation of the user before querying
|
2013-03-20 11:08:57 -07:00 |
|
Diana Huang
|
c13fe9978a
|
Merge pull request #1707 from MITx/victor/remove-dir-of-eng-job
Remove director of engineering job posting per request from Tess
|
2013-03-20 10:50:26 -07:00 |
|