Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,568 Commits 1 Branch 0 Tags
0a7ecea623fdb397231dd672365a8bce9b27f75d
Commit Graph

21568 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gabe Mulley
0a7ecea623 Merge pull request #2721 from rocha/rocha/add-answer-values 
Add map to problem_check event with descriptions of student answers
 2014-03-03 10:19:23 -05:00
Sarina Canelake
f74a0f4f55 Merge pull request #2782 from edx/sarina/030314-language-update 
Update translations (autogenerated message)
 2014-03-02 22:38:09 -05:00
Sarina Canelake
341bc150fb Update translations (autogenerated message) 2014-03-02 22:34:06 -05:00
Gabe Mulley
94fea8e822 Add map to problem_check event with descriptions of student answers 
The map contains a human readable description of the answer if
necessary. It is useful for problem like multiple choice, when the
response of the student is replaced by a moniker. For example "choice_0"
instead of the full text.

Fixes: AN-587
 2014-03-02 21:40:45 -05:00
chrisndodge
c4401fdc7f Merge pull request #2553 from edx/cdodge/microsite-cleanup 
Address Microsite PR feedback - separate out middleware from microsite logic, shor...
 2014-02-28 17:38:19 -05:00
David Adams
52b8d0c0f0 Merge pull request #2346 from edx/dcadams/student_metrics_tab 
New tab (Metrics) in instructor dashboard
 2014-02-28 14:26:56 -08:00
Kristin Stephens
3881ffdc0d New tab (Metrics) in instructor dashboard 
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
 2014-02-28 14:01:44 -08:00
srpearce
9a23be5379 Merge pull request #2769 from edx/sylvia/documentation/STUD-1293 
Sylvia/documentation/stud 1293
 2014-02-28 16:36:31 -05:00
Chris Dodge
aa43689a93 This PR addresses the open feedback on the Microsites feature 2014-02-28 16:27:12 -05:00
Sylvia Pearce
19707d2776 Edits to polls and problem randomization 2014-02-28 16:18:11 -05:00
Adam
f400f1a6a3 Merge pull request #2773 from edx/release 
Release
 2014-02-28 16:03:11 -05:00
chrisndodge
a5132493ff Merge pull request #2716 from edx/cdodge/prevent-clickjacking 
allow the prevention of the LMS/CMS from being renderable in an iframe
 2014-02-28 15:57:51 -05:00
Han Su Kim
6d3c62b237 Merge pull request #2766 from edx/han/Vagrantfile 
Removing Vagrantfile, no longer used, please see configuration repo
 2014-02-28 15:56:28 -05:00
Adam
aa2949f1ed Merge pull request #2772 from edx/ned/install-jsdraw 
Ned/install jsdraw
 2014-02-28 15:28:27 -05:00
Han Su Kim
9bccb3e45c also delete two files associated with Vagrantfile in edx-platform 2014-02-28 15:03:06 -05:00
Chris Dodge
fce30825df allow the prevention of the LMS/CMS from being renderable in an iframe 2014-02-28 14:21:07 -05:00
Dave St.Germain
a1dc347c1a Merge pull request #2767 from edx/dcs/a11y-forgot-a-label 
Add label to the checkboxes sample template.
 2014-02-28 14:19:16 -05:00
chrisndodge
38916f8528 Merge pull request #2713 from edx/cdodge/add-auth-to-wiki 
add some authorization checks to the Wiki
 2014-02-28 14:15:59 -05:00
Adam Palay
db90cd7985 update js_draw req 2014-02-28 13:53:29 -05:00
Chris Dodge
10465e3eb0 add some authorization checks to the Wiki 2014-02-28 13:36:18 -05:00
Dave St.Germain
a8a20a6a5c Merge pull request #2638 from edx/dcs/ui-confirm-dialog 
Converted javascript confirmation dialog on essay grader to modal dialog
 2014-02-28 13:34:45 -05:00
Dave St.Germain
fd59de346b Converted javascript confirmation dialog to jquery UI dialog (needs style) 2014-02-28 13:32:39 -05:00
Dave St.Germain
0a73326bca Merge pull request #2770 from edx/dcs/mat-4 
Update django-wiki revision
fixes MAT-4
 2014-02-28 13:18:56 -05:00
