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

19600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cahrens
b5d72a38d3 Updates from code review. Includes backing out the 
"as_published" changes I previously put in, as now we
are not adding @draft to locations converted from locators.
 2013-11-25 13:55:33 -05:00
cahrens
50128cfb5c Convert edit_subsection, edit_unit, and publishing to RESTful URLs. 
STUD-844
 2013-11-25 13:55:33 -05:00
Valera Rozuvan
037cec6c16 Merge pull request #1711 from edx/valera/enable_all_video_jasmine_tests 
Enable all video Jasmine tests
 2013-11-25 10:46:03 -08:00
Valera Rozuvan
ace8df3916 Turned back on several Video Jasmine tests. 
BLD-463
 2013-11-25 20:22:53 +02:00
Greg Price
3f0f7fa3d4 Merge pull request #1752 from edx/gprice/inline-discussion-error-recovery 
Add error recovery to inline discussion loading
 2013-11-25 10:05:53 -08:00
Diana Huang
7a56e00d53 Merge pull request #1604 from edx/jarv/verified-certs 
Jarv/verified certs
 2013-11-25 07:37:13 -08:00
Will Daly
93823db336 Merge pull request #1756 from edx/will/devstack-view-live 
Added LMS_BASE to devstack settings to enable View Live in Studio
 2013-11-25 07:03:23 -08:00
Brian Talbot
b996cae137 Merge pull request #1759 from edx/talbs/update-gitignore 
Adding Codekit IDE assets/config to .gitignore
 2013-11-23 18:51:19 -08:00
Brian Talbot
6941d1d7b4 adding additional IDE files to global .gitignore 2013-11-23 21:24:39 -05:00
Jason Bau
e9ebdb0403 Merge pull request #1755 from edx/jbau/fix/marketing-test 
fixes a branding test which was passing for a trivial (wrong) reason
 2013-11-23 08:03:08 -08:00
Will Daly
17e54a8a07 Added LMS_BASE to devstack settings to enable View Live in Studio 2013-11-23 10:42:12 -05:00
Jason Bau
e7b386c40a fixes a branding test which was passing for a trivial (wrong) reason 2013-11-22 23:18:11 -08:00
polesye
90bbb7b1cd Merge pull request #1706 from edx/anton/code-response-improvements 
Code response improvements.
 2013-11-22 09:46:58 -08:00
Ned Batchelder
938bd6b4e7 Merge pull request #1745 from edx/ned/lms-1492 
LMS-1492: Convert between webob's cgi.FieldStorage uploaded files to pure file objects.
 2013-11-22 08:42:14 -08:00
Diana Huang
586b1f72ef Fix typo in comment. 2013-11-22 11:27:18 -05:00
Don Mitchell
7ab31f5478 Merge pull request #1710 from edx/dhm/restful_settings 
Restful course settings
 2013-11-22 08:23:12 -08:00
Diana Huang
8d564f219d Use Choices to track possible modes. 2013-11-22 11:22:49 -05:00
Ned Batchelder
de7d2cd08c Properly convert files from Webob to pure files. 
Webob represents uploaded files as cgi.FieldStorage objects.  The
XModule code expects pure Python file objects.  Each FieldStorage object
is wrapped to present the proper file interface, with file names.

LMS-1492
 2013-11-22 11:09:11 -05:00
Ned Batchelder
4ace4f98cc Add two tests of problems-with-files 
One test passes already, the other fails.  Fix in next commit.
 2013-11-22 11:09:11 -05:00
Greg Price
7e074f1a7e Add error recovery to inline discussion loading 
Now the interface will reset apropriately and allow a user to retry
expanding the discussion or loading a new page, and the alert message
will ask the user to retry.

JIRA: FOR-300, FOR-301
 2013-11-22 11:00:10 -05:00
Don Mitchell
17864353a5 Restful course settings 
STUD-946
STUD-947
 2013-11-22 10:55:35 -05:00
polesye
83c5e8b8bf BLD-126: Code response improvements. 2013-11-22 16:15:11 +02:00
polesye
7e508248ed Merge pull request #1738 from edx/anton/update-calculator-hints 
Update the calculator hints tooltip with full information.
 2013-11-22 05:36:09 -08:00
polesye
b7438bc9a4 BLD-400: Update the calculator hints tooltip. 2013-11-22 12:18:52 +02:00
polesye
51fa7e0c3b Merge pull request #1739 from edx/alex/fix-transcripts-500-error 
Fix 500 error in transcripts.
 2013-11-22 00:40:35 -08:00
