Commits · b4fe23f3a220e41808344b83ed74c553db3cfe26 · edx / edx-platform · GitLab

14 Apr, 2013 1 commit
- more cleanups in CMS project · b4fe23f3
  Chris Dodge committed Apr 13, 2013
  
  b4fe23f3 Browse Files
12 Apr, 2013 19 commits
- move lines together · 3ca2bf46
  Chris Dodge committed Apr 12, 2013
  
  3ca2bf46 Browse Files
- more drive by violation fixes · 8ece6632
  Chris Dodge committed Apr 12, 2013
  
  8ece6632 Browse Files
- violation fixes · 6d6b3a59
  Chris Dodge committed Apr 12, 2013
  
  6d6b3a59 Browse Files
- Merge pull request #1852 from MITx/feature/diana/textline-trailing · d4536c65
```
Pylint and Pep8 fixes for InputTypes
```
  Diana Huang committed Apr 12, 2013
  d4536c65 Browse Files
- Pylint and Pep8 fixes · ff1189c5
  Diana Huang committed Apr 12, 2013
  
  ff1189c5 Browse Files
- Merge pull request #1843 from MITx/feature/diana/textline-trailing · 13aed417
```
Add the ability to add trailing text to textlines
```
  Diana Huang committed Apr 12, 2013
  13aed417 Browse Files
- Consolidate tests into one larger test · 06a54a8c
  Diana Huang committed Apr 12, 2013
  
  06a54a8c Browse Files
- Add the ability to handle escaped HTML characters in trailing text · ab7a6165
```
Add tests for unicode and escaped HTML characters
```
  Diana Huang committed Apr 12, 2013
  ab7a6165 Browse Files
- Remove unnecessary check and add better textline documentation · d6e722a6
  Diana Huang committed Apr 12, 2013
  
  d6e722a6 Browse Files
- Fix and create new test for trailing text · fd35b2c7
  Diana Huang committed Apr 12, 2013
  
  fd35b2c7 Browse Files
- Add trailing text to textlines, most useful for units. · c93b8076
  Diana Huang committed Apr 12, 2013
  
  c93b8076 Browse Files
- Merge pull request #1851 from MITx/fix/zoldak/test-login-pylint · 734b169e
```
fix pylint errors in test_login.py
```
  Calen Pennington committed Apr 12, 2013
  734b169e Browse Files
- fix pylint errors in test_login.py · d8c186d3
  Jay Zoldak committed Apr 12, 2013
  
  d8c186d3 Browse Files
- Merge pull request #1850 from MITx/fix/cdodge/studio-forum-improvements · e4c9e1bb
```
Fix/cdodge/studio forum improvements
```
  Don Mitchell committed Apr 12, 2013
  e4c9e1bb Browse Files
- add unit test to assert that get_items() is not using revision=None as a wildcard · 4345c8e0
  Chris Dodge committed Apr 12, 2013
  
  4345c8e0 Browse Files
- Merge pull request #1848 from MITx/fix/zoldak/test-login-pylint · fc221a09
```
Fix pylint errors
```
  Jay Zoldak committed Apr 12, 2013
  fc221a09 Browse Files
- actually the query parameter is '_id.revision' not just 'revision' · 1a3c622b
  Chris Dodge committed Apr 11, 2013
  
  1a3c622b Browse Files
- Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements · cf7d7bd2
  Chris Dodge committed Apr 11, 2013
  
  cf7d7bd2 Browse Files
- get_items has an query ambiguity with respect to revision=None. None has a… · 8fd85743
```
get_items has an query ambiguity with respect to revision=None. None has a special semantic in get_items as a wildcard, so if we query with 'None' then we'll get back both draft and non-draft items.
```
  Chris Dodge committed Apr 11, 2013
  8fd85743 Browse Files
11 Apr, 2013 8 commits
- Fix pylint errors · 1cc6a0a6
  Jay Zoldak committed Apr 11, 2013
  
  1cc6a0a6 Browse Files
- 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
- 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 10 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
- 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
- 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 2 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 #1830 from MITx/fix/cale/violations · d2ed6e2c
```
Clean up violations from ichuang's PR
```
  Ned Batchelder committed Apr 09, 2013
  d2ed6e2c Browse Files