Brian Talbot
e716530692
edx.org - added necessary JS and Sass to disabled login/register button when form is submitting
2013-03-25 14:52:13 -04:00
Brian Talbot
dc1a7f5d6a
edx.org - changed status message UI to be hidden by default (rather than with JS) for the time being for page load/render's sake
2013-03-25 13:59:30 -04:00
John Jarvis
ae81009a43
Changing edx marketing site cookie value to 'true'
2013-03-21 17:56:56 -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
Brian Talbot
fe59ca5b89
edx.org - replacing visual banners with updated marketing ones
2013-03-19 17:14:57 -04:00
John Jarvis
01d95b7ebe
fixing merge issues
2013-03-19 16:24:23 -04:00
John Jarvis
63d85a52dc
fixing merge issues
2013-03-19 16:22:36 -04:00
John Jarvis
78987cc400
resolving merge conflicts
2013-03-19 16:16:32 -04:00
Brian Talbot
a455c6b1e4
edx.org - added in error state revisions and modal window tweaks
2013-03-19 13:57:14 -04:00
e0d
39d451d92a
Merge pull request #1687 from MITx/hotfix/edz/pinning
...
Allow backwards compatibility for forums pinning UI.
2013-03-19 09:31:14 -07:00
chrisndodge
a245cae4ef
Merge pull request #1691 from MITx/feature/cale/fix-metadata-inheritance
...
Feature/cale/fix metadata inheritance
2013-03-19 07:56:21 -07:00
Calen Pennington
8fda5af4e4
Comment cleanup
2013-03-19 10:54:46 -04:00
Calen Pennington
0209c883bb
Remove trailing whitespace
2013-03-19 10:41:38 -04:00
Calen Pennington
94d3ccf674
Always compute the metadata inheritance tree, even on a course module, so that when walking down the tree, we always get the right data
2013-03-19 10:41:12 -04:00
Brian Talbot
dc60d107e9
edx.org - added in new login and registration visual banners per marketing request
2013-03-19 09:53:52 -04:00
Jay Zoldak
a70a23a48e
Merge pull request #1680 from MITx/feature/will/courseware_lettuce_tests
...
Feature/will/courseware lettuce tests
2013-03-18 12:24:19 -07:00
Don Mitchell
c50bf5678e
Merge pull request #1688 from MITx/fix/cdodge/add-500-404-templates-to-Studio
...
Fix/cdodge/add 500 404 templates to studio
2013-03-18 12:11:39 -07:00
Chris Dodge
3e28ffa4f7
remove import and shortened line length
2013-03-18 15:10:17 -04:00
Chris Dodge
dc78a08ce5
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/add-500-404-templates-to-Studio
2013-03-18 15:05:37 -04:00
VikParuchuri
9a59336b5e
Merge pull request #1676 from MITx/fix/vik/xblock-state-overwrite
...
Fix version handling for combined open ended
2013-03-18 11:58:38 -07:00
Jay Zoldak
b6e82afb0e
Merge pull request #1681 from MITx/fix/will/fix_broken_jasmine_lms_tests
...
Fix/will/fix broken jasmine lms tests
2013-03-18 11:53:22 -07:00
Will Daly
568f557dfc
Pep8 fixes
...
Changed constant to uppercase
2013-03-18 13:57:26 -04:00
chrisndodge
eff6f1d182
Merge pull request #1690 from MITx/feature/cale/no-student-state-instructor-dash
...
Skip over fields that are scoped to students when looping through the Co...
2013-03-18 10:21:37 -07:00
Jay Zoldak
2b14960519
Merge pull request #1689 from MITx/fix/cale/pylint-cleanup
...
Small pylint cleanup
2013-03-18 10:14:49 -07:00
Calen Pennington
3fbde821dd
Skip over fields that are scoped to students when looping through the CourseModule fields in the instructor dashboard
2013-03-18 13:09:10 -04:00
Chris Dodge
651465f1ad
add HTML templates for 404/500 errors
2013-03-18 12:56:17 -04:00
Calen Pennington
a4f10bfdaf
Small pylint cleanup
2013-03-18 12:45:46 -04:00
Chris Dodge
2b677544a5
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/add-500-404-templates-to-Studio
2013-03-18 09:39:47 -04:00
chrisndodge
27be7e159a
Merge pull request #1685 from MITx/feature/cale/string_days_early
...
Handle days_early_for_beta possibly being a string
2013-03-16 17:48:43 -07:00
Calen Pennington
9dda977ece
Handle days_early_for_beta possibly being a string
2013-03-16 20:38:32 -04:00
Carlos Andrés Rocha
1b619ac1c6
Merge pull request #1684 from MITx/content/rocha/xblock-announcement-2
...
XBlock SDK announcement
2013-03-16 14:47:50 -07:00
Carlos Andrés Rocha
a4451bdcd2
XBlock SDK announcement
...
LMS Lighthouse [#261 ]
2013-03-16 14:26:14 -07:00
David Ormsbee
8be15d8625
Merge pull request #1683 from MITx/feature/kevin/pinning_patch
...
Feature/kevin/pinning patch
2013-03-15 22:22:28 -07:00
brianhw
b5cf9b326e
Merge pull request #1679 from MITx/content/rocha/xblocks-announcement
...
Content/rocha/xblocks announcement
2013-03-15 14:27:01 -07:00
Vik Paruchuri
e4efda9a47
Reformat code
2013-03-15 16:21:36 -04:00
Will Daly
5fd1e7426d
Lettuce tests now import one_time_startup.py to ensure
...
that mongo caches are initialized for the test database.
This avoids a warning from the mongo modulestore.
2013-03-15 16:17:45 -04:00
Vik Paruchuri
cd3e88fdd5
Fix version tuples to be a dictionary
2013-03-15 16:05:38 -04:00
Vik Paruchuri
500c4ab86e
Convert versions to tuples
2013-03-15 15:40:04 -04:00
Vik Paruchuri
01b1974f50
Address review comment
2013-03-15 15:15:23 -04:00
Will Daly
3a13cd7b34
Merged changes in factories.py with version in master
2013-03-15 15:09:39 -04:00
Vik Paruchuri
b609ab0e6a
Convert to using versioninteger class
2013-03-15 15:05:47 -04:00
Vik Paruchuri
405ea8d675
Remove copy.copy
2013-03-15 14:57:48 -04:00
Vik Paruchuri
97839d9de5
Fix default version string integer issues
2013-03-15 14:52:55 -04:00
Vik Paruchuri
c34666af80
Fix version handling
2013-03-15 14:20:55 -04:00
Will Daly
e41bb8462c
Added lettuce tests for script (customresponse) problems.
...
Increased wait time for login screen to reduce false positives.
2013-03-15 14:04:22 -04:00
Will Daly
8423816076
LMS contentstore lettuce tests now dynamically create courses in mongo
...
using terrain.factories.py and capa.tests.response_xml_factory
2013-03-15 14:04:22 -04:00
Will Daly
a20a3a02bb
Refactored lettuce problem test assertion that a problem is
...
correct/incorrect/unanswered
2013-03-15 14:02:21 -04:00
Will Daly
3d8625da9c
Refactored problem lettuce test implementation
2013-03-15 14:02:21 -04:00
Will Daly
5a2a4055f8
Added lettuce test for formula problem
2013-03-15 14:02:21 -04:00
Will Daly
4d5a8e757c
Added lettuce tests for numerical problem
2013-03-15 14:02:20 -04:00
