Commits · 0f8d7c744c75372d5e99e76043cc734ac556f49e · edx / edx-platform · GitLab

13 Jun, 2013 1 commit
- Test cleanup. · 0f8d7c74
  cahrens committed Jun 13, 2013
  
  0f8d7c74 Browse Files
12 Jun, 2013 3 commits
- Cannot set String field to a dict anymore! · 6e92ddf3
  cahrens committed Jun 12, 2013
  
  6e92ddf3 Browse Files
- Be strict about ModelType expected types, rename Object as Dict. · 89d00036
  cahrens committed Jun 12, 2013
  
  89d00036 Browse Files
- Change to putting serialize/de-serialize directly in xml_module. · 86d952bf
  cahrens committed Jun 12, 2013
  
  86d952bf Browse Files
10 Jun, 2013 1 commit
- Update version of xblock. · 17c9c104
  cahrens committed Jun 10, 2013
  
  17c9c104 Browse Files
07 Jun, 2013 3 commits
- Additional test coverage. · 1273bc22
  cahrens committed Jun 07, 2013
  
  1273bc22 Browse Files
- Add test for serialize/deserialize. · f3b92312
  cahrens committed Jun 07, 2013
  
  f3b92312 Browse Files
- Move string fields, get rid of hard-coded list of booleans. · 0baec0a1
  cahrens committed Jun 07, 2013
  
  0baec0a1 Browse Files
06 Jun, 2013 22 commits
- Merge pull request #89 from edx/bug/christina/mktg-urls · 74338450
```
Bug/christina/mktg urls
```
  Christina Roberts committed Jun 06, 2013
  74338450 Browse Files
- Merge pull request #90 from edx/fix/frances/theming-background-color · d2de8e51
```
LMS Sass Variable/Background Color Fixes
```
  Brian Talbot committed Jun 06, 2013
  d2de8e51 Browse Files
- resolves background color syncing for particular page/container wrappers · 3775ac61
  Brian Talbot committed Jun 06, 2013
  
  3775ac61 Browse Files
- updated misused sass body-bg to container-bg variableon account and course views · 6a2eedbf
  Frances Botsford committed Jun 06, 2013
  
  6a2eedbf Browse Files
- Strip off https:// · c715edf5
  cahrens committed Jun 06, 2013
  
  c715edf5 Browse Files
- Bullet-proofing for MKTG_URLS. · 39397c5c
  cahrens committed Jun 06, 2013
  
  39397c5c Browse Files
- Merge pull request #88 from edx/zoldak/revert-search-push · f00b42c9
```
Revert accidental push of changes to master
```
  Jay Zoldak committed Jun 06, 2013
  f00b42c9 Browse Files
- Merge pull request #7 from edx/anton/video_tests_fix · b5ba7b82
```
Video tests fix
```
  Vasyl Nakvasiuk committed Jun 06, 2013
  b5ba7b82 Browse Files
- Merge pull request #87 from edx/jarv/read-mktg-settings · a65a0f62
```
updating mktg defaults in common.py
```
  John Jarvis committed Jun 06, 2013
  a65a0f62 Browse Files
- Revert "Merge branch 'master' of https://github.com/edx/edx-platform into slater/search" · 51b70e42
```
This reverts commit e9c5d765, reversing
changes made to 5ff9f3be.
```
  Jay Zoldak committed Jun 06, 2013
  51b70e42 Browse Files
- updating mktg defaults in common.py · 1ef8682a
  John Jarvis committed Jun 06, 2013
  
  1ef8682a Browse Files
- Merge pull request #86 from edx/jarv/read-mktg-settings · b4bbec59
```
read MKTG_URLS from env.json
```
  John Jarvis committed Jun 06, 2013
  b4bbec59 Browse Files
- read MKTG_URLS from env.json · 713d7800
  John Jarvis committed Jun 06, 2013
  
  713d7800 Browse Files
