Commits · b580f60f8ea827d79815ddb1db28f1f5674d02c6 · edx / edx-platform · GitLab

30 Apr, 2014 12 commits
- Merge pull request #3502 from edx/markhoeber/documentation/doc-330 · b580f60f
```
Release Notes 4/29/14
```
  Mark Hoeber committed Apr 30, 2014
  b580f60f Browse Files
- Merge branch 'release' · 2bfb1b4a
  e0d committed Apr 30, 2014
  
  2bfb1b4a Browse Files
- Merge pull request #3525 from edx/clytwynec/update-bok-choy-setup-tasks-prereqs · 1c1a36a4
```
Update to bok-choy setup task prereqs
```
  clytwynec committed Apr 30, 2014
  1c1a36a4 Browse Files
- Release Notes 4/29/14 · f428540e
```
Doc-330
```
  Mark Hoeber committed Apr 30, 2014
  f428540e Browse Files
- Merge pull request #3555 from edx/zoldak/disable-test · 71b32663
```
Disable unreliable test
```
  Jay Zoldak committed Apr 30, 2014
  71b32663 Browse Files
- Merge pull request #3498 from edx/zoldak/jenkins-reset-venv · a4edd44f
```
Reset the jenkins python virtualenv before test runs.
```
  Jay Zoldak committed Apr 30, 2014
  a4edd44f Browse Files
- Updated test:bok-choy:setup task to not require that memchache or mongo be running · b69ae300
  Christine Lytwynec committed Apr 30, 2014
  
  b69ae300 Browse Files
- Disable unreliable test · 5d371581
  Jay Zoldak committed Apr 30, 2014
  
  5d371581 Browse Files
- Merge pull request #3535 from edx/christina/typo · c5ef1255
```
Minor reword to server timed out message.
```
  Christina Roberts committed Apr 30, 2014
  c5ef1255 Browse Files
- Merge pull request #3506 from edx/dcs/LMS-2562 · 5811fdc8
```
Set the page in the correct place.
```
  Dave St.Germain committed Apr 30, 2014
  5811fdc8 Browse Files
- Minor reword to server timed out message. · d250f1f0
  cahrens committed Apr 30, 2014
  
  d250f1f0 Browse Files
- Merge pull request #3451 from edx/waheed/stud1524-accessibility-labels-missing-in-problems · 37d3d4a8
```
Fixed accessibility labels are not always created in problems.
```
  Waheed Ahmed committed Apr 30, 2014
  37d3d4a8 Browse Files
29 Apr, 2014 22 commits
- Merge pull request #3521 from edx/ahodges/documentation/DOC239 · 2d7d3bf2
```
Documents in data packages are in raw format, not compressed or minified
```
  Alison Hodges committed Apr 29, 2014
  2d7d3bf2 Browse Files
- Documents in data packages are in raw format, not compressed or minified · dd71ee51
  Alison Hodges committed Apr 29, 2014
  
  dd71ee51 Browse Files
- Merge pull request #2685 from edx/jbau/lti-20-outcomes-rest · 00d52e39
```
LTI 2.0 results service endpoint 
```
  Jason Bau committed Apr 29, 2014
  00d52e39 Browse Files
- Merge pull request #3519 from edx/han/json-lint · 85228476
```
Small JSON correction
```
  Han Su Kim committed Apr 29, 2014
  85228476 Browse Files
- Merge pull request #3505 from edx/adam/google-analytics · a2817d9c
```
factor out google analytics ids (LMS-2555)
```
  Adam committed Apr 29, 2014
  a2817d9c Browse Files
- Merge pull request #3526 from edx/jsa/jasmine-fix · f7683833
```
crude fix for intermittent jasmine test failures
```
  Jim Abramson committed Apr 29, 2014
  f7683833 Browse Files
- lti 2.0 result service rest endpoint · f8c062b6
  Jason Bau committed Apr 29, 2014
  
  f8c062b6 Browse Files
- crude fix for intermittent jasmine test failures · 03977a46
  jsa committed Apr 29, 2014
  
  03977a46 Browse Files
