Commits · 147dda73e0cd6049f3e685b8ce1964f2e275d9ea · edx / edx-platform · GitLab

12 Jun, 2014 21 commits
- Merge pull request #4076 from edx/sarina/ignore-maps · 147dda73
```
Ignore *.css.map files
```
  Sarina Canelake committed Jun 12, 2014
  147dda73 Browse Files
- Ignore *.css.map files · ca64189f
  Sarina Canelake committed Jun 12, 2014
  
  ca64189f Browse Files
- Merge pull request #4074 from edx/alex/fix_video_saved_editor · acf298e9
```
Fix failing test and update documentation of video player
```
  Alexander Kryklia committed Jun 12, 2014
  acf298e9 Browse Files
- Merge pull request #4055 from edx/sarina/fix-underscore-resource · 5bcd4c54
```
Sarina/fix underscore resource
```
  Sarina Canelake committed Jun 12, 2014
  5bcd4c54 Browse Files
- Fix failing test and update docstrings for video player · 6ea3c8cb
```
Fixes BLD-1115
```
  Alexander Kryklia committed Jun 12, 2014
  6ea3c8cb Browse Files
- Add Chinese (Hong Kong) language · 6418f6fe
  Sarina Canelake committed Jun 12, 2014
  
  6418f6fe Browse Files
- Fix Transifex configuration so we can merge translations · 52756cf8
  Sarina Canelake committed Jun 12, 2014
  
  52756cf8 Browse Files
- Merge pull request #4063 from edx/dhm/mongo_tweaks · ed2358ab
```
Fix wiki search query
```
  Don Mitchell committed Jun 12, 2014
  ed2358ab Browse Files
- Merge pull request #3462 from edx/andya/source-maps · 14ad71f2
```
Update SASS ( 3.3.5), Bourbon ( 4.0.2), Neat (1.6.0)
```
  Brian Talbot committed Jun 11, 2014
  14ad71f2 Browse Files
- Fix opaque_keys imports from hotfixes · 3adc2f0a
  Sarina Canelake committed Jun 11, 2014
  
  3adc2f0a Browse Files
- Merge branch 'release' · 7e36c350
  Sarina Canelake committed Jun 11, 2014
  
  7e36c350 Browse Files
- correcting poorly scoped Sass variables set in xmodules' .scss files to adhere to Sass 3.3 scoping · 786655f8
```
see http://blog.sass-lang.com/posts/184094-sass-33-is-released for more information on 3.3+ variable scoping
```
  Brian Talbot committed Jun 11, 2014
  786655f8 Browse Files
- correcting for updated Bourbon radial-gradient mixin syntax · 44982ae3
  Brian Talbot committed Jun 11, 2014
  
  44982ae3 Browse Files
- correcting for Bourbon deprecated inline-block() mixin · 02b07254
  Brian Talbot committed Jun 11, 2014
  
  02b07254 Browse Files
- updating Bourbon gem file to version 4.0.2 and Bourbon spec version requirement to 4.0.1 · 5150b034
  Brian Talbot committed Jun 11, 2014
  
  5150b034 Browse Files
- updating static common/static/sass bourbon/neat files · 71ea2fe2
  Brian Talbot committed Jun 11, 2014
  
  71ea2fe2 Browse Files
- setting Bourbon spec version requirement to 4.0.1 and Neat spec version requirements to 1.6.0 · ae86c2a3
  Brian Talbot committed Jun 11, 2014
  
  ae86c2a3 Browse Files
- updating Bourbon gem file to version 4.0.1 · cf635125
  Brian Talbot committed Jun 11, 2014
  
  cf635125 Browse Files
- updating Neat gem file to version 1.6.0 · eca836c9
  Brian Talbot committed Jun 11, 2014
  
  eca836c9 Browse Files
- Set sass spec version requirement to 3.3.5. · e8ca25f2
  Ben Patterson committed Jun 11, 2014
  
  e8ca25f2 Browse Files
- Update SASS pipeline to generate source maps · f3dd8aee
```
Note: this requires SASS 3.3+ so do ```bundle install```
```
  Andy Armstrong committed Jun 11, 2014
  f3dd8aee Browse Files
