Commits · 2ea094e5bc83471c3ffed8b98582652df0d71c31 · edx / edx-platform · GitLab

20 Jan, 2015 15 commits
- Merge pull request #6700 from edx/alasdair/old-verification-flow-fontawesome-fix · 2ea094e5
```
ECOM-958 fixed font awesome issues with old verification flow
```
  AlasdairSwan committed Jan 20, 2015
  2ea094e5 Browse Files
- ECOM-958 fixed font awesome issues with old verification flow · 04fc722e
  AlasdairSwan committed Jan 20, 2015
  
  04fc722e Browse Files
- Merge pull request #6675 from edx/clee-MA-234-hotfix · e592eef0
```
Named_path variable now populates complete path
```
  Christopher Lee committed Jan 20, 2015
  e592eef0 Browse Files
- Merge pull request #6659 from edx/jeskew/asset_md_size_of_mongo_docs · 62495847
```
Performance test to find asset metadata size.
```
  John Eskew committed Jan 20, 2015
  62495847 Browse Files
- Named_path variable now populates complete path · b6c08ad2
  christopher lee committed Jan 20, 2015
  
  b6c08ad2 Browse Files
- Merge pull request #5237 from mtyaka/mathjax-upgrade · 11428fa6
```
Upgrade MathJax to 2.4
```
  Adam committed Jan 20, 2015
  11428fa6 Browse Files
- Merge pull request #6695 from edx/sarina/20150120-update-translations · c1df9800
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Jan 20, 2015
  c1df9800 Browse Files
- Add performance test which finds the BSON size of varying amounts · a4bbed3b
```
of asset metadata in both the old Mongo and Split modulestores.
```
  John Eskew committed Jan 20, 2015
  a4bbed3b Browse Files
- Merge pull request #6690 from edx/will/inline-user-api-forms · 284e78c2
```
Inline the user api form description calls
```
  Will Daly committed Jan 20, 2015
  284e78c2 Browse Files
- Merge pull request #6693 from benpatterson/benp/fix-pylint-error · 349a02e4
```
Resolve run_pylint error.
```
  Ben Patterson committed Jan 20, 2015
  349a02e4 Browse Files
- Merge pull request #6666 from edx/awais786/ECOM-924-unique-code-url · 9783630d
```
Awais786/ecom 924 unique code url
```
  Awais Qureshi committed Jan 20, 2015
  9783630d Browse Files
- Update translations (autogenerated message) · 503f4d95
  Sarina Canelake committed Jan 20, 2015
  
  503f4d95 Browse Files
- Merge pull request #6637 from open-craft/mtyaka/validate-chars · 0c7620a5
```
Improve JS course key validation to not allow special chars.
```
  Xavier Antoviaque committed Jan 20, 2015
  0c7620a5 Browse Files
- ECOM-924 Adding redeem code url in attached email file · b12d0071
  Awais committed Jan 20, 2015
  
  b12d0071 Browse Files
- Resolve run_pylint error. · 11613bd2
  Ben Patterson committed Jan 20, 2015
  
  11613bd2 Browse Files
19 Jan, 2015 4 commits
- Merge pull request #6685 from edx/tim/get_parent · 957e0e28
```
make use of xblock.get_parent() in LMS Student Notes
```
  Tim Babych committed Jan 19, 2015
  957e0e28 Browse Files
- Inline the user api form description calls · 0a9f9130
  Will Daly committed Jan 19, 2015
  
  0a9f9130 Browse Files
- Upgrade MathJax to 2.4. · e255f4b0
```
Several IE bugs have been fixed in 2.4.
```
  Matjaz Gregoric committed Jan 19, 2015
  e255f4b0 Browse Files
- make use of xblock.get_parent() · b0c2bc21
  Tim Babych committed Jan 19, 2015
  
  b0c2bc21 Browse Files
18 Jan, 2015 1 commit
- Merge pull request #6651 from benpatterson/benp/remove-tddium-scripts · f8a048d6
```
Remove tddium-only scripts.
```
  Ben Patterson committed Jan 18, 2015
  f8a048d6 Browse Files
