Commits · 341bc150fbde06db70864e004bc649e6f04f9f58 · edx / edx-platform · GitLab

03 Mar, 2014 1 commit
- Update translations (autogenerated message) · 341bc150
  Sarina Canelake committed Mar 02, 2014
  
  341bc150 Browse Files
28 Feb, 2014 28 commits
- Merge pull request #2553 from edx/cdodge/microsite-cleanup · c4401fdc
```
Address Microsite PR feedback - separate out middleware from microsite logic, shor...
```
  chrisndodge committed Feb 28, 2014
  c4401fdc Browse Files
- Merge pull request #2346 from edx/dcadams/student_metrics_tab · 52b8d0c0
```
New tab (Metrics) in instructor dashboard
```
  David Adams committed Feb 28, 2014
  52b8d0c0 Browse Files
- New tab (Metrics) in instructor dashboard · 3881ffdc
```
Metrics tab shows student data:
  -Count of students opened a subsection
  -Grade distribution per problem

for each section/subsection of the course.

Implemented for both the old and beta dashboard
Controlled by a feature flag 'CLASS_DASHBOARD'
Data is aggregated across all students
Aggregate data computed from courseware_studentmodule
```
  Kristin Stephens committed Feb 28, 2014
  3881ffdc Browse Files
- Merge pull request #2769 from edx/sylvia/documentation/STUD-1293 · 9a23be53
```
Sylvia/documentation/stud 1293
```
  srpearce committed Feb 28, 2014
  9a23be53 Browse Files
- This PR addresses the open feedback on the Microsites feature · aa43689a
  Chris Dodge committed Feb 28, 2014
  
  aa43689a Browse Files
- Edits to polls and problem randomization · 19707d27
  Sylvia Pearce committed Feb 28, 2014
  
  19707d27 Browse Files
- Merge pull request #2773 from edx/release · f400f1a6
```
Release
```
  Adam committed Feb 28, 2014
  f400f1a6 Browse Files
- Merge pull request #2716 from edx/cdodge/prevent-clickjacking · a5132493
```
allow the prevention of the LMS/CMS from being renderable in an iframe
```
  chrisndodge committed Feb 28, 2014
  a5132493 Browse Files
- Merge pull request #2766 from edx/han/Vagrantfile · 6d3c62b2
```
Removing Vagrantfile, no longer used, please see configuration repo
```
  Han Su Kim committed Feb 28, 2014
  6d3c62b2 Browse Files
- Merge pull request #2772 from edx/ned/install-jsdraw · aa2949f1
```
Ned/install jsdraw
```
  Adam committed Feb 28, 2014
  aa2949f1 Browse Files
- also delete two files associated with Vagrantfile in edx-platform · 9bccb3e4
  Han Su Kim committed Feb 28, 2014
  
  9bccb3e4 Browse Files
- allow the prevention of the LMS/CMS from being renderable in an iframe · fce30825
  Chris Dodge committed Feb 28, 2014
  
  fce30825 Browse Files
- Merge pull request #2767 from edx/dcs/a11y-forgot-a-label · a1dc347c
```
Add label to the checkboxes sample template.
```
  Dave St.Germain committed Feb 28, 2014
  a1dc347c Browse Files
- Merge pull request #2713 from edx/cdodge/add-auth-to-wiki · 38916f85
```
add some authorization checks to the Wiki
```
  chrisndodge committed Feb 28, 2014
  38916f85 Browse Files
- update js_draw req · db90cd79
  Adam Palay committed Feb 28, 2014
  
  db90cd79 Browse Files
- add some authorization checks to the Wiki · 10465e3e
  Chris Dodge committed Feb 28, 2014
  
  10465e3e Browse Files
- Merge pull request #2638 from edx/dcs/ui-confirm-dialog · a8a20a6a
```
Converted javascript confirmation dialog on essay grader to modal dialog
```
  Dave St.Germain committed Feb 28, 2014
  a8a20a6a Browse Files
