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

21590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Bau
35a3ebd92f Merge pull request #2761 from edx/jbau/add-userid-to-FieldDataCache 
Move FieldDataCache assert to check both get and get_or_create
 2014-03-03 12:08:09 -08:00
Mark Hoeber
61bf75bb16 Merge pull request #2788 from edx/sylvia/documentation/DOC-65 
Corrected info about angle brackets in labels
 2014-03-03 14:26:10 -05:00
Sylvia Pearce
42f4f948c3 Corrected info about angle brackets in labels 2014-03-03 14:25:09 -05:00
Mark Hoeber
b44d902594 Merge pull request #2787 from edx/markhoeber/documentation/stud-1332 
Removed all Push mode information
 2014-03-03 13:24:43 -05:00
Sarina Canelake
bb3bcf0337 Merge pull request #2783 from edx/sarina/remove-assert-from-validate 
Remove assert stmt from i18n validate script
 2014-03-03 12:51:55 -05:00
Usman Khalid
c0caca74a7 Merge pull request #2784 from edx/usman/lms2205-progress-page-inconsistency 
Increases precision of percentages shown in 'Total' bar on progress page
 2014-03-03 22:16:08 +05:00
marcotuts
9360760376 Merge pull request #2794 from edx/marco/bug-fix/html-xmodule 
bug fix for HTML xmodule styling which caused first line of text to be c...
 2014-03-03 11:43:52 -05:00
marco
17e95f184a bug fix for HTML xmodule styling which caused first line of text to be cut off. STUD-1380 2014-03-03 11:18:57 -05:00
Sarina Canelake
3802e8f539 Merge pull request #2779 from edx/sarina/embargo-logging 
Add logging to embargo middleware
 2014-03-03 10:59:37 -05:00
Jay Zoldak
030004bcef Merge pull request #2789 from edx/zoldak/fix-ora-test 
Import BrokenPromise
 2014-03-03 10:54:40 -05:00
Sarina Canelake
5f581958f8 Merge pull request #2790 from edx/sarina/030314-language-update 
Update translations (autogenerated message)
 2014-03-03 10:27:33 -05:00
Sarina Canelake
5fc53402ab Update translations (autogenerated message) 2014-03-03 10:25:39 -05:00
marcotuts
975c3e612e Merge pull request #2760 from edx/marco/bulk-email/images 
adding in gray versions of social icons for use in new email template. U...
 2014-03-03 10:20:30 -05:00
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
Jay Zoldak
82d48b5ab3 Import BrokenPromise 2014-03-03 10:16:04 -05:00
Mark Hoeber
60f2a25ee8 Edits from review 
stud-1332
 2014-03-03 10:13:38 -05:00
Mark Hoeber
25d4b93dec Removed all Push mode information 
We should only support Pull mode

stud-1332
 2014-03-03 09:45:11 -05:00
Usman Khalid
5e1751c346 Increases precision of percentages shown in 'Total' bar on the progress page. 
The percentages shown currently can be confusing. For example, if the true weight
of a category is 0.76925% and the student scores 100% in it, they will see '0.8%
out of a possible 1.0%'. Increasing the precision to 2 decimal places changes it
to '0.77% of a possible 0.77%'.

LMS-2205
 2014-03-03 19:03:47 +05:00
Sarina Canelake
c74f30baa4 Remove assert stmt from i18n validate script 2014-03-03 09:02:29 -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
Sarina Canelake
f79cefe19a Add logging to embargo middleware 2014-03-02 18:27:18 -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
marco
01971c6c2f adjusted color of russian social network image to be a lighter gray 2014-02-28 15:48:18 -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