Dave St.Germain
7126a2283d Update django-wiki revision 2014-02-28 13:18:19 -05:00
Sylvia Pearce
3bc8a41fc1 Add polls and randomization to problem information 2014-02-28 13:15:26 -05:00
Will Daly
481344cbb6 Merge pull request #2757 from edx/will/studio-xblock-error-notification 
Add error notification for XBlocks in Studio
 2014-02-28 11:52:37 -05:00
Dave St.Germain
9826a2f19e Add label to the checkboxes sample template. 2014-02-28 11:25:42 -05:00
Ned Batchelder
0fd59939e2 Add JSdraw to INSTALLED_APPS if we can. 2014-02-28 11:24:11 -05:00
Han Su Kim
aa3a7b0e05 Removing Vagrantfile, no longer used, please see configuration repo 2014-02-28 11:23:18 -05:00
srpearce
c5439de160 Merge pull request #2764 from edx/sylvia/documentation/BLD-672 
Fix typo
 2014-02-28 09:47:32 -05:00
Sylvia Pearce
35d5d11113 Fix typo 2014-02-28 09:46:43 -05:00
David Baumgold
837a1d79fa Merge pull request #2748 from edx/db/document-staff-debug-info 
Start documenting Staff Debug Info
 2014-02-28 09:04:16 -05:00
Adam
e17ba775d4 Merge pull request #2759 from edx/release-and-merge-conflict-resolution 
Release and merge conflict resolution
 2014-02-27 18:03:41 -05:00
Adam Palay
89795191cb Merge remote-tracking branch 'origin/release' 
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
 2014-02-27 17:33:40 -05:00
Sylvia Pearce
556f6bb0a4 Further updates to Polls 2014-02-27 17:07:33 -05:00
Will Daly
fe4be011af Add error notification for XBlocks in Studio 2014-02-27 16:54:19 -05:00
Calen Pennington
9d850eec2d Fix case where both old and new transcripts are uploaded, but transcript language isn't one of the new transcripts. 2014-02-27 15:42:19 -05:00
Calen Pennington
287d84ba95 Fix youtube captions that disappeared with multi-language caption support 
[BLD-889]
 2014-02-27 15:42:19 -05:00
Sarina Canelake
988c814fa3 Merge pull request #2740 from edx/sarina/update-help-modal-language 
Add change for help modal in anticipation of i18n support
 2014-02-27 15:40:25 -05:00
srpearce
c777f9c13c Merge pull request #2755 from edx/sylvia/documentation/BLD-672 
Update video docs for multiple language transcripts
 2014-02-27 15:39:59 -05:00
Sylvia Pearce
c4d0248a73 Add xref to Add Files in Video docs 2014-02-27 15:39:00 -05:00
Frances Botsford
25833471d4 adding a little styling to the language note on the LMS help modal 2014-02-27 15:32:56 -05:00
Andy Armstrong
9cee08ea88 Merge pull request #2539 from edx/andya/nested-xblocks 
Add new container page that can display nested xblocks
 2014-02-27 15:29:57 -05:00
Sylvia Pearce
a4dde8ad46 Update video docs for multiple language transcripts 2014-02-27 15:25:14 -05:00
Andy Armstrong
fcc0231d4d Add new container page that can display nested xblocks 
This is the changes for STUD-1244, which introduces the ability for Studio to display
arbitrarily nested xblocks. In this change, a new container page is introduced which can
display nested xblocks. In particular, the xblock type of 'vertical' is special cased
to be shown inline as a collapsible section. The unit page is mostly unchanged, except
that container xblock's are shown as a link to their container page, rather than being
shown inline.
 2014-02-27 14:53:05 -05:00
chrisndodge
7884e49955 Merge pull request #2711 from edx/cdodge/throttle-forgot-password 
add some rate limiting to the password reset functionality
 2014-02-27 14:47:21 -05:00
Chris Dodge
46fa943fc2 fix method name to actually make sense 2014-02-27 13:56:58 -05:00
Will Daly
fbd2e3a0bc Merge pull request #2724 from edx/will/studio-xblock-save 
Native XBlock Studio Save UI
 2014-02-27 10:50:51 -05:00
Waheed Ahmed
4db7885336 Students not receiving credit for peer assessment. 
ORA-330
 2014-02-27 10:38:34 -05:00
Jay Zoldak
1fe453a3a7 Update schema for bok-choy database 
Finalize tests for embargo middleware app
 2014-02-27 10:27:29 -05:00