- Converted javascript confirmation dialog to jquery UI dialog (needs style) · fd59de34
  Dave St.Germain committed Feb 28, 2014
  
  fd59de34 Browse Files
- Merge pull request #2770 from edx/dcs/mat-4 · 0a73326b
```
Update django-wiki revision
fixes MAT-4
```
  Dave St.Germain committed Feb 28, 2014
  0a73326b Browse Files
- Update django-wiki revision · 7126a228
  Dave St.Germain committed Feb 28, 2014
  
  7126a228 Browse Files
- Add polls and randomization to problem information · 3bc8a41f
  Sylvia Pearce committed Feb 28, 2014
  
  3bc8a41f Browse Files
- Merge pull request #2757 from edx/will/studio-xblock-error-notification · 481344cb
```
Add error notification for XBlocks in Studio
```
  Will Daly committed Feb 28, 2014
  481344cb Browse Files
- Add label to the checkboxes sample template. · 9826a2f1
  Dave St.Germain committed Feb 28, 2014
  
  9826a2f1 Browse Files
- Add JSdraw to INSTALLED_APPS if we can. · 0fd59939
  Ned Batchelder committed Feb 28, 2014
  
  0fd59939 Browse Files
- Removing Vagrantfile, no longer used, please see configuration repo · aa3a7b0e
  Han Su Kim committed Feb 28, 2014
  
  aa3a7b0e Browse Files
- Merge pull request #2764 from edx/sylvia/documentation/BLD-672 · c5439de1
```
Fix typo
```
  srpearce committed Feb 28, 2014
  c5439de1 Browse Files
- Fix typo · 35d5d111
  Sylvia Pearce committed Feb 28, 2014
  
  35d5d111 Browse Files
- Merge pull request #2748 from edx/db/document-staff-debug-info · 837a1d79
```
Start documenting Staff Debug Info
```
  David Baumgold committed Feb 28, 2014
  837a1d79 Browse Files
27 Feb, 2014 11 commits
- Merge pull request #2759 from edx/release-and-merge-conflict-resolution · e17ba775
```
Release and merge conflict resolution
```
  Adam committed Feb 27, 2014
  e17ba775 Browse Files
- Merge remote-tracking branch 'origin/release' · 89795191
```
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
```
  Adam Palay committed Feb 27, 2014
  89795191 Browse Files
- Further updates to Polls · 556f6bb0
  Sylvia Pearce committed Feb 27, 2014
  
  556f6bb0 Browse Files
- Add error notification for XBlocks in Studio · fe4be011
  Will Daly committed Feb 27, 2014
  
  fe4be011 Browse Files
- Fix case where both old and new transcripts are uploaded, but transcript… · 9d850eec
```
Fix case where both old and new transcripts are uploaded, but transcript language isn't one of the new transcripts.
```
  Calen Pennington committed Feb 27, 2014
  9d850eec Browse Files
- Fix youtube captions that disappeared with multi-language caption support · 287d84ba
```
[BLD-889]
```
  Calen Pennington committed Feb 27, 2014
  287d84ba Browse Files
- Merge pull request #2740 from edx/sarina/update-help-modal-language · 988c814f
```
Add change for help modal in anticipation of i18n support
```
  Sarina Canelake committed Feb 27, 2014
  988c814f Browse Files
- Merge pull request #2755 from edx/sylvia/documentation/BLD-672 · c777f9c1
```
Update video docs for multiple language transcripts
```
  srpearce committed Feb 27, 2014
  c777f9c1 Browse Files
- Add xref to Add Files in Video docs · c4d0248a
  Sylvia Pearce committed Feb 27, 2014
  
  c4d0248a Browse Files
- adding a little styling to the language note on the LMS help modal · 25833471
  Frances Botsford committed Feb 27, 2014
  
  25833471 Browse Files
- Merge pull request #2539 from edx/andya/nested-xblocks · 9cee08ea
```
Add new container page that can display nested xblocks
```
  Andy Armstrong committed Feb 27, 2014
  9cee08ea Browse Files