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
Chris Dodge
dc983cb9a5
add checking for metadata that we can't support editing for in Studio. This is now an error and will have to be addressed by course authors
2013-03-22 11:15:14 -04: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
cahrens
d631509afa
Re-enable all the tests!
2013-03-22 10:28:36 -04:00
cahrens
a2a1478d92
Fix caching bug on back button.
2013-03-22 09:51:45 -04:00
cahrens
be4045cb86
Reduce pep8 warnings, move Checklistst to top of menu.
2013-03-21 22:17:46 -04:00
cahrens
8385db8518
Clean up comments.
2013-03-21 21:40:38 -04:00
cahrens
016fe196ae
Add Python unit tests, don't convert URLs every time.
2013-03-21 21:21:24 -04:00
John Jarvis
ae81009a43
Changing edx marketing site cookie value to 'true'
2013-03-21 17:56:56 -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
Arthur Barrett
7120998938
refactoring notes js
2013-03-21 17:18:45 -04:00
John Jarvis
57dd2e728c
Adding a new cookie to determine logged in status for the edx mktg site
...
When a user logs in this will drop a new cookie 'edxloggedin' that will
match the value and expire date of the django session cookie.
When a user logs out the cookie will be removed
2013-03-21 17:17:35 -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
Brian Talbot
7051a94e7b
resolved local master merge conflicts with studio sass
2013-03-21 16:15:19 -04:00
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
