Commits · 3885e6cf78ba405889430b3885a28d90f8012ed7 · edx / edx-platform · GitLab

16 Jan, 2014 5 commits
- Merge branch 'release' · 3885e6cf
```
Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html
```
  Don Mitchell committed Jan 16, 2014
  3885e6cf Browse Files
- Merge pull request #2152 from edx/rc/2014-01-16 · 95f4acd5
```
Release 2014-01-16
```
  Don Mitchell committed Jan 16, 2014
  95f4acd5 Browse Files
- Merge pull request #2147 from zubair-arbi/zub/bugfix/std1136-emptycoursevideo · 565769b6
```
dont update iframe src attribute if it is empty
```
  zubair-arbi committed Jan 16, 2014
  565769b6 Browse Files
- Merge pull request #2097 from zubair-arbi/zub/bugfix/std893-optionresponse · f58903a5
```
escape single quotes in optioninput (optionresponse) tags
```
  zubair-arbi committed Jan 16, 2014
  f58903a5 Browse Files
- dont update iframe src attribute if it is empty · 769c7221
```
STUD-1136
```
  zubiar-arbi committed Jan 16, 2014
  769c7221 Browse Files
15 Jan, 2014 33 commits
- Merge pull request #2186 from edx/gprice/timeago-i18n · 9075dcef
```
Internationalize our use of jquery.timeago
```
  Greg Price committed Jan 15, 2014
  9075dcef Browse Files
- Merge pull request #2167 from edx/dhm/split_block_id · 41f88344
```
Encode periods and $ in block_id map
```
  Don Mitchell committed Jan 15, 2014
  41f88344 Browse Files
- Internationalize our use of jquery.timeago · 0f09a309
```
Also get rid of an unused template and extra copies of jquery.timeago.
```
  Greg Price committed Jan 15, 2014
  0f09a309 Browse Files
- Merge pull request #2178 from cpennington/ddt-without-six · 80d54afd
```
Use a version of ddt that supports unicode w/o requiring six at runtime
```
  Calen Pennington committed Jan 15, 2014
  80d54afd Browse Files
- Merge pull request #2185 from edx/markhoeber/documentation/stud-1041 · 41d3cedc
```
Documentation accessibility
```
  Mark Hoeber committed Jan 15, 2014
  41d3cedc Browse Files
- Documentation accessibility · d4228163
```
Alt tags added to for all images. For STUD-1041
```
  Mark Hoeber committed Jan 15, 2014
  d4228163 Browse Files
- Use a version of ddt that supports unicode w/o requiring six at runtime · 4f1a420a
  Calen Pennington committed Jan 15, 2014
  
  4f1a420a Browse Files
- Merge pull request #2128 from edx/will/bok-choy-fixtures-rebase · ca180834
```
Bok-choy fixtures, Studio tests, and (some) ORA tests
```
  Will Daly committed Jan 15, 2014
  ca180834 Browse Files
- Merge pull request #2169 from edx/feature/jsa/forums-i18n-mako · 0b617fc3
```
i18n: externalize strings in discussion forums templates and python code...
```
  Jim Abramson committed Jan 15, 2014
  0b617fc3 Browse Files
- Merge pull request #2112 from edx/markhoeber/documentation/stud-1132 · 4eca32b3
```
Course Start Date Changes
```
  Mark Hoeber committed Jan 15, 2014
  4eca32b3 Browse Files
- Merge pull request #2114 from edx/markhoeber/documentation/stud-1038 · 8d4b84b8
```
Added doc for file sorting change
```
  Mark Hoeber committed Jan 15, 2014
  8d4b84b8 Browse Files
- i18n: externalize strings in discussion forums templates and python code. · dfa4a03d
```
JIRA: FOR-398, FOR-399
```
  jsa committed Jan 15, 2014
  dfa4a03d Browse Files
- Change default start date for About pages · c24820ae
```
So that About pages will display in the LMS if the user is not logged in
```
  David Baumgold committed Jan 15, 2014
  c24820ae Browse Files
- Merge pull request #2120 from edx/gprice/forum-unicode-tests · ee1651da
```
Add forum tests for non-ASCII data
```
  Greg Price committed Jan 15, 2014
  ee1651da Browse Files