- BaseTestXmodule: create module on the fly · d0e3f99e
  Vasyl Nakvasiuk committed Jun 06, 2013
  
  d0e3f99e Browse Files
- video module: remove old methods · 45e32107
  Vasyl Nakvasiuk committed Jun 06, 2013
  
  45e32107 Browse Files
- video module: `_get_timeframe` -> `get_timeframe` · 68716f99
  Vasyl Nakvasiuk committed Jun 06, 2013
  
  68716f99 Browse Files
- add python video tests · b2571034
  Vasyl Nakvasiuk committed Jun 06, 2013
  
  b2571034 Browse Files
- Fix tests for firefox · 8b06916e
  Anto Stupak committed Jun 06, 2013
  
  8b06916e Browse Files
- adds test files for video · 7eb18fe0
  Anton Stupak committed Jun 06, 2013
  
  7eb18fe0 Browse Files
- Merge branch 'master' of https://github.com/edx/edx-platform into slater/search · e9c5d765
  Slater-Victoroff committed Jun 06, 2013
  
  e9c5d765 Browse Files
- Replaced troublesome pyes integration with direct calls made to elasticsearch rest api · 3b165da1
  Slater-Victoroff committed Jun 06, 2013
  
  3b165da1 Browse Files
- Merge pull request #81 from edx/zoldak/skip-mktg-url-link-test · 5ff9f3be
```
Skip a test that is causing intermittent failures due to the way it is ordered.
```
  brianhw committed Jun 05, 2013
  5ff9f3be Browse Files
05 Jun, 2013 10 commits
- Skip a test that is causing intermittent failures due to the way it is overriding urls · 1f284c56
  Jay Zoldak committed Jun 05, 2013
  
  1f284c56 Browse Files
- Merge pull request #80 from edx/will/fix-rake-test · 582b35a9
```
Will/fix rake test
```
  Will Daly committed Jun 05, 2013
  582b35a9 Browse Files
- Fixed issue with xargs on Mac OS X. · 359e61d0
```
Removed cleaning of reports folders, since this was
interferring with coverage reports generated
sequentially by rake test.
```
  Will Daly committed Jun 05, 2013
  359e61d0 Browse Files
- Merge pull request #79 from edx/ned/private-settings · 56385cdf
```
Developer-private settings files
```
  Ned Batchelder committed Jun 05, 2013
  56385cdf Browse Files
- Developer-private settings files · 7e8c06ca
```
Developers can have private settings files by creating
lms/envs/private.py or cms/envs/private.py.  They are imported
at the end of dev.py.  Note that they won't be imported if you
are using one of the other dev*.py variants.
```
  Ned Batchelder committed Jun 05, 2013
  7e8c06ca Browse Files
- Merge pull request #78 from edx/victor/fix-help-button · 97c788a3
```
Re-insert "if in course" check for displaying paragraph about forums.
```
  Victor Shnayder committed Jun 05, 2013
  97c788a3 Browse Files
- Re-insert "if in course" check for displaying paragraph about forums. · 1b81d063
```
Accidentally got removed in pull request 13.
```
  Victor Shnayder committed Jun 05, 2013
  1b81d063 Browse Files
- Merge pull request #68 from edx/will/diff-cover-integration · ee011597
```
Will/diff cover integration
```
  Will Daly committed Jun 05, 2013
  ee011597 Browse Files
- Merge pull request #74 from edx/fix/cdodge/about-elements-not-exporting · 5d3f6dc4
```
[STUD-244] add exporting of 'about' content as well as adding unit test checks
```
  chrisndodge committed Jun 05, 2013
  5d3f6dc4 Browse Files
- Merge pull request #75 from edx/feature/cdodge/allow-setting-of-session-cookie-name · 7fc99483
```
seems like there's a Django bug and the SESSION_COOKIE_NAME needs to be ...
```
  chrisndodge committed Jun 05, 2013
  7fc99483 Browse Files