17 Jan, 2015 3 commits
- Merge pull request #6191 from marcore/fix-TNL-726 · 809d09af
```
CMS fail to collectstatic when USE_CUSTOM_THEME
```
  David Baumgold committed Jan 17, 2015
  809d09af Browse Files
- Add themes files to staticfiles_dir in Studio · d65902ed
  Marco Re committed Jan 17, 2015
  
  d65902ed Browse Files
- Merge pull request #6667 from edx/anton/edxnotes-fix-ui-hat · 95cc2bb8
```
TNL-1220: Fix Harvard Text Annotation UI.
```
  Anton Stupak committed Jan 17, 2015
  95cc2bb8 Browse Files
16 Jan, 2015 17 commits
- Merge pull request #6627 from edx/jeskew/perf_test_asset_metadata_find_mongo · b14eaa03
```
Add performance test when finding asset metadata.
```
  John Eskew committed Jan 16, 2015
  b14eaa03 Browse Files
- Add performance test when finding asset metadata. · 01f2e1fd
```
Re-factor report generation and add report for "find" performance test.
```
  John Eskew committed Jan 16, 2015
  01f2e1fd Browse Files
- TNL-1220: Fix Harvard Text Annotation UI. · 1d9b5a97
  polesye committed Jan 16, 2015
  
  1d9b5a97 Browse Files
- Merge pull request #6563 from edx/ned/fix-6013 · e64d45b7
```
Fixes for #6013: Implement user service to return currently-logged-in user
```
  Ned Batchelder committed Jan 16, 2015
  e64d45b7 Browse Files
- Merge pull request #6680 from edx/sarina/add-authors · b2e2048b
```
Add Siem Kok and Steffan Sluis to AUTHORS
```
  Sarina Canelake committed Jan 16, 2015
  b2e2048b Browse Files
- Add Siem Kok and Steffan Sluis to AUTHORS · 8f377c06
  Sarina Canelake committed Jan 16, 2015
  
  8f377c06 Browse Files
- Merge pull request #6672 from edx/talbs/fix-edxnotes-links+highlights · a8cc3387
```
LMS: Student Notes - Styling links to appear in highlighted text
```
  Brian Talbot committed Jan 16, 2015
  a8cc3387 Browse Files
- Merge pull request #6676 from edx/release · dde097c9
```
Release
```
  chrisndodge committed Jan 16, 2015
  dde097c9 Browse Files
- Merge pull request #6223 from edx/feature/SOL-20 · 9ac7176b
```
Merge feature SOL-20
```
  Martyn James committed Jan 16, 2015
  9ac7176b Browse Files
- Implements SOL-20. Filtering for assets table by asset type · dcc8e956
  Martyn James committed Jan 16, 2015
  
  dcc8e956 Browse Files
- Merge pull request #6662 from edx/mobile/MA-227 · 8ed247b3
```
MA-227 Mobile announcements sort order correction.
```
  Nimisha Asthagiri committed Jan 16, 2015
  8ed247b3 Browse Files
- Merge pull request #6608 from edx/mobile/MA-216 · 8394fb71
```
MA-216 Mobile API: display unreleased courses in enrollment list.
```
  Nimisha Asthagiri committed Jan 16, 2015
  8394fb71 Browse Files
- Merge pull request #6661 from edx/hotfix/2015-01-16 · 8c45e62b
```
add a missing check for an undefined object
```
  chrisndodge committed Jan 16, 2015
  8c45e62b Browse Files
- One place in the new library code that used the old user service · 0c9d687f
  Ned Batchelder committed Jan 16, 2015
  
  0c9d687f Browse Files
- Pylint fixes to make diff-quality happy · df0e3e64
  Ned Batchelder committed Jan 16, 2015
  
  df0e3e64 Browse Files
- Implement user service to return currently-logged-in user · 7f1b60b2
```
returns XBlockuser with 2 data layers
```
  Jason Bau committed Jan 16, 2015
  7f1b60b2 Browse Files
- User service PR: fix unrelated courseware test · dd18a8e6
```
Makes lms/djangoapps/courseware/tests/test_views.py:test_index_invalid_position
actually do what it intends to do, but fixing the URL the
test client visits
```
  Jason Bau committed Jan 16, 2015
  dd18a8e6 Browse Files