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

20034 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Hoeber
e1451ab1c1 Merge pull request #2009 from edx/markhoeber/documentation/release-notes-12-17-13 
Markhoeber/documentation/release notes 12 17 13
 2013-12-19 16:08:37 -08:00
Jay Zoldak
8b929511b5 Merge pull request #2006 from edx/zoldak/update-testing-doc 
Update testing doc
 2013-12-19 13:51:46 -08:00
Jay Zoldak
b4b611b9ad Update testing doc 2013-12-19 16:51:02 -05:00
e0d
86e3391b41 fixing merge conflict from release 2013-12-19 16:34:25 -05:00
Mark Hoeber
f1b140ffb5 Merge pull request #2005 from edx/sylvia/documentation/add_image 
Add missing image file, correct typos
 2013-12-19 13:12:15 -08:00
Anton Stupak
af4e3355c6 Merge pull request #1806 from edx/anton/add-zooming-image-template 
Add template for the zooming image in Studio.
 2013-12-19 12:28:08 -08:00
polesye
042cb5c698 BLD-206: Add template for the zooming image in Studio. 2013-12-19 21:47:32 +02:00
spearce
35e30f8cac Add missing image file, correct typos 
Add the missing TextInput_MultipleAnswer.gif file. Correct
capitalization of another image file name so it'll appear in the docs.
 2013-12-19 14:11:50 -05:00
Mark Hoeber
332477b6ef Merge pull request #2003 from edx/sylvia/documentation/bld-474-v2 
Fix formatting problem in Working with Video Components
 2013-12-19 09:52:05 -08:00
spearce
16adf36463 Fix formatting problem in Working with Video Components 2013-12-19 12:48:20 -05:00
spearce
94a792c910 Update Text Input problem type 
Update Text Input problem type: Multiple correct responses are now
possible
 2013-12-19 11:53:35 -05:00
Will Daly
75d44039de Merge pull request #1976 from edx/will/jenkins-script-update 
Updated Jenkins scripts
 2013-12-19 06:56:27 -08:00
Will Daly
1081786c6f Merge pull request #1965 from edx/will/fake-server-refactor 
Stub Server Port Conflicts and Refactor
 2013-12-19 06:55:24 -08:00
Will Daly
0fd03cfb02 Moved stub servers to terrain 
Refactored stub services for style and DRY

Added unit tests for stub implementations

Updated acceptance tests that depend on stubs.

Updated Studio acceptance tests to use YouTube stub server; fixed failing tests in devstack.
 2013-12-19 09:12:41 -05:00
Anton Stupak
90f56c0063 Merge pull request #1999 from edx/anton/fix-typos-in-announcement 
Fix typos in Announcement template.
 2013-12-19 04:19:02 -08:00
polesye
24106a9203 BLD-590: Fix typos in Announcement template. 2013-12-19 14:14:30 +02:00
David Baumgold
91a0a3ffb3 Merge pull request #1994 from edx/db/reformat-importer 
Reformat xml_importer.py to be more readable
 2013-12-18 13:49:51 -08:00
David Baumgold
36f35ac926 Reformat xml_importer.py to be more readable 2013-12-18 16:17:05 -05:00
John Jarvis
ebb33be4dc Merge pull request #1991 from edx/jarv/readme-installation 
Jarv/readme installation
 2013-12-18 12:57:23 -08:00
Mark Hoeber
ddd8f26af0 Added alt text to image 
accessibility
 2013-12-18 15:35:31 -05:00
Will Daly
b005141d74 Updated Jenkins scripts 2013-12-18 15:05:10 -05:00
Mark Hoeber
31ab28ee83 Merge pull request #1993 from edx/markhoeber/documentation/analytics-sprint-12 
Markhoeber/documentation/analytics sprint 12
 2013-12-18 11:41:42 -08:00
John Jarvis
8c9bd39e68 Update README.md for install instructions 2013-12-18 14:24:43 -05:00
Julia Hansbrough
0d91e61e60 Added flag for lms-specific functionality 
Studio doesn't do email changes, thus has no email reset template; thus, we must disable password/email-reset related tests when running with studio settings
 2013-12-18 14:18:12 -05:00
Mark Hoeber
4b1431bffe Edits to analytics changes 
wiki and user_id_map tables finalized
 2013-12-18 14:14:32 -05:00
Julia Hansbrough
f351b05031 Fixing email link injection bug 
Several templates used a variable set by the user (the request host header).  This led to a vulnerability where an attacker could inject their domain name into these templates (i.e., activation emails).  This patch fixes this vulnerability.

LMS-532
 2013-12-18 13:38:36 -05:00
Mark Hoeber
7547c54047 Merge pull request #1990 from edx/sylvia/documentation/video_documentation_updates 
Updates to video documentation
 2013-12-18 08:28:21 -08:00
Mark Hoeber
5b7acdcfd1 Fixed image 
fixed image path
 2013-12-18 11:11:28 -05:00
spearce
1e248ae78c Updates to video documentation 
Updates to reflect new video component UI and uploading processes
 2013-12-18 10:58:53 -05:00
Mark Hoeber
7f96d153b4 Removed number from RN TOC 
Removed number from RN TOC
 2013-12-18 10:54:29 -05:00
Don Mitchell
94d3a73aed Merge pull request #1982 from edx/dhm/doc_store_config 
Move default DOC_STORE_CONFIG to common
 2013-12-18 07:33:31 -08:00
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
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
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
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