- Merge pull request #3520 from edx/markhoeber/documentation/devdoc-changelog · d78dd92c
```
added contributor guidelines to change log
```
  Mark Hoeber committed Apr 29, 2014
  d78dd92c Browse Files
- Reset the jenkins python virtualenv before test runs. · dddac0b5
  Jay Zoldak committed Apr 29, 2014
  
  dddac0b5 Browse Files
- Merge pull request #3467 from edx/clytwynec/add-auto-auth-page-object-for-lms-tests · f4ace615
```
Add AutoAuthPage to lms pages for bok-choy tests
```
  clytwynec committed Apr 29, 2014
  f4ace615 Browse Files
- Merge pull request #3516 from edx/frances/bug/xblock-studio-editor · 021b41c2
```
Fix for xblock settings scroll
```
  frances botsford committed Apr 29, 2014
  021b41c2 Browse Files
- fixed JS link and add contributor guidelines to change log · fc3d8fcd
  Mark Hoeber committed Apr 29, 2014
  
  fc3d8fcd Browse Files
- Correcting JSON · 7f673194
  Han Su Kim committed Apr 29, 2014
  
  7f673194 Browse Files
- Merge pull request #3514 from edx/waheed/stud1514-toggle-cheatsheet-not-working · edabab34
```
Fixed advanced editor not working due to cheatsheet undefined.
```
  Waheed Ahmed committed Apr 29, 2014
  edabab34 Browse Files
- Merge pull request #3002 from edx/dcs/status-object · c5627b41
```
Convert CAPA inputtype statuses from strings to objects,
```
  Dave St.Germain committed Apr 29, 2014
  c5627b41 Browse Files
- temporary fix for xblock settings scroll · 8ed92f3c
```
UX-623
```
  Frances Botsford committed Apr 29, 2014
  8ed92f3c Browse Files
- Merge pull request #3515 from edx/zub/revert/std1441/deleteitemfromlocmapper · ce9e8d73
```
Revert "remove location of item from loc_mapper and cache"
```
  zubair-arbi committed Apr 29, 2014
  ce9e8d73 Browse Files
- Revert "remove location of item from loc_mapper and cache" · 87408d23
```
This reverts commit d2b8b4f0.
```
  zubair-arbi committed Apr 29, 2014
  87408d23 Browse Files
- Fixed advanced editor not working due to cheatsheet undefined. · a02f3f73
```
STUD-1514
```
  Waheed Ahmed committed Apr 29, 2014
  a02f3f73 Browse Files
- Revert "remove location of item from loc_mapper and cache" · 643e82ac
```
This reverts commit d2b8b4f0.
```
  zubair-arbi committed Apr 29, 2014
  643e82ac Browse Files
- Fixed accessibility labels are not always created in problems. · 4f8dbc15
```
STUD-1524
```
  Waheed Ahmed committed Apr 29, 2014
  4f8dbc15 Browse Files
28 Apr, 2014 6 commits
- Set the page in the correct place. · 14f2f67c
  Dave St.Germain committed Apr 28, 2014
  
  14f2f67c Browse Files
- factor out google analytics ids (LMS-2555) · 8ad4cdb3
  Adam Palay committed Apr 28, 2014
  
  8ad4cdb3 Browse Files
- Merge pull request #3496 from edx/markhoeber/documentation/doc-327 · c747ebdd
```
Fixed all links in release notes
```
  Mark Hoeber committed Apr 28, 2014
  c747ebdd Browse Files
- Fixed all links in release notes · 5c55b5df
```
moved links to links.rst

Doc-327
```
  Mark Hoeber committed Apr 28, 2014
  5c55b5df Browse Files
- Merge pull request #3499 from edx/markhoeber/documentation/doc-310 · df7ef989
```
Updated note about accessing wiki after hiding page
```
  Mark Hoeber committed Apr 28, 2014
  df7ef989 Browse Files
- Updated note about accessing wiki after hiding page · 1e57b107
```
doc-310
```
  Mark Hoeber committed Apr 28, 2014
  1e57b107 Browse Files