Commits · 85ede381c523a87c6c765571d3cd4393bb8bcdb4 · edx / edx-platform · GitLab

22 Aug, 2014 18 commits
- Merge pull request #4923 from edx/zub/bugfix/tnl56-dragdropintocollapsedunit · 85ede381
```
populate children of unit collapsed drop location
```
  Christina Roberts committed Aug 22, 2014
  85ede381 Browse Files
- Merge pull request #4940 from edx/sarina/082214-translation-update · 5c48004f
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Aug 22, 2014
  5c48004f Browse Files
- Update translations (autogenerated message) · c11764e9
  Sarina Canelake committed Aug 22, 2014
  
  c11764e9 Browse Files
- Merge pull request #4903 from edx/ahodges/doc/DOC263 · 9854c231
```
Clarify the effect of changing problems
```
  Alison Hodges committed Aug 22, 2014
  9854c231 Browse Files
- Clarify the effect of changing problems · ff162a02
  Alison Hodges committed Aug 22, 2014
  
  ff162a02 Browse Files
- Verify children are rendered before allowing drop into collapsed parent. · 4946d601
```
TNL-56
```
  cahrens committed Aug 22, 2014
  4946d601 Browse Files
- Merge pull request #4933 from Kelketek/jp_authors · 061199ca
```
Added Jonathan Piacenti to the AUTHORS file.
```
  Sarina Canelake committed Aug 22, 2014
  061199ca Browse Files
- Added Jonathan Piacenti to the AUTHORS file. · 9058375d
  Jonathan Piacenti committed Aug 22, 2014
  
  9058375d Browse Files
- Merge pull request #4927 from mitocw/cg/add_missing_endif · 9b1301df
```
Add missing endif in crystallography mako template
```
  Sarina Canelake committed Aug 22, 2014
  9b1301df Browse Files
- Merge pull request #4145 from IONISx/tusbar/rewrite-password-reset-templates · 7260094e
```
Make use of django_main for password_reset templates
```
  frances botsford committed Aug 22, 2014
  7260094e Browse Files
- Merge pull request #4869 from edx/ammar/bok-choy-video-transcript-tests-batch2 · 4815adb6
```
Bok-Choy Video Transcript Tests Batch 2
```
  muhammad-ammar committed Aug 22, 2014
  4815adb6 Browse Files
- Merge pull request #4920 from edx/oleg/allow-one-group-in-configuration · 62821c3e
```
Allow one group in a group configuration (BLD-1223)
```
  Oleg Marshev committed Aug 22, 2014
  62821c3e Browse Files
- Allow one group in a group configuration. · 7506a479
  Oleg Marshev committed Aug 22, 2014
  
  7506a479 Browse Files
- Merge pull request #4850 from edx/waheed/stud2096-fix-export-with-old-ora · c12535c5
```
Fix export course with old ORA components.
```
  Waheed Ahmed committed Aug 22, 2014
  c12535c5 Browse Files
- Merge pull request #4922 from edx/waheed/lms11228-fix-instructor-dash-analytics-count · 9a05f27c
```
Fixed analytics counts on instructor dashboard.
```
  Waheed Ahmed committed Aug 22, 2014
  9a05f27c Browse Files
- Bok-Choy Video Transcript Tests Batch 2 · 75a0d524
  Muhammad Ammar committed Aug 22, 2014
  
  75a0d524 Browse Files
- Passed cls=EdxJSONEncoder on json.dumps to fix save, edit and import. · f686e7d0
```
STUD-2096
```
  Waheed Ahmed committed Aug 22, 2014
  f686e7d0 Browse Files
- Fixed analytics counts on instructor dashboard. · b98fe5bf
```
LMS-11228
```
  Waheed Ahmed committed Aug 22, 2014
  b98fe5bf Browse Files
21 Aug, 2014 22 commits
- Merge pull request #4913 from edx/andya/handle-component-errors · 3ac3a315
```
Fix Studio to gracefully handle xblock JavaScript errors
```
  Andy Armstrong committed Aug 21, 2014
  3ac3a315 Browse Files
- Fix Studio to gracefully handle xblock JavaScript errors · d451c3e9
```
TNL-46

I've changed Studio to catch JavaScript errors when rendering xblocks, log the error, but to then continue as normal. This means that the user is still able to interact with the xblock to delete, duplicate etc. This seems reasonable as the xblock is only rendered as a WYSIWYG representation so if it isn't fully interactive that shouldn't be a big problem.
```
  Andy Armstrong committed Aug 21, 2014
  d451c3e9 Browse Files
- Merge pull request #4782 from edx/reruns/ui · 30fc0441
```
Reruns/ui
```
  Ben McMorran committed Aug 21, 2014
  30fc0441 Browse Files
- Merge pull request #4893 from edx/web-analytics/pass-ga-cookie · fa2154a6
```
Re-use GA cookie when sending server-side events to Segment.io
```
  Renzo Lucioni committed Aug 21, 2014
  fa2154a6 Browse Files
- Merge pull request #4926 from edx/zoldak/update-bok · 3efc384f
```
Update bok-choy version
```
  Jesse Zoldak committed Aug 21, 2014
  3efc384f Browse Files
- Fix broken rerun test · 62643a59
  Ben McMorran committed Aug 21, 2014
  
  62643a59 Browse Files
- Add missing endif in crystallography mako template · 7dbea40f
  Carson Gee committed Aug 21, 2014
  
  7dbea40f Browse Files
- Reword rerun notification · d38bd2ea
  Ben McMorran committed Aug 21, 2014
  
  d38bd2ea Browse Files
- Merge pull request #4904 from edx/talbs/studio-fix-font-weight · b69aa64c
```
Studio: FIX - Font Weights
```
  Brian Talbot committed Aug 21, 2014
  b69aa64c Browse Files
- Update bok-choy version · 337a7559
  Jesse Zoldak committed Aug 21, 2014
  
  337a7559 Browse Files
- Fix field serialization · ff525bea
  Ben McMorran committed Aug 21, 2014
  
  ff525bea Browse Files
- Make refresh clickable while courses are processing · bb90c307
  Ben McMorran committed Aug 21, 2014
  
  bb90c307 Browse Files
- More PEP8/pylint cleanup · b6d9ef3e
  Ben McMorran committed Aug 21, 2014
  
  b6d9ef3e Browse Files
- Add blank=True to rerun state display name · 883aedb5
  Ben McMorran committed Aug 21, 2014
  
  883aedb5 Browse Files
- On rerun, override the course start date · 3b6b4668
```
LMS-11011
```
  Don Mitchell committed Aug 21, 2014
  3b6b4668 Browse Files
- Unit tests for rerun · 85f5c49b
```
along w/ fixes to make them work
LMS-11011
```
  Don Mitchell committed Aug 21, 2014
  85f5c49b Browse Files
- Fix broken unicode char in CSS · 4bc672b9
  Ben McMorran committed Aug 21, 2014
  
  4bc672b9 Browse Files
- PEP8/pylint cleanup · de52f823
  Ben McMorran committed Aug 21, 2014
  
  de52f823 Browse Files
- Add test for failed course creation · ab3a8c96
  Ben McMorran committed Aug 21, 2014
  
  ab3a8c96 Browse Files
- Rename unsucceeded to in_process · 4e41a42c
  Ben McMorran committed Aug 21, 2014
  
  4e41a42c Browse Files
- Fix i18n on course outline and show error message for long names · d9432041
  Ben McMorran committed Aug 21, 2014
  
  d9432041 Browse Files
- Improve javascript test coverage · baee2da2
  Ben McMorran committed Aug 21, 2014
  
  baee2da2 Browse Files