Commits · 7dd763212e9a1c8f19062fa7ebf1e7c833c5b720 · edx / edx-platform · GitLab

03 May, 2013 1 commit
- edx.org - fixes to the iframe-based register button's styling · 7dd76321
  Brian Talbot committed May 03, 2013
  
  7dd76321 Browse Files
02 May, 2013 3 commits
- edx.org - resolved JQuery submit() method error on <iframe> register button actions · d7d68a1e
  Brian Talbot committed May 02, 2013
  
  d7d68a1e Browse Files
- fixing old about view, iframe updates · 59c56c26
  John Jarvis committed May 02, 2013
  
  59c56c26 Browse Files
- edx.org - added in isolated register button styling/states for <iframe>-based registration fix · 7705941a
  Brian Talbot committed May 02, 2013
  
  7705941a Browse Files
30 Apr, 2013 2 commits
- Adding mktg_iframe.html · aa895cbc
  John Jarvis committed Apr 30, 2013
  
  aa895cbc Browse Files
- Adding iframe view · 01f8c4c8
```
example:
http://localhost:8000/courses/HarvardX/CB22x/2013_Spring/mktg-about
```
  John Jarvis committed Apr 30, 2013
  01f8c4c8 Browse Files
23 Apr, 2013 1 commit
- Merge branch 'master' into drupal-new · 01e15c1e
  John Jarvis committed Apr 23, 2013
  
  01e15c1e Browse Files
11 Apr, 2013 8 commits
- Merge pull request #1846 from MITx/feature/zoldak/test-user-profile-factory · 7e35bf19
```
Convert login tests to use factories
```
  Will Daly committed Apr 11, 2013
  7e35bf19 Browse Files
- Convert login tests to use factories · bb1134b8
  Jay Zoldak committed Apr 11, 2013
  
  bb1134b8 Browse Files
- Merge pull request #1844 from MITx/feature/zoldak/cs-mock · dce0b53c
```
Create a mock comment service that will listen for HTTP requests on a port
```
  Will Daly committed Apr 11, 2013
  dce0b53c Browse Files
- pep8 and pylint cleanup of new files · 88852c4b
  Jay Zoldak committed Apr 11, 2013
  
  88852c4b Browse Files
- Create a mock comment service that will listen for HTTP requests on a port · 442141fa
  Jay Zoldak committed Apr 11, 2013
  
  442141fa Browse Files
- Merge pull request #1815 from MITx/fix/cdodge/studio-forum-improvements · c455710c
```
Fix/cdodge/studio forum improvements
```
  Christina Roberts committed Apr 11, 2013
  c455710c Browse Files
- Setting the edxloggedin cookie on registration · 0c1fd783
```
Previously it was only set for login
```
  John Jarvis committed Apr 11, 2013
  0c1fd783 Browse Files
- remove auto-provisioning because of a dependency problem between cms and lms · e0bc8233
  Chris Dodge committed Apr 11, 2013
  
  e0bc8233 Browse Files
10 Apr, 2013 14 commits
- Merge pull request #1840 from MITx/fix/cdodge/export-draft-modules · f6434ed4
```
Fix/cdodge/export draft modules
```
  Don Mitchell committed Apr 10, 2013
  f6434ed4 Browse Files
- Merge pull request #1842 from MITx/feature/christina/metadata · 4d9dd402
```
Get the "Edit High Level Source" link back in for LaTeX problems. Broken with xblock work.
```
  chrisndodge committed Apr 10, 2013
  4d9dd402 Browse Files
- Get the "Edit High Level Source" link back in. Broken with xblock work. · 40adfa95
```
https://edx.lighthouseapp.com/projects/102637-studio/tickets/273
```
  cahrens committed Apr 10, 2013
  40adfa95 Browse Files
- Adding the EDX_MKTG feature flag and links back to the marketing site · 54e5e3d3
  John Jarvis committed Apr 10, 2013
  
  54e5e3d3 Browse Files
