Commits · f831a0adcb35f08d911114cb7f200cf1210dd268 · edx / edx-platform · GitLab

18 Oct, 2013 21 commits
- Merge pull request #1406 from edx/post-release-2013-10-17-master · f831a0ad
```
Post release 2013 10 17 master
```
  brianhw committed Oct 18, 2013
  f831a0ad Browse Files
- Merge pull request #1403 from edx/ned/small-dictfielddata-cleanups · 009b3e9c
```
Simple cleanups of DictFieldData
```
  Ned Batchelder committed Oct 18, 2013
  009b3e9c Browse Files
- Merge pull request #1332 from edx/giulio/register-page · 19d3e31d
```
Change various text items to be more clear for users, as well as some grammar
```
  Giulio Gratta committed Oct 18, 2013
  19d3e31d Browse Files
- Merge pull request #1292 from edx/talbs/update-sass-bourbon-neat · 38153f95
```
Sass 3.2.12, Neat 1.4.0
```
  Brian Talbot committed Oct 18, 2013
  38153f95 Browse Files
- Merge pull request #1400 from edx/will/fix-grading-test · 9f1c5dd1
```
Added explicit wait to avoid reading default grading value
```
  Will Daly committed Oct 18, 2013
  9f1c5dd1 Browse Files
- Update master with hotfixes from release-2013-10-17. · aa172272
  Brian Wilson committed Oct 18, 2013
  
  aa172272 Browse Files
- updating Neat generated utility files · 3a639ece
  Brian Talbot committed Oct 18, 2013
  
  3a639ece Browse Files
- updating to Sass 3.2.12 and Neat 1.4.0 · 5bbe330c
  Brian Talbot committed Oct 18, 2013
  
  5bbe330c Browse Files
- Merge pull request #1342 from edx/anton/fix-video-multi-speed-bug · 79f11de6
```
Video player: Fix multi speed bug
```
  polesye committed Oct 18, 2013
  79f11de6 Browse Files
- Added explicit wait to avoid reading default grading value · 14b5f42c
  Will Daly committed Oct 18, 2013
  
  14b5f42c Browse Files
- Merge pull request #1307 from edx/dhm/datastore_config · 9df72360
```
Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation"...
```
  Don Mitchell committed Oct 18, 2013
  9df72360 Browse Files
- Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation"" · 8fe99a6b
```
This reverts commit a517dc20.
```
  Don Mitchell committed Oct 18, 2013
  8fe99a6b Browse Files
- Merge pull request #1394 from edx/zoldak/fix-cms-problem-acceptance · 70cea998
```
Add synchronization logic for waiting after adding components 
```
  Jay Zoldak committed Oct 18, 2013
  70cea998 Browse Files
- Merge pull request #1362 from edx/will/acceptance-test-logs · 7aff8a77
```
Write Django logs to file during acceptance tests
```
  Will Daly committed Oct 18, 2013
  7aff8a77 Browse Files
- Simple cleanups of DictFieldData · d3c7c083
```
I tried to make DictFieldData strict about only being used with one
block.  That effort failed ultimately, but these are reasonable changes
I made along the way.
```
  Ned Batchelder committed Oct 18, 2013
  d3c7c083 Browse Files
- Merge pull request #1336 from edx/anton/fix-video-display-issue · 613e7f57
```
Fix Video player display issue
```
  polesye committed Oct 18, 2013
  613e7f57 Browse Files
- Remove $.cookie. · df091e50
  polesye committed Oct 18, 2013
  
  df091e50 Browse Files
- Fix typo. · dda6fbd4
  polesye committed Oct 18, 2013
  
  dda6fbd4 Browse Files
- Add js unit tests. · 73011383
  polesye committed Oct 18, 2013
  
  73011383 Browse Files
- Add resizing. · eeab7847
  polesye committed Oct 18, 2013
  
  eeab7847 Browse Files
- Merge pull request #1395 from edx/giulio/ICE-confirm-reset · cca057df
```
Add confirm dialog to ICE reset changes
```
  Giulio Gratta committed Oct 17, 2013
  cca057df Browse Files
17 Oct, 2013 19 commits
- Merge pull request #1349 from mulby/gabe/course-id-context · c1450c83
```
add course_id to all emitted events
```
  Gabe Mulley committed Oct 17, 2013
  c1450c83 Browse Files
- Merge pull request #1357 from edx/jbau/shoppingcart-user-middleware · e5cda013
```
Jbau/shoppingcart user middleware
```
  Jason Bau committed Oct 17, 2013
  e5cda013 Browse Files
- add course_id to event context · d2b03e28
  Gabe Mulley committed Oct 17, 2013
  
  d2b03e28 Browse Files
- Merge pull request #1371 from edx/gprice/cs-request-logging · 0138322c
```
Log all comments service requests
```
  Greg Price committed Oct 17, 2013
  0138322c Browse Files
- make condition inline · 7223bb12
  Jason Bau committed Oct 17, 2013
  
  7223bb12 Browse Files
- add confirm dialog to ICE reset changes · af0239ab
  Giulio Gratta committed Oct 17, 2013
  
  af0239ab Browse Files
- Merge pull request #1377 from edx/giulio/ICE-undo · 0b8058d8
```
Tweaking ICE undo feature
```
  Giulio Gratta committed Oct 17, 2013
  0b8058d8 Browse Files
- Add synchronization logic for waiting after adding components in acceptance tests · 5d84cd06
  Jay Zoldak committed Oct 17, 2013
  
  5d84cd06 Browse Files
- Merge pull request #1186 from edx/will/js-test-xunit · e53c1f5f
```
JavaScript xunit reports.
```
  Will Daly committed Oct 17, 2013
  e53c1f5f Browse Files
- change various text items to be more clear for users, as well as some grammar · 6accfcd5
  Giulio Gratta committed Oct 17, 2013
  
  6accfcd5 Browse Files
- Merge pull request #1391 from edx/talbs/fix-lms-carouselcss · aba8fa68
```
LMS: FIX - Resolves path to vendor carousel CSS (again)
```
  Brian Talbot committed Oct 17, 2013
  aba8fa68 Browse Files
- LMS - revises pipeline vendor file references · 58548af9
  Brian Talbot committed Oct 17, 2013
  
  58548af9 Browse Files
- Merge pull request #1390 from edx/sarina/disable-student-email-settings-with-auth · b3faf5c4
```
Student Dash: Disable "Email Settings" when course isn't authorized
```
  Sarina Canelake committed Oct 17, 2013
  b3faf5c4 Browse Files
- Remove 'Email Settings' link on student dashboard for unauth courses · 9fb1d9ec
  Sarina Canelake committed Oct 17, 2013
  
  9fb1d9ec Browse Files
- update code to reflect comment · db802fb5
  Giulio Gratta committed Oct 17, 2013
  
  db802fb5 Browse Files
- Merge pull request #1388 from edx/brian/fix-email-subtask-dupes · ff7d906d
```
Check that a subtask has not already completed before running.
```
  brianhw committed Oct 17, 2013
  ff7d906d Browse Files
- js-test-tool generates xunit reports. · 7316a3dc
  Will Daly committed Oct 17, 2013
  
  7316a3dc Browse Files
- Merge pull request #1386 from edx/dhm/bug-courseid · 2678f2a1
```
Allow - ~ and . in course, branch, & block ids
```
  Don Mitchell committed Oct 17, 2013
  2678f2a1 Browse Files
- Updated testing docs · c1a5f18e
  Will Daly committed Oct 17, 2013
  
  c1a5f18e Browse Files