11 Jun, 2014 19 commits
- Merge pull request #4064 from edx/ahodges/documentation/20140611chglog · 1816f97f
```
3 entries for June -> 1 entry
```
  Alison Hodges committed Jun 11, 2014
  1816f97f Browse Files
- Fix wiki search query · 4959f3b8
```
and formatting error in a doc file.
```
  Don Mitchell committed Jun 11, 2014
  4959f3b8 Browse Files
- Merge pull request #4046 from edx/hotfix/2014-06-11 · 2e36fb29
```
Hotfix 2014-06-11
```
  Sarina Canelake committed Jun 11, 2014
  2e36fb29 Browse Files
- Merge pull request #4057 from louyihua/dark_lang · 236f36b3
```
Do not merge zh-hk into zh-tw in darklang
```
  Sarina Canelake committed Jun 11, 2014
  236f36b3 Browse Files
- Merge pull request #4033 from edx/db/kill-reviewboard · 5037d978
```
Remove unused .reviewboardrc
```
  David Baumgold committed Jun 11, 2014
  5037d978 Browse Files
- Do not merge zh-hk into zh-tw in darklang · 6d783900
  louyihua committed Jun 12, 2014
  
  6d783900 Browse Files
- Merge pull request #4056 from edx/jsa/search-spell-correction-fixes · b6bf1b88
```
clarify and internationalize the search spell correction message.
```
  Jim Abramson committed Jun 11, 2014
  b6bf1b88 Browse Files
- Merge pull request #4058 from cpennington/hotfix/lms-2830 · 13ec3698
```
Allow users that have unregistered from a verified course to re-register.
```
  Calen Pennington committed Jun 11, 2014
  13ec3698 Browse Files
- clarify and internationalize the search spell correction message. · 5dfd4d4d
  jsa committed Jun 11, 2014
  
  5dfd4d4d Browse Files
- Allow users that have unregistered from a verified course to re-register. · f6ea1622
```
Fixes LMS-2830
```
  Calen Pennington committed Jun 11, 2014
  f6ea1622 Browse Files
- Merge pull request #4035 from edx/db/jenkins-is-not-special · ff42848c
```
Move Jenkins scripts into `scripts` directory
```
  David Baumgold committed Jun 11, 2014
  ff42848c Browse Files
- Merge pull request #4042 from edx/mathewpeterson/authors · fd002500
```
Adds Mat Peterson to authors file
```
  Mathew Peterson committed Jun 11, 2014
  fd002500 Browse Files
- Merge pull request #4053 from edx/harvard-annotations-on-hotfix · dc338972
```
Harvard annotations on hotfix
```
  Julia Hansbrough committed Jun 11, 2014
  dc338972 Browse Files
- Merge pull request #4051 from edx/anton/i18n-choicetextgroup · beca9b51
```
ChoiceTextGroup i18n.
```
  Anton Stupak committed Jun 11, 2014
  beca9b51 Browse Files
- Merge pull request #4047 from edx/dhm/mongo_indices · 6d682787
```
Review all fs.files and modulestore indices
```
  Don Mitchell committed Jun 11, 2014
  6d682787 Browse Files
- Merge pull request #4034 from edx/db/kill-nginx-proxy · e0b693f1
```
Remove unused nginx.conf
```
  David Baumgold committed Jun 11, 2014
  e0b693f1 Browse Files
- 3 entries for June -> 1 entry · 48824b81
  Alison Hodges committed Jun 11, 2014
  
  48824b81 Browse Files
- Annotations Tools: i18n Make stati strings extractable · e48cc16d
```
Original changes found in this commit
https://github.com/edx/edx-platform/commit/a6bae4d238fdc6a60c8ee9f1b80ca
3512bb085eb

Conflicts:
	common/lib/xmodule/xmodule/textannotation_module.py
	common/lib/xmodule/xmodule/videoannotation_module.py
```
  lduarte1991 committed Jun 11, 2014
  e48cc16d Browse Files
- Annotation Tool: PR #4019 · 848c7165
```
Reverting commit @3bfb633f and updating openseadragon.js for latest build

Conflicts:
	common/lib/xmodule/xmodule/imageannotation_module.py
	common/lib/xmodule/xmodule/textannotation_module.py
	common/lib/xmodule/xmodule/videoannotation_module.py
```
  lduarte1991 committed Jun 11, 2014
  848c7165 Browse Files