Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,360 Commits 1 Branch 0 Tags
8516c0dbffff6a5e656d051da644ea46edb408cb
Commit Graph

24360 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Stupak
7925ca1e96 Merge pull request #1873 from edx/anton/transcripts-start-end-time 
Video: Update behavior of start/end time fields.
 2013-12-18 02:09:54 -08:00
polesye
70518a4659 BLD-506: Update behavior of start/end time fields. 2013-12-18 09:43:11 +02:00
Mark Hoeber
4902155e72 Typos 
Fixed a few typos in Building a course document
 2013-12-17 20:07:55 -05:00
Sarina Canelake
bc625ab571 Merge pull request #1904 from tusbar/player-size 
Stop forcing video player’s speeds widget width
 2013-12-17 13:16:05 -08:00
Brian Talbot
64fc9cdce8 LMS: changing Open Sans font reference 
* uses Google Web Fonts reference rather than local files
* removes unused local font files
* adds in semi-bold weight support
 2013-12-17 15:53:02 -05:00
Brian Talbot
10ca08facb Studio: updating font face imports 
* since Sass can now process @import rules
* to simplify the number of external calls
* maintains the http/https agnostic work
* removes unused Bree Serif font face
 2013-12-17 15:52:25 -05:00
Christina Roberts
461b805951 Merge pull request #1951 from edx/christina/fix-xhr 
Workaround for "xhr.restore" failures.
 2013-12-17 12:23:10 -08:00
e0d
9e8a24bfc0 Merge pull request #1979 from edx/alex/lti_fixes_to_release 
Alex/lti fixes to release
 2013-12-17 10:43:36 -08:00
cahrens
0ef923e043 Add documentation. 2013-12-17 13:22:32 -05:00
Calen Pennington
c684a66ac3 Add information to xblocks about when they complete initialization that's visible in javascript 2013-12-17 13:18:22 -05:00
Calen Pennington
1d0ce64b10 Update to the latest version of lettuce 2013-12-17 13:18:22 -05:00
Don Mitchell
5f2517978d Move default DOC_STORE_CONFIG to common 2013-12-17 13:09:38 -05:00
David Baumgold
3f947e8076 Merge pull request #1977 from edx/goncha/sass-cache 
Goncha/sass cache #os
 2013-12-17 09:52:36 -08:00
Don Mitchell
b776590226 Rename BlockUsageLocator's block_id field from usage_id 
usage_id implies self-sufficiency. The block_id is relative to its structure.
 2013-12-17 12:15:32 -05:00
Mark Hoeber
6198e1107f Release notes edits 
Release notes edits
 2013-12-17 11:55:23 -05:00
Oleg Marshev
cc2e4bfeae Fix lis_outcome_service_url sending. 2013-12-17 18:53:21 +02:00
Valera Rozuvan
f6867da502 LTI additional Python tests. LTI must use HTTPS for lis_outcome_service_url. 
BLD-564.
 2013-12-17 18:52:01 +02:00
Mark Hoeber
f37f9e0d2e Release notes for 12-18-2013 
First draft
 2013-12-17 11:34:02 -05:00
Alexander Kryklia
946c615047 Merge pull request #1859 from edx/oleg/fix_outcome_url_sending 
Make LTI module not send grade_back_url if has_score=False
 2013-12-17 08:14:42 -08:00
Carson Gee
149a188e30 Merge pull request #1547 from carsongee/bugfix/cg/beta_user_none 
Corrects a bug experienced with external auth enabled
 2013-12-17 07:55:59 -08:00
Oleg Marshev
59d18134b2 Fix lis_outcome_service_url sending. 2013-12-17 17:33:02 +02:00
frances botsford
8a23f432c7 Merge pull request #1896 from edx/frances/fix/studio-outline-cleanup 
FED Cleanup of Studio Outline page
 2013-12-17 07:27:14 -08:00
Gang Chen
d7e5a7df49 Move sass cache location out of synced fold 
To prevent Errno::ETXTBSY when executing sass command.
 2013-12-17 10:21:16 -05:00
