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

19528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
e0aa8cf78a Grade report celery task and direct file push to S3 from the new instructor dashboard. 
Hook up display of grade files ready for download to new instructor dashboard.

LMS-58
 2013-11-22 10:06:10 -05:00
Ned Batchelder
8d01a36e54 Merge pull request #1742 from edx/ned/cherry-pick-pr-1740 
Ned/cherry pick pr 1740
 2013-11-21 07:44:57 -08:00
Don Mitchell
3ab17d7523 Allow colons in Locator fields. 2013-11-21 10:41:49 -05:00
Calen Pennington
fdf7ea2cc0 Merge pull request #1726 from cpennington/hotfix-fix-OEE-ajax-url 
Fix LMS-1493
 2013-11-20 13:20:45 -08:00
Calen Pennington
b4a1840344 Move xmodule_runtime.xmodule_instance registration earlier 
This allows XModules (specifically CombinedOpenEnded) to use ajax_url
during their init functions (which would, before, have thrown an
exception).

[LMS-1493]
 2013-11-20 10:15:09 -05:00
Calen Pennington
6c9ad30ee1 Update open-ended tests to load the module between 'requests' 
Under normal operation, XModules are reloaded on each request from a
student. CombinedOpenEnded modules have code that runs at initialization
that validates the students state. These changes makes that code run
during several long-form unit tests (testing CombinedOpenEnded across
multiple 'requests').

These tests are marked as expectedFailure because they now exhibit the
same failures as observed in [LMS-1493] (namely, the students state gets
reset, because CombinedOpenEnded interprets system.ajax_url raising an
error as meaning that the problem definition and the student answers are
in conflict)
 2013-11-20 10:15:09 -05:00
John Jarvis
7a24f2036c Merge pull request #1718 from edx/jarv/fix-static-url 
'ignore' shouldn't be use for ascii conversion
 2013-11-19 11:38:28 -08:00
John Jarvis
693cfdea50 'ignore' shouldn't be use for ascii conversion 
The input string is not expected to contain any unicode characters
 2013-11-19 14:34:06 -05:00
Giulio Gratta
745f45090f Merge pull request #1702 from edx/giulio/anon-user-id-yml 
Adding a YAML file to demonstrate how to include anonymized user IDs in Studio elements.
 2013-11-19 11:29:26 -08:00
Christina Roberts
d4082859f8 Merge pull request #1714 from edx/christina/fix-children 
The forcing of IDs to non-draft must happen in base.py instead of draft....
 2013-11-19 11:18:54 -08:00
John Jarvis
9206f33f30 Merge pull request #1713 from edx/jarv/fix-static-url 
fixes issue where STATIC_URL was overwritten without git.revision
 2013-11-19 10:50:11 -08:00
cahrens
705ccd01bc An empty category will result in InvalidLocationErrors. 2013-11-19 13:41:44 -05:00
John Jarvis
4067a084ee STATIC_URL_BASE for lms config 2013-11-19 13:23:54 -05:00
John Jarvis
71184220e6 convert STATIC_URL to ascii 2013-11-19 12:25:59 -05:00
cahrens
ed9a61e2d9 The forcing of IDs to non-draft must happen in base.py instead of draft.py. 
The draft.py solution only worked when the parent was also in the draft store.
 2013-11-19 12:08:29 -05:00
John Jarvis
0e6b21ef71 adding slash 2013-11-19 11:40:31 -05:00
John Jarvis
54bb55fa52 fixes issue where STATIC_URL was overwritten without git.revision 
fixes this commit - 5ec77010e3
 2013-11-19 11:35:45 -05:00
Sarina Canelake
69ef753195 Merge pull request #1641 from manuel-freire/master 
298.15 K is 25 C, not 0 (0 is defined to be at 273.15)

#os
 2013-11-19 08:25:49 -08:00
Mark Hoeber
4efafe4186 Merge pull request #1701 from edx/documentation/hoeber/stud-924 
Review all panel help text in Studio UI for Studio-924
 2013-11-19 08:22:36 -08:00
Sarina Canelake
afaf0f576e Merge pull request #1709 from edx/sarina/change-dummy-i18n-language 
Change dummy locale to Esperanto
 2013-11-19 08:19:13 -08:00
Jim Abramson
57cb983308 Merge pull request #1704 from edx/release-hotfix-2013-11-15 
merge 2013-11-15 hotfix branch to master
 2013-11-19 07:56:12 -08:00
Mark Hoeber
f5ae957a91 Studio: Review all panel help copy 
Reviewed and updated all on-page panel help text in Studio for clarity,
consistency, and brevity.  Updated template HTML files to change text

STUD-924
 2013-11-19 10:35:17 -05:00
Will Daly
a2057273ca Fix for advanced settings failure 2013-11-19 10:34:22 -05:00
Sarina Canelake
bd8fce5a8a Change dummy locale to Esperanto 2013-11-19 10:28:02 -05:00
Sarina Canelake
a2f5e260c8 Merge pull request #1699 from edx/sarina/fix-i18n-rake 
Declare PYTHONPATH in i18n:test rake task
 2013-11-19 06:59:00 -08:00
