Commits · 6ddf45e7071bf76df9daa26859d2c123e60adb19 · edx / edx-platform

09 Jun, 2014 11 commits
- Merge pull request #4029 from edx/talbs/studio-flexbile-status-notifications · 6ddf45e7
```
Studio: Flexible Status Notifications
```
  Brian Talbot committed Jun 09, 2014
  6ddf45e7 Browse Files
- Merge pull request #4002 from edx/db/move-pep8-to-setup-cfg · 44695337
```
Move .pep8 content to setup.cfg
```
  David Baumgold committed Jun 09, 2014
  44695337 Browse Files
- making system status notifications flexible based on content · 1209daa7
  Brian Talbot committed Jun 09, 2014
  
  1209daa7 Browse Files
- Merge pull request #3954 from edx/brian/fix_session_id · 8801b3a1
```
Encrypt the session id before writing to tracking logs.
```
  brianhw committed Jun 09, 2014
  8801b3a1 Browse Files
- Merge pull request #4023 from edx/jarv/downgrade-requests-oauthlib · 54c10b68
```
locking version of requests-oauthlib to 0.4.0
```
  John Jarvis committed Jun 09, 2014
  54c10b68 Browse Files
- Merge pull request #4001 from edx/will/ora2-i18n-js-strings · b33a5111
```
Serve ORA2 JavaScript i18n strings
```
  Will Daly committed Jun 09, 2014
  b33a5111 Browse Files
- Serve ORA2 JavaScript i18n strings · dc34d753
  Will Daly committed Jun 09, 2014
  
  dc34d753 Browse Files
- Merge pull request #4024 from edx/will/test-speedups · fb5037cc
```
Update test database cache
```
  Will Daly committed Jun 09, 2014
  fb5037cc Browse Files
- Update database caches to include latest migrations · c4366d74
  Will Daly committed Jun 09, 2014
  
  c4366d74 Browse Files
- Merge pull request #3978 from edx/waheed/lms2734-added-logging-for-email · 68513407
```
Added logging for sender email address on BotoServerError.
```
  Waheed Ahmed committed Jun 09, 2014
  68513407 Browse Files
- Added logging for sender email address on BotoServerError. · 200394f6
```
LMS-2734
```
  Waheed Ahmed committed Jun 09, 2014
  200394f6 Browse Files
07 Jun, 2014 1 commit

locking version of requests-oauthlib to 0.4.0 · c54b8db6

requests version 1.2.3 does not appear to be compatible with the
new version of requests-oauthlib.

requests-oathlib tries to import to_native_string in util.py:

```
File
"/root/.virtualenvs/edx-platform/local/lib/python2.7/site-packages/requests_oauthlib/oauth1_auth.py",
line 10, in <module>
    from requests.utils import to_native_string
ImportError: cannot import name to_native_string
```

committed Jun 07, 2014

c54b8db6 Browse Files

06 Jun, 2014 24 commits
- Merge pull request #4019 from lduarte1991/lduarte-harvardx-pr2 · 7beaf4ed
```
Annotation Tools Reverting commit @3bfb633f and updating openseadragon.js for latest build
```
  Julia Hansbrough committed Jun 06, 2014
  7beaf4ed Browse Files
- Merge pull request #3945 from edx/clytwynec/rake2paver-tests · 6c6f67dc
```
Deprecated unit tests from rake to paver
```
  clytwynec committed Jun 06, 2014
  6c6f67dc Browse Files
- Merge pull request #3944 from edx/zoldak/bok-choy-user-not-staff · 1cf6b5f4
```
Bok choy tests should not all run as global staff
```
  Jay Zoldak committed Jun 06, 2014
  1cf6b5f4 Browse Files
- Reverting commit @3bfb633f and updating openseadragon.js for latest build · 894428ea
  lduarte1991 committed Jun 06, 2014
  
  894428ea Browse Files
- Remove unused `verbose` property · e159ff9b
  David Baumgold committed Jun 06, 2014
  
  e159ff9b Browse Files
- Set verbosity on paver test tasks · 4221bf9e
  David Baumgold committed Jun 06, 2014
  
  4221bf9e Browse Files
- updating diff-cover, adding --compare-branch feature to paver task · da6d70a9
  Christine Lytwynec committed Jun 06, 2014
  
  da6d70a9 Browse Files