Александр
3bbc7430f2 BLD-530: Fix 500 error in transcripts. 2013-11-22 10:06:03 +02:00
Ned Batchelder
d1f511e14b Clean up test files, no substantive changes. 
These changes prepare for the changes to the tests that are coming, but
make no change to the behavior themselves.
 2013-11-21 21:06:18 -05:00
Jason Bau
835893c2ed Merge pull request #1736 from edx/jbau/fix/cw-migrations 
Fix 0010 courseware migration
 2013-11-21 13:54:09 -08:00
Christina Roberts
3f44ff2f4b Merge pull request #1675 from edx/christina/tab-new 
Convert tabs to use RESTful API
 2013-11-21 07:39:31 -08:00
cahrens
1b2be30c45 Convert tabs to RESTful URL. 
STUD-850
 2013-11-21 10:19:43 -05:00
polesye
7bab863c22 Merge pull request #1698 from edx/anton/multiple-answers-string-response 
Allow multiple answers for string response.
 2013-11-21 07:14:29 -08:00
Christina Roberts
99cf0ec54a Merge pull request #1727 from edx/christina/public 
Minor cleanup around public RESTful URLs.
 2013-11-21 06:57:24 -08:00
Don Mitchell
e150207232 Merge pull request #1740 from edx/bug/locator_parse 
Allow colons in Locator fields.
 2013-11-21 06:40:52 -08:00
polesye
77c208a1cf BLD-474: Allow multiple answers for string response. 2013-11-21 16:23:33 +02:00
Don Mitchell
e8beb4d19b Allow colons in Locator fields. 2013-11-21 08:41:26 -05:00
Brian Talbot
d526027da0 Merge pull request #1721 from edx/talbs/update-gitignore 
Static CSS and Developer Stack Remnants to .gitignore
 2013-11-21 05:30:30 -08:00
zubair-arbi
df97df6fde Merge pull request #1606 from zubair-arbi/zub/bugfix/std293-coursehandout 
Show error on invalid html in course handout edit
 2013-11-21 01:53:08 -08:00
Valera Rozuvan
005e313f1c Merge pull request #1677 from edx/valera/alert_screenreader_video_end 
a11y - Videos need to alert screenreaders when the video is over.
 2013-11-21 00:47:31 -08:00
Valera Rozuvan
6910ac9535 Addressing reviewer's comments. 
Updated Change Log.

BLD-488
 2013-11-21 10:07:18 +02:00
Valera Rozuvan
752851744c Adding tests. 
Disabled Jasmine test due to flakiness on dev machine.
Added test for endTime in update().
Enabled updatePlayTime() tests. Will see on Jenkins.
Adding test for updatePlayTime() method.
Adding ProgressSlider notifyThroughHandleEnd() Jasmine tests.
Fixing Jasmine coverage problems.
Removed cover logs.
Fixing flaky test.
Removed code coverage logs.

BLD-488
 2013-11-21 10:06:39 +02:00
Valera Rozuvan
062c3b45a2 Initial commit. 
Adding focus on slider handle when video ends.
Removing unnecessary debug console.log() calls.
Change back to original code.
Adding comments.
Also undid tabindex=-1 for the slider knob. It is unnecessary, and prevents
the user from tabbing onto the slider.
Adding minor details.
startTime and endTime proper reset.

BLD-488
 2013-11-21 10:06:39 +02:00
Valera Rozuvan
f0bbd34ad6 Merge pull request #1715 from robertjmarks/master 
changes to allow multiple choicetextresponses in one problem

@adampalay will do!
 2013-11-20 21:39:21 -08:00
Jason Bau
f0874d41c4 Fix 0010 courseware migration 2013-11-20 20:39:40 -08:00
Diana Huang
696f1df043 Pass through the certificate mode correctly. 2013-11-20 17:05:57 -05:00
David Baumgold
2b3d6b239c Merge pull request #1730 from edx/db/remove-backbone-sourcemap-comment 
Removed Backbone sourcemap comment
 2013-11-20 13:18:58 -08:00
David Baumgold
e4817f5b4e Removed Backbone sourcemap comment 
Because the resulting 404 was causing confusion
 2013-11-20 15:55:31 -05:00
Adam
92238d7f7b Merge pull request #1729 from edx/adam/more-granular-grading-transactions-2 
more granular transactions in grading [LMS-1480]
 2013-11-20 12:09:49 -08:00
polesye
538be891bc Merge pull request #1725 from edx/anton/transcripts-fix-acceptance-test 
BLD-524: Add missing assert in video test.
 2013-11-20 11:44:15 -08:00
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