Greg Price
0b98f3c60a Merge pull request #1674 from edx/gprice/forum-500-alert 
Alert users when forum AJAX requests fail
 2013-11-19 06:56:39 -08:00
Greg Price
89924c5e61 Alert users when forum AJAX requests fail 
AJAX requests on forums pages occasionally fail (usually when a request
to the comments service times out), but the user is not made aware of
the failure. This manifests as either the system not appearing to store
state (e.g. if an attempt to flag a post fails) or something taking
forever to load. Now, a modal will pop up to alert the user that a
request has failed and instruct them to reload the page.

In the longer term, we should fix each user gesture that results in an
AJAX call to gracefully handle a failure by resetting the state of the
world appropriately and aleritng the user.

JIRA: FOR-37
 2013-11-19 09:55:49 -05:00
Greg Price
0c28858c64 Remove unused forum CoffeeScript code 2013-11-19 09:52:21 -05:00
Julia Hansbrough
dac5d2ac0e Merge pull request #1634 from edx/flowerhack/feature/refactor-to-track-enrollment 
Flowerhack/feature/refactor to track enrollment
 2013-11-19 06:27:22 -08:00
Sarina Canelake
878097d06e Provide language codes for i18n testing 2013-11-19 09:15:53 -05:00
Sarina Canelake
55590f321a Fix i18n:test rake task 2013-11-19 09:15:53 -05:00
polesye
fbf37c4c3d Merge pull request #1656 from edx/anton/fix-acceptance-test 
Video player: fix acceptance test.
 2013-11-19 05:16:05 -08:00
polesye
38163cf942 BLD-410: Add tests. 2013-11-19 14:37:14 +02:00
Manuel Freire
cdc3ad1cc4 298.15 K is 25 C, not 0 (0 is defined to be at 273.15) 
Signed-off-by:  <manuel.freire@fdi.ucm.es>
 2013-11-19 12:52:13 +01:00
Giulio Gratta
f125a604a4 Adding a YAML file to demonstrate how to include anonymized user IDs in Studio elements. 2013-11-18 14:44:46 -08:00
David Baumgold
957f318485 Merge pull request #1594 from neurolit/csrf_accessibility 
LMS: add CSRF token to register form
 2013-11-18 12:41:02 -08:00
polesye
e9b1d2102d Merge pull request #1688 from edx/anton/add-template-checkboxes 
Add template for checkboxes to studio.
 2013-11-18 11:24:25 -08:00
Giulio Gratta
c085b31e04 Merge pull request #1683 from edx/giulio/fix-video-links 
Stop video skipping links from showing up when not needed and address the issue of skip links for multiple videos.
 2013-11-18 09:44:20 -08:00
John Jarvis
07e1d3617f Merge pull request #1691 from edx/jarv/github-repo-root 
adding override for GITHUB_REPO_ROOT
 2013-11-18 08:52:39 -08:00
John Jarvis
399df1141e resolving merge conflicts 2013-11-18 11:52:26 -05:00
John Jarvis
7f0ba1b713 Merge pull request #1690 from edx/jarv/static-url 
allow override for STATIC_URL
 2013-11-18 08:50:13 -08:00
John Jarvis
f5a772135d adding override for GITHUB_REPO_ROOT 
This is the base directory for course data
 2013-11-18 11:24:45 -05:00
Giulio Gratta
122e0d4a7d Stop video skipping links from showing up when not needed and address the issue of skip links for multiple videos. 
Fixes BLD-521
 2013-11-18 08:12:06 -08:00
John Jarvis
5ec77010e3 allow override for STATIC_URL 2013-11-18 10:54:12 -05:00
Gabe Mulley
e1cc87c8d2 Merge pull request #1679 from mulby/gabe/fix-enrollment-events-from-cms 
fix emission of enrollment events from the CMS
 2013-11-18 06:44:41 -08:00
Gabe Mulley
fcd4ecfde0 Merge pull request #1678 from mulby/gabe/fix-cms-course-id-tracking 
fix spammy log messages from course_id tracking in CMS
 2013-11-18 06:44:16 -08:00
Gabe Mulley
9ad435a8b8 fix emission of enrollment events from the CMS 
I suspect there are very few circumstances that an enrollment event is emitted from the CMS, but if it ever were to happen, it would bomb out because the "crum" middleware is not used in that app.  We are hoping to replace this request caching hack in the near future, but for now it is the best option we could come up with.

I noticed the stack appear when I created a new course in my dev environment.  Presumably the course author is automatically enrolled in the course, which, causes the tracking code to bomb out.  Luckily we catch the error and just log it, but we really should be capturing this type of enrollment event.
 2013-11-18 08:48:46 -05:00
Gabe Mulley
4b1974cdbc fix spammy log messages from course_id tracking in CMS 2013-11-18 08:47:54 -05:00
polesye
4b87237825 BLD-193: Add template for checkboxes to studio. 2013-11-18 09:50:53 +02:00
Calen Pennington
9168798ff3 Merge pull request #1686 from cpennington/hotfix-max-empty-sequence 
Assign a score of 0 to tasks with no attempts
 2013-11-16 09:14:39 -08:00