David Ormsbee
5863ba5ac4
Merge pull request #1686 from MITx/feature/vaxxxa/docs-poll-conditional-xml
...
Feature/vaxxxa/docs poll conditional xml
2013-03-22 13:30:47 -07:00
Don Mitchell
8370124e2b
Make to and from json for dates use iso format esp for timezone.
2013-03-22 16:16:32 -04:00
Don Mitchell
2dcfd1eba1
Merge pull request #1719 from MITx/feature/btalbot/studio-checklists
...
Add course checklists to Studio
2013-03-22 12:49:30 -07:00
Jay Zoldak
08c5ab3cc9
pep8 fixes
2013-03-22 11:38:58 -04: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
cahrens
a2a1478d92
Fix caching bug on back button.
2013-03-22 09:51:45 -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
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
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
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
cahrens
1ae9e9bde3
Tests for opening action links.
2013-03-21 13:56:11 -04: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
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
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
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
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
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
cahrens
fd9c29f449
Merge branch 'master' into feature/btalbot/studio-checklists
2013-03-20 16:37:56 -04:00
cahrens
6d6e144c35
Urls working.
2013-03-20 16:37:08 -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
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
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
Jay Zoldak
23364d8b0f
Merge branch 'master' into feature/zoldak/refactor-factories
2013-03-20 13:36:01 -04:00
Jay Zoldak
8428119856
Merge pull request #1696 from MITx/feature/will/coderesponse_lettuce_tests
...
Feature/will/coderesponse lettuce tests
2013-03-20 10:20:11 -07:00
Jay Zoldak
5eba299dca
Move course and item factories to xmodule.modulestore.tests
2013-03-20 12:10:18 -04:00
Jay Zoldak
192b991334
Pylint for lettuce factory refactor.
2013-03-20 11:52:15 -04:00
Jay Zoldak
6048bc2832
Pep8 fixes for factory refactor
2013-03-20 11:31:12 -04:00
chrisndodge
f7700dfc6a
Merge pull request #1700 from MITx/feature/christina/mongo-debug-toolbar
...
Reduce pep8 warnings.
2013-03-20 08:27:32 -07:00
Will Daly
5411fc765e
Refactored lettuce test of capa problems to use
...
world.css_click() helper instead of directly
calling splinter.
2013-03-20 11:27:28 -04:00
Jay Zoldak
e45ccbf389
Leave CourseEnrollment factor refactoring as a TODO.
2013-03-20 11:12:54 -04:00
Diana Huang
2415680efd
Merge pull request #1677 from MITx/victor/fix-auto-cohorting
...
Fix randomness bug in cohort placement
2013-03-20 07:50:43 -07:00
Brian Talbot
99cf432390
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-20 10:45:01 -04:00
Brian Talbot
9069d822a4
Merge branch 'master' into fix/btalbot/studio-sasscleanup
2013-03-20 10:38:07 -04:00
Diana Huang
10c6e7615b
More polish for matlab input type
2013-03-20 10:09:44 -04:00
Jay Zoldak
16773aac63
More factory refactoring.
2013-03-20 09:38:53 -04:00
Jay Zoldak
3576a3154b
Repoint factory references in lettuce tests to world.
2013-03-20 09:38:52 -04:00
Jay Zoldak
1c4ffcf122
Fix import statement for test.py
2013-03-20 09:38:52 -04:00
Jay Zoldak
74653ff8ad
Factory refactor working for lms lettuce tests.
2013-03-20 09:38:52 -04:00