Gang Chen
012862bc24 Update AUTHORS 2013-12-17 10:20:57 -05:00
Anton Stupak
8554c3f0ab Merge pull request #1914 from edx/anton/show-answer-imageresponse 
Show answer for imageresponse
 2013-12-17 07:12:25 -08:00
zubair-arbi
9c8e90a624 Merge pull request #1931 from zubair-arbi/zub/bugfix/std894-deletingfloatfield 
set default value for empty integer and float fields
 2013-12-17 06:56:13 -08:00
Jay Zoldak
7add01462d Merge pull request #1969 from edx/zoldak/fix-test-name 
Remove dot from a scenario name so the results roll up in Jenkins
 2013-12-17 05:48:35 -08:00
polesye
335a36f17c Address comments. 2013-12-17 13:22:08 +02:00
polesye
887eea30c9 Add comments. 2013-12-17 13:22:08 +02:00
polesye
6e01ce50c9 Add unit tests. 2013-12-17 13:22:08 +02:00
polesye
4e10c72988 BLD-21: Show answer for imageresponse. 2013-12-17 13:22:08 +02:00
Oleg Marshev
ae61db9a6d Merge pull request #1811 from edx/valera/lti_graded_additional_tests_2 
Valera/lti graded additional tests 2
 2013-12-17 03:07:39 -08:00
Valera Rozuvan
0079243746 LTI additional Python tests. LTI must use HTTPS for lis_outcome_service_url. 
BLD-564.
 2013-12-17 12:47:49 +02:00
Valera Rozuvan
11080f2872 Merge pull request #1947 from edx/valera/visual_ui_image_response 
Improvement and update for ImageInput
 2013-12-17 02:40:22 -08:00
Valera Rozuvan
f03f3ebf96 Adding Jasmine tests for ImageInput. 2013-12-17 12:21:27 +02:00
Valera Rozuvan
06b6535fb1 Using jQuery for all DOM manipulation. 2013-12-17 12:21:27 +02:00
Valera Rozuvan
7ebeccd4bf Updating ImageInput JS code base. 2013-12-17 12:21:19 +02:00
Zubair Afzal
8fc0590a12 set default value for empty integer/float fields 
STUD-894
 2013-12-17 14:45:33 +05:00
Adam
a78400a8d8 Merge pull request #1970 from edx/adam/re-remove-ora-message 
re-remove ora message as part of merge conflict resolution
 2013-12-16 17:24:31 -08:00
cahrens
9f91935f63 Do not restore sinon global objects in afterEach. 
STUD-1040
 2013-12-16 17:22:05 -05:00
Adam Palay
146562f3f5 re-remove ora message as part of merge conflict resolution 2013-12-16 17:13:11 -05:00
e0d
4de51c8fcc Merge pull request #1960 from edx/e0d/release-merge 
E0d/release merge
 2013-12-16 14:07:56 -08:00
Jay Zoldak
599388397a Remove dot from a scenario name so the results roll up in Jenkins 2013-12-16 17:07:26 -05:00
David Baumgold
319091a213 Merge pull request #1966 from edx/db/update-staticfiles-commit 
Update version of django-staticfiles
 2013-12-16 13:53:59 -08:00
Mark Hoeber
7e88ecc16d Fix for STUD-1011 
Had to change conf.py setting to turn off smartypants formatting
 2013-12-16 16:27:09 -05:00
David Baumgold
132313c1bf Update version of django-staticfiles library 2013-12-16 16:12:15 -05:00
Frances Botsford
1618c916bb fix for duplicate drag and drop indicators on studio outline page 2013-12-16 15:30:42 -05:00
e0d
d52b959ff1 fixing merge conflicts 2013-12-16 15:02:14 -05:00
Don Mitchell
3cf75198c5 Merge pull request #1954 from edx/dhm/loc_mapper_memoize 
loc mapper memoize
 2013-12-16 10:34:12 -08:00
Don Mitchell
9ad7a1c1e0 Document performance optimization and auth generality changes. 2013-12-16 13:32:44 -05:00