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

20016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
spearce
c3003f6510 Add info about template for Checkbox problem type 
Change text to "click Checkboxes on the Common Problem Types tab" and
add image of checkbox button
 2013-12-20 16:39:14 -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
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
Mark Hoeber
4b1431bffe Edits to analytics changes 
wiki and user_id_map tables finalized
 2013-12-18 14:14:32 -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
spearce
1e248ae78c Updates to video documentation 
Updates to reflect new video component UI and uploading processes
 2013-12-18 10:58:53 -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
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
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
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