- Merge pull request #1841 from MITx/fix/btalbot/loginregister-actions · 7102c23d
```
Fix/btalbot/loginregister actions
```
  jarv committed Apr 10, 2013
  7102c23d Browse Files
- edx.org - adding in an intermediate disabled state for login/register submit… · 22a56fdd
```
edx.org - adding in an intermediate disabled state for login/register submit buttons when the form is first processed
```
  Brian Talbot committed Apr 10, 2013
  22a56fdd Browse Files
- remove commented out code. Also fix up indents and other violations · 0a293731
  Chris Dodge committed Apr 10, 2013
  
  0a293731 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules · d9fa723e
```
Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
```
  Chris Dodge committed Apr 10, 2013
  d9fa723e Browse Files
- edx.org - adding in more UI status when processing login/register forms · b5ec11af
  Brian Talbot committed Apr 10, 2013
  
  b5ec11af Browse Files
- Merge pull request #1833 from MITx/feature/btalbot/studio-courselink · 276b86a7
```
Feature/btalbot/studio courselink
```
  Christina Roberts committed Apr 10, 2013
  276b86a7 Browse Files
- Merge branch 'master' into feature/btalbot/studio-courselink · 97e893b2
  Brian Talbot committed Apr 10, 2013
  
  97e893b2 Browse Files
- studio - revised course URL link label to match wording used elsewhere in the view/app · 01b2fefd
  Brian Talbot committed Apr 10, 2013
  
  01b2fefd Browse Files
- address some violations · 5e3ca48c
  Chris Dodge committed Apr 10, 2013
  
  5e3ca48c Browse Files
- Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements · 07b9d635
  Chris Dodge committed Apr 10, 2013
  
  07b9d635 Browse Files
09 Apr, 2013 11 commits
- Merge pull request #1832 from MITx/fix/btalbot/studio-contentmargin · 81f94fc4
```
studio - fixing a visual margin issue with the sign up/in views
```
  Christina Roberts committed Apr 09, 2013
  81f94fc4 Browse Files
- Merge pull request #1836 from MITx/style/btalbot/password-reset-complete · 7a0ddb24
```
edx.org - quick password reset complete view styling
```
  jarv committed Apr 09, 2013
  7a0ddb24 Browse Files
- edx.org - added basic styles to match previous password reset form to complete view · 86dbfd34
  Brian Talbot committed Apr 09, 2013
  
  86dbfd34 Browse Files
- Merge pull request #1835 from MITx/feature/jarv/fix-password-fields · dac88a8f
```
changing password reset fields to match what is used now
```
  Brian Talbot committed Apr 09, 2013
  dac88a8f Browse Files
- changing password reset fields to match what is used now · c3e54695
  John Jarvis committed Apr 09, 2013
  
  c3e54695 Browse Files
- Merge branch 'master' into drupal-new · 2c0b2e4d
  John Jarvis committed Apr 09, 2013
  
  2c0b2e4d Browse Files
- Fixing cookie handling for edx-mktg-loggedin · 2b309adf
  John Jarvis committed Apr 09, 2013
  
  2b309adf Browse Files
- Merge pull request #1830 from MITx/fix/cale/violations · d2ed6e2c
```
Clean up violations from ichuang's PR
```
  Ned Batchelder committed Apr 09, 2013
  d2ed6e2c Browse Files
- Merge pull request #1829 from MITx/marketing/cale/delftx-header · 5b8a410d
```
Marketing request: Lighthouse [#338, fixed]
```
  Calen Pennington committed Apr 09, 2013
  5b8a410d Browse Files
- Merge pull request #1834 from MITx/bug/christina/base · 2fce096e
```
Need to be able to access smoothScrollTop. 
```
  chrisndodge committed Apr 09, 2013
  2fce096e Browse Files
- Need to be able to access smoothScrollTop. This is a temporary change-- I'll… · f36494e5
```
Need to be able to access smoothScrollTop. This is a temporary change-- I'll come up with a proposal to namespace our helper functions in a nicer way.
```
  cahrens committed Apr 09, 2013
  f36494e5 Browse Files