- Deprecated unit tests from rake to paver · 2e2136d3
  Christine Lytwynec committed Jun 06, 2014
  
  2e2136d3 Browse Files
- Reuse course creator user in bok-choy tests and have them not be global staff · 00d5c5b4
  Jay Zoldak committed Jun 06, 2014
  
  00d5c5b4 Browse Files
- Merge pull request #4016 from edx/jrbl/bugfix_lxml_flattening · fa9a022c
```
Bugfix certificates request queue HTML flattening
```
  Joe Blaylock committed Jun 06, 2014
  fa9a022c Browse Files
- Merge pull request #3975 from edx/ahodges/documentation/DOC307 · 1b58ca5d
```
Ahodges/documentation/doc307
```
  Alison Hodges committed Jun 06, 2014
  1b58ca5d Browse Files
- Added new section on states, image, fixed old images · 60b38ba8
  Alison Hodges committed Jun 06, 2014
  
  60b38ba8 Browse Files
- Merge pull request #3969 from lduarte1991/lduarte-harvardx-pr2 · d2b26991
```
Annotation Tool: Urgent update for ChinaX AB Testing
```
  Julia Hansbrough committed Jun 06, 2014
  d2b26991 Browse Files
- Merge pull request #4017 from edx/ned/fix-duplicate-xmodule-tests · 3584d571
```
Remove duplicates in a class list so tests aren't duplicated
```
  Ned Batchelder committed Jun 06, 2014
  3584d571 Browse Files
- Move .pep8 content to setup.cfg · f45840ac
  David Baumgold committed Jun 06, 2014
  
  f45840ac Browse Files
- Remove duplicates in a class list so tests aren't duplicated · ec5aee29
  Ned Batchelder committed Jun 06, 2014
  
  ec5aee29 Browse Files
- Merge pull request #3960 from edx/db/update-ddt · 30815dba
```
Update ddt to 0.8.0
```
  David Baumgold committed Jun 06, 2014
  30815dba Browse Files
- Merge pull request #2 from lduarte1991/lduarte-harvardx-pr3 · dc9ae84e
```
Annotation Tools: Fix delete bug and factor out xmodule settings
```
  lduarte1991 committed Jun 06, 2014
  dc9ae84e Browse Files
- Annotator Tool: Fixed delete bug and factored out settings · 3bfb633f
```
Removed print context
```
  lduarte1991 committed Jun 06, 2014
  3bfb633f Browse Files
- Bugfix certificates request queue HTML flattening · 277dcb11
  Joe Blaylock committed Jun 06, 2014
  
  277dcb11 Browse Files
- Merge pull request #3965 from edx/db/django-babel-underscore · 8dd4731d
```
Extract i18n strings from *.underscore files using django-babel-underscore
```
  David Baumgold committed Jun 06, 2014
  8dd4731d Browse Files
- Annotation Tools: Added CommonAnnotatorMixin · 54974a51
  lduarte1991 committed Jun 06, 2014
  
  54974a51 Browse Files
- Merge pull request #4013 from edx/zoldak/disable-cc-test · 210bffd4
```
Skip video cc test BLD-1115
```
  Jay Zoldak committed Jun 06, 2014
  210bffd4 Browse Files
- Skip video cc test BLD-1115 · d837cdc5
  Jay Zoldak committed Jun 06, 2014
  
  d837cdc5 Browse Files
05 Jun, 2014 4 commits
- Annotator Tools: OpaqueKeys update for Notes · 9c0d14ea
  lduarte1991 committed Jun 05, 2014
  
  9c0d14ea Browse Files
- Merge pull request #3997 from edx/benmcmorran/template-text-formatting · aca0971a
```
Reformats markdown problem templates avoid extra line breaks.
```
  benmcmorran committed Jun 05, 2014
  aca0971a Browse Files
- Merge pull request #3986 from edx/jsa/search-spell-correction · f5cfd1ef
```
Add support for search spell corrections to Forums UX.
```
  Jim Abramson committed Jun 05, 2014
  f5cfd1ef Browse Files
- Add support for search spell corrections to Forums UX. · 58c5066e
```
Co-authored-by: Brian Talbot <btalbot@edx.org>

JIRA: FOR-591
```
  jsa committed Jun 05, 2014
  58c5066e Browse Files