Commits · e4aaf4975c3d4e5282b98a24e02ba92f50990de7 · edx / edx-platform · GitLab

25 Aug, 2014 2 commits
- Merge pull request #4899 from edx/dhm/mongo_indices · e4aaf497
```
Refactored expected indices after email w/ mongo
```
  Don Mitchell committed Aug 25, 2014
  e4aaf497 Browse Files
- Merge pull request #4879 from edx/sanchez/update-platform-header · b3f4ce23
```
Updating the platform header styles to match new site styles.
```
  Stephen Sanchez committed Aug 25, 2014
  b3f4ce23 Browse Files
22 Aug, 2014 31 commits
- Merge pull request #4936 from edx/benmcmorran/bokchoy-course-reruns · 5c6a8467
```
Add bokchoy tests for course reruns
```
  Nimisha Asthagiri committed Aug 22, 2014
  5c6a8467 Browse Files
- Merge pull request #4948 from edx/christina/last-group-config-pr · 237cf77f
```
Unflag Group Configurations, Render only existing children in staff view...
```
  Christina Roberts committed Aug 22, 2014
  237cf77f Browse Files
- Add bokchoy tests for course reruns · 098c1d59
  Ben McMorran committed Aug 22, 2014
  
  098c1d59 Browse Files
- Merge pull request #4949 from edx/zoldak/define-log-dir · da0fab1e
```
Define SELENIUM_DRIVER_LOG_DIR in paver bok-choy command
```
  Jesse Zoldak committed Aug 22, 2014
  da0fab1e Browse Files
- Define SELENIUM_DRIVER_LOG_DIR in paver bok-choy command · cc41ccb4
  Jesse Zoldak committed Aug 22, 2014
  
  cc41ccb4 Browse Files
- Unflag Group Configurations, Render only existing children in staff view of split_test. · 095b0727
  Alexander Kryklia committed Aug 22, 2014
  
  095b0727 Browse Files
- Merge pull request #4938 from edx/benmcmorran/reword-rerun-note · b875a429
```
Reword course rerun notification
```
  Ben McMorran committed Aug 22, 2014
  b875a429 Browse Files
- Merge pull request #4944 from edx/sarina/make-studio-reg-copy-match · 657610dd
```
Make Studio and LMS register pages use the same language
```
  Sarina Canelake committed Aug 22, 2014
  657610dd Browse Files
- Merge pull request #4934 from edx/benmcmorran/course-settings-error · e8fd9c08
```
Fix error when changing course details on split
```
  Ben McMorran committed Aug 22, 2014
  e8fd9c08 Browse Files
- Updating the platform header styles to match new site styles. · 03355141
```
Putting the new edx header behind a feature flag.
```
  Stephen Sanchez committed Aug 22, 2014
  03355141 Browse Files
- Make Studio and LMS register pages use the same language · e57a1551
  Sarina Canelake committed Aug 22, 2014
  
  e57a1551 Browse Files
- 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
- Reword course rerun notification · 9cb87cfd
  Ben McMorran committed Aug 22, 2014
  
  9cb87cfd 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
- Fix error when changing course details on split · e933c9fe
  Ben McMorran committed Aug 22, 2014
  
  e933c9fe 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 7 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