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

19654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Palay
7b72a18551 more granular transactions in grading [LMS-1480] 
remove field_data_cache from grades.grade and grades.progress_summary

cleans grading code by adding wrappers
 2013-11-20 14:40:32 -05:00
cahrens
d1c19cb563 Minor cleanup around public RESTful URLs. 
STUD-849
 2013-11-20 14:20:59 -05:00
Greg Price
21169cbba0 Merge pull request #1707 from edx/gprice/forum-thread-list-focus-trap 
Add error recovery and focus trap to thread loading in forum sidebar
 2013-11-20 10:19:22 -08:00
Christina Roberts
82092bdd67 Merge pull request #1697 from edx/christina/i4x_test 
Test HTML returned from view methods for "i4X".
 2013-11-20 10:08:53 -08:00
cahrens
f01b36b5d4 Test for i4x on returned pages. 
STUD-941
 2013-11-20 12:48:24 -05:00
Feanil Patel
729f2e3bfa Merge pull request #1637 from edx/feanil/aws_creds 
Set empty aws credentials to None.
 2013-11-20 07:57:16 -08:00
Don Mitchell
df349b97cf Merge pull request #1333 from edx/dhm/separate_pymongo 
Pull all db (mongo) functions into another file to enable easier replacement
 2013-11-20 07:45:08 -08:00
David Baumgold
d8215533b3 Merge pull request #1719 from danielcebrian/patch-1 
Update AUTHORS
 2013-11-20 07:18:47 -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
Christina Roberts
c9416925e1 Merge pull request #1680 from edx/christina/preview 
Change preview view method to use RESTful URL.
 2013-11-20 06:12:19 -08:00
Will Daly
29c8a0e2c5 Merge pull request #1722 from edx/will/fix-html-failure 
Increased timeout for element count in HTML test
 2013-11-20 06:08:27 -08:00
polesye
cc2f1e73bf BLD-524: Add missing assert in video test. 2013-11-20 15:48:15 +02:00
Zubair Afzal
783e4b223f Show error on invalid html in course handout edit + Added tests 
STUD-293
 2013-11-20 17:33:07 +05:00
Don Mitchell
cb113deade Separate all db ops from modulestore ops 2013-11-19 17:31:10 -05:00
Diana Huang
d72b61a5b0 Use class methods to find the enrollment mode. 2013-11-19 17:30:27 -05:00
Diana Huang
1656876699 If student has not passed verification, issue an honor code cert. 
Also, display a message on their dashboard.
 2013-11-19 17:12:49 -05:00
cahrens
e7c06e3ab1 Change preview view method to use RESTful URL. 
STUD-848
 2013-11-19 16:56:24 -05:00
Brian Talbot
6e0140b65a revises .gitignore file to include static css directories and remnants of devstack setup 2013-11-19 16:35:24 -05:00
Will Daly
bcb5f1b368 Increased timeout for element count in HTML test 2013-11-19 16:34:01 -05:00
Julia Hansbrough
bc4ebfdc40 Merge pull request #1693 from edx/flowerhack/fix/password-reset-messages 
Fixed password reset message
 2013-11-19 13:19:33 -08:00
Julia Hansbrough
87238e6d93 Removed null bits 2013-11-19 20:24:58 +00: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
danielcebrian
954ca83c90 Update AUTHORS 2013-11-19 14:37:07 -05: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
Diana Huang
fc46efb6c7 Fix bug in grabbing course enrollments. 
LMS-1475
 2013-11-19 14:03:05 -05: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
RobertMarks
e3b8ce708f changes to allow multiple choicetextresponses in one problem 2013-11-19 09:55:35 -08: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
Greg Price
95932610a7 Add focus trap on forum navigation thread loading 
For accessibility purposes, it is bad to allow a user to initiate
loading of additional threads in the navigation sidebar and then shift
focus away from the sidebar, only to have focus snap back when the
additional threads are loaded. Now, we trap focus on the loading element
as recommended by our accessibility consultant.

JIRA: FOR-238
 2013-11-19 10:06:30 -05:00
Greg Price
2e31ff8c35 Recover from error loading forum thread list 
When a user attempts to load more threads in the forum navigation
sidebar, reset the state of the world so the user can retry, and alert
the user appropriately.
 2013-11-19 10:06:30 -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