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

19568 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Александр
3bbc7430f2 BLD-530: Fix 500 error in transcripts. 2013-11-22 10:06:03 +02: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
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
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
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
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
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