Commits · 506a5252b2b39cb2f28d207b419de7a047a62602 · edx / edx-platform · GitLab

26 Mar, 2013 1 commit
- converting password_reset_confirm back to django template from mako · 506a5252
  John Jarvis committed Mar 26, 2013
  
  506a5252 Browse Files
25 Mar, 2013 3 commits
- edx.org - added in visual spacing for confirmed state of password recovery modal · f5aaf309
  Brian Talbot committed Mar 25, 2013
  
  f5aaf309 Browse Files
- edx.org - added necessary JS and Sass to disabled login/register button when form is submitting · e7165306
  Brian Talbot committed Mar 25, 2013
  
  e7165306 Browse Files
- edx.org - changed status message UI to be hidden by default (rather than with… · dc1a7f5d
```
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
```
  Brian Talbot committed Mar 25, 2013
  dc1a7f5d Browse Files
21 Mar, 2013 2 commits
- Changing edx marketing site cookie value to 'true' · ae81009a
  John Jarvis committed Mar 21, 2013
  
  ae81009a Browse Files
- Adding a new cookie to determine logged in status for the edx mktg site · 57dd2e72
```
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
```
  John Jarvis committed Mar 21, 2013
  57dd2e72 Browse Files
19 Mar, 2013 11 commits
- edx.org - replacing visual banners with updated marketing ones · fe59ca5b
  Brian Talbot committed Mar 19, 2013
  
  fe59ca5b Browse Files
- fixing merge issues · 01d95b7e
  John Jarvis committed Mar 19, 2013
  
  01d95b7e Browse Files
- fixing merge issues · 63d85a52
  John Jarvis committed Mar 19, 2013
  
  63d85a52 Browse Files
- resolving merge conflicts · 78987cc4
  John Jarvis committed Mar 19, 2013
  
  78987cc4 Browse Files
- edx.org - added in error state revisions and modal window tweaks · a455c6b1
  Brian Talbot committed Mar 19, 2013
  
  a455c6b1 Browse Files
- Merge pull request #1687 from MITx/hotfix/edz/pinning · 39d451d9
```
Allow backwards compatibility for forums pinning UI.
```
  e0d committed Mar 19, 2013
  39d451d9 Browse Files
- Merge pull request #1691 from MITx/feature/cale/fix-metadata-inheritance · a245cae4
```
Feature/cale/fix metadata inheritance
```
  chrisndodge committed Mar 19, 2013
  a245cae4 Browse Files
- Comment cleanup · 8fda5af4
  Calen Pennington committed Mar 19, 2013
  
  8fda5af4 Browse Files
- Remove trailing whitespace · 0209c883
  Calen Pennington committed Mar 19, 2013
  
  0209c883 Browse Files
- Always compute the metadata inheritance tree, even on a course module, so that… · 94d3ccf6
```
Always compute the metadata inheritance tree, even on a course module, so that when walking down the tree, we always get the right data
```
  Calen Pennington committed Mar 19, 2013
  94d3ccf6 Browse Files
- edx.org - added in new login and registration visual banners per marketing request · dc60d107
  Brian Talbot committed Mar 19, 2013
  
  dc60d107 Browse Files
18 Mar, 2013 13 commits
- Merge pull request #1680 from MITx/feature/will/courseware_lettuce_tests · a70a23a4
```
Feature/will/courseware lettuce tests
```
  Jay Zoldak committed Mar 18, 2013
  a70a23a4 Browse Files
- Merge pull request #1688 from MITx/fix/cdodge/add-500-404-templates-to-Studio · c50bf567
```
Fix/cdodge/add 500 404 templates to studio
```
  Don Mitchell committed Mar 18, 2013
  c50bf567 Browse Files
- remove import and shortened line length · 3e28ffa4
  Chris Dodge committed Mar 18, 2013
  
  3e28ffa4 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/add-500-404-templates-to-Studio · dc78a08c
  Chris Dodge committed Mar 18, 2013
  
  dc78a08c Browse Files
- Merge pull request #1676 from MITx/fix/vik/xblock-state-overwrite · 9a59336b
```
Fix version handling for combined open ended
```
  VikParuchuri committed Mar 18, 2013
  9a59336b Browse Files
- Merge pull request #1681 from MITx/fix/will/fix_broken_jasmine_lms_tests · b6e82afb
```
Fix/will/fix broken jasmine lms tests
```
  Jay Zoldak committed Mar 18, 2013
  b6e82afb Browse Files
- Pep8 fixes · 568f557d
```
Changed constant to uppercase
```
  Will Daly committed Mar 18, 2013
  568f557d Browse Files
- Merge pull request #1690 from MITx/feature/cale/no-student-state-instructor-dash · eff6f1d1
```
Skip over fields that are scoped to students when looping through the Co...
```
  chrisndodge committed Mar 18, 2013
  eff6f1d1 Browse Files
- Merge pull request #1689 from MITx/fix/cale/pylint-cleanup · 2b149605
```
Small pylint cleanup
```
  Jay Zoldak committed Mar 18, 2013
  2b149605 Browse Files
- Skip over fields that are scoped to students when looping through the… · 3fbde821
```
Skip over fields that are scoped to students when looping through the CourseModule fields in the instructor dashboard
```
  Calen Pennington committed Mar 18, 2013
  3fbde821 Browse Files
- add HTML templates for 404/500 errors · 651465f1
  Chris Dodge committed Mar 18, 2013
  
  651465f1 Browse Files
- Small pylint cleanup · a4f10bfd
  Calen Pennington committed Mar 18, 2013
  
  a4f10bfd Browse Files
- Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/add-500-404-templates-to-Studio · 2b677544
  Chris Dodge committed Mar 18, 2013
  
  2b677544 Browse Files
17 Mar, 2013 2 commits
- Merge pull request #1685 from MITx/feature/cale/string_days_early · 27be7e15
```
Handle days_early_for_beta possibly being a string
```
  chrisndodge committed Mar 16, 2013
  27be7e15 Browse Files
- Handle days_early_for_beta possibly being a string · 9dda977e
  Calen Pennington committed Mar 16, 2013
  
  9dda977e Browse Files
16 Mar, 2013 3 commits
- Merge pull request #1684 from MITx/content/rocha/xblock-announcement-2 · 1b619ac1
```
XBlock SDK announcement
```
  Carlos Andrés Rocha committed Mar 16, 2013
  1b619ac1 Browse Files
- XBlock SDK announcement · a4451bdc
```
LMS Lighthouse [#261]
```
  Carlos Andrés Rocha committed Mar 16, 2013
  a4451bdc Browse Files
- Merge pull request #1683 from MITx/feature/kevin/pinning_patch · 8be15d86
```
Feature/kevin/pinning patch
```
  David Ormsbee committed Mar 15, 2013
  8be15d86 Browse Files
15 Mar, 2013 5 commits
- Merge pull request #1679 from MITx/content/rocha/xblocks-announcement · b5cf9b32
```
Content/rocha/xblocks announcement
```
  brianhw committed Mar 15, 2013
  b5cf9b32 Browse Files
- Reformat code · e4efda9a
  Vik Paruchuri committed Mar 15, 2013
  
  e4efda9a Browse Files
- Lettuce tests now import one_time_startup.py to ensure · 5fd1e742
```
that mongo caches are initialized for the test database.
This avoids a warning from the mongo modulestore.
```
  Will Daly committed Mar 15, 2013
  5fd1e742 Browse Files
- Fix version tuples to be a dictionary · cd3e88fd
  Vik Paruchuri committed Mar 15, 2013
  
  cd3e88fd Browse Files
- Convert versions to tuples · 500c4ab8
  Vik Paruchuri committed Mar 15, 2013
  
  500c4ab8 Browse Files