- Merge pull request #2104 from edx/feature/mattdrayer/authors-addition · c523b4f0
```
First PR!  Added myself to the AUTHORS file
```
  chrisndodge committed Jan 15, 2014
  c523b4f0 Browse Files
- Merge pull request #2179 from edx/sylvia/documentation/ORA_updates · a2da19fd
```
Sylvia/documentation/ora updates
```
  Mark Hoeber committed Jan 15, 2014
  a2da19fd Browse Files
- Merge pull request #2180 from edx/usman/openended_post_hostname_argument · 7ff13786
```
Added hostname argument to openended_post command.
```
  Don Mitchell committed Jan 15, 2014
  7ff13786 Browse Files
- Merge pull request #2141 from cpennington/xblock-contract-docs · ebb5a52f
```
Add documentation of LMS/Studio features usable by XBlocks
```
  Calen Pennington committed Jan 15, 2014
  ebb5a52f Browse Files
- Merge pull request #2133 from edx/usman/openended_post_hostname_argument · 310b8196
```
Added hostname argument to openended_post command.
```
  Calen Pennington committed Jan 15, 2014
  310b8196 Browse Files
- Add scoring information · c758568d
  Sylvia Pearce committed Jan 15, 2014
  
  c758568d Browse Files
- Add documentation of LMS/Studio features usable by XBlocks · 65d051af
```
[LMS-192]
```
  Calen Pennington committed Jan 15, 2014
  65d051af Browse Files
- Merge pull request #2058 from edx/waheed/ora195-json-serialization-error-fix · a41ca43f
```
JSON serialization error fixed.
```
  Waheed Ahmed committed Jan 15, 2014
  a41ca43f Browse Files
- Merge pull request #2064 from edx/dhm/auth_consolidate · 7e029515
```
Replace authz with roles.py and reconcile their behaviors
```
  Don Mitchell committed Jan 15, 2014
  7e029515 Browse Files
- Merge pull request #2175 from edx/andya/typo · 9db8b497
```
Fix typo in the announcement template
```
  Andy Armstrong committed Jan 15, 2014
  9db8b497 Browse Files
- JSON serialization error fixed and added test for it. · b98f4e02
```
ORA-195
```
  Waheed Ahmed committed Jan 15, 2014
  b98f4e02 Browse Files
- Refactored bok-choy directory structure · 4afd5ea4
```
Added fixtures for course and xblock creation
Added bok-choy Studio tests
Added bok-choy tests for ora self- and ai- assessment
Refactored auto-auth; added staff and course-enrollment options
Removed extra javascript properties from page objects
```
  Will Daly committed Jan 15, 2014
  4afd5ea4 Browse Files
- Merge pull request #1888 from edx/flowerhack/feature/certificate-revenue-reporting · f3f0e8a5
```
Verified Certificate Reports
```
  Julia Hansbrough committed Jan 15, 2014
  f3f0e8a5 Browse Files
- Merge pull request #2150 from edx/anton/fix-negative-exponents · 4388bff8
```
Anton/fix negative exponents
```
  Alexander Kryklia committed Jan 15, 2014
  4388bff8 Browse Files
- Final iteration · 1664452a
  Julia Hansbrough committed Jan 15, 2014
  
  1664452a Browse Files
- BLD-434: Add fix for negative exponents. · 1347645e
```
Set default tolerance to 1e-3% for all responsetypes.
```
  polesye committed Jan 15, 2014
  1347645e Browse Files
- Merge pull request #1948 from edx/anton/allow-arbitrary-regex-in-stringresponse · cbe97d6f
```
Anton/allow arbitrary regex in stringresponse
```
  Alexander Kryklia committed Jan 15, 2014
  cbe97d6f Browse Files
- BLD-474: Allow multiple answers for string response. · ee1953b3
  polesye committed Jan 15, 2014
  
  ee1953b3 Browse Files
- Response to CR 1-14 · ea0ae111
  Julia Hansbrough committed Jan 15, 2014
  
  ea0ae111 Browse Files
14 Jan, 2014 2 commits
- Fix typo in the announcement template · 4436ad9a
  Andy Armstrong committed Jan 14, 2014
  
  4436ad9a Browse Files
- Add scoring information and create internal links · 3c3f2b39
  Sylvia Pearce committed Jan 14, 2014
  
  3c3f2b39 Browse Files