Christina Roberts
|
1069c2c40a
|
Merge pull request #1722 from MITx/bug/btalbot/studio-pagetitles
Synced up Studio View <titles> with UI headings
|
2013-03-22 11:02:16 -07:00 |
|
Christina Roberts
|
1ea3a4e77b
|
Merge pull request #1724 from MITx/bug/btalbot/studio-viewlivebutton
studio - "view live version" of unit button label change
|
2013-03-22 10:34:55 -07:00 |
|
Brian Talbot
|
b4e6b792cf
|
studio - changed the label of view published/live version of unit presented to a user while editing a draft of the same unit
|
2013-03-22 12:01:58 -04:00 |
|
Will Daly
|
23f77a1571
|
Merge pull request #1723 from MITx/fix/zoldak/pep8-test-responsetypes
pep8 fixes on test_responsetypes.py
|
2013-03-22 08:52:12 -07:00 |
|
Jay Zoldak
|
08c5ab3cc9
|
pep8 fixes
|
2013-03-22 11:38:58 -04:00 |
|
Brian Talbot
|
420c8216aa
|
demo change to resolve push error
|
2013-03-22 11:31:47 -04:00 |
|
Brian Talbot
|
22fd8432c3
|
demo change to resolve push error
|
2013-03-22 11:31:43 -04:00 |
|
Brian Talbot
|
f11e54ddc7
|
studio - syncing up page <title> values with UI titles/headings
|
2013-03-22 11:27:16 -04:00 |
|
brianhw
|
45029e7023
|
Merge pull request #1720 from MITx/ux/marco/textbook
Ux/marco/textbook
|
2013-03-22 08:16:06 -07:00 |
|
marco
|
f8eacff683
|
styled textbook css to look closer to the discussion forum navigation
|
2013-03-22 11:04:44 -04:00 |
|
Christina Roberts
|
14e0387b20
|
Merge pull request #1716 from MITx/bug/orphan
Bug/orphan
|
2013-03-22 07:33:52 -07:00 |
|
marco
|
9fdac385e1
|
Merge branch 'master' into ux/marco/textbook
|
2013-03-22 10:29:05 -04:00 |
|
Carlos Andrés Rocha
|
4d266fa3ca
|
Merge pull request #1718 from MITx/victor/fewer-phds-more-associates
In sign up form, merge PhD-science and PhD-other, add Associate's degree
|
2013-03-21 14:35:16 -07:00 |
|
Victor Shnayder
|
3f18e5c3d7
|
In sign up form, merge PhD-science and PhD-other, add Associate's degree
Includes corresponding documentation changes.
Per request from Harvard: LH #276
|
2013-03-21 17:23:46 -04:00 |
|
David Ormsbee
|
0de9e6a6a5
|
Merge pull request #1717 from MITx/fix/cdodge/drive-by-fix
drive by fix to get proper error handling on error in change_enrollment
|
2013-03-21 13:38:44 -07:00 |
|
Chris Dodge
|
63fc2eecaf
|
drive by fix to get proper error handling
|
2013-03-21 16:32:58 -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 |
|
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 |
|
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 |
|
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 |
|
Don Mitchell
|
ae55cd7533
|
One more unit test for json not containing expected fields.
|
2013-03-21 09:40:57 -04: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 |
|
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 |
|
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 |
|
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 |
|
Victor Shnayder
|
83665515d8
|
Remove director of engineering job posting per request from Tess
|
2013-03-20 13:45:01 -04:00 |
|
Jay Zoldak
|
23364d8b0f
|
Merge branch 'master' into feature/zoldak/refactor-factories
|
2013-03-20 13:36:01 -04:00 |
|
Calen Pennington
|
154a441033
|
Only use .pk for queries, and not on inserts
|
2013-03-20 13:24:25 -04:00 |
|