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

21216 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carson Gee
f02c074db9 Push To LMS updates 
Added tests
Converted scripts to django commands
Removed advanced module requirement
Generalized to platform
Switched to subprocess for shell commands
Beefed up resiliency and error checking.
Refactored since #1910 removed get_location_and_verify_access
Added settings to aws for export directory and reworked test setup and teardown
Several review based fixes
Added line to Changelog
Changed URL handler to be accepting and moved git bare repo inside of test_root/data
Added exception logging to help trace issues
Added output in exception logging
Made the branch to commit to explicit instead of implicit
Skipping git identity test on condition of global configuration set
 2014-02-13 10:21:18 -05:00
ichuang
e524f5be35 add push_to_lms to Studio; uses MITX_FEATURES['ENABLE_PUSH_TO_LMS'] 2014-02-13 10:01:28 -05:00
Christina Roberts
2b2d97cd5f Merge pull request #2578 from edx/christina/draft-bug-test 
Acceptance test for STUD-1311.
 2014-02-13 09:54:10 -05:00
chrisndodge
2539314c72 Merge pull request #2438 from edx/chrisndodge/subs-with-periods-fix 
fix bug where uploading a transcript against a HTML5 video which contains a period in the video filename causes the transcript filename to be improperly constructed
 2014-02-13 09:50:39 -05:00
cahrens
16200827c5 Acceptance test for STUD-1311. 2014-02-13 09:26:51 -05:00
Chris Dodge
6e3fb86255 Fix bug where video files with periods in them would end up producing an incorrect transcript file 2014-02-13 08:58:48 -05:00
Usman Khalid
bab6e9b881 Merge pull request #2425 from edx/usman/lms1199-make-histograms-optional 
Added feature setting to disable histograms in Staff Debug Info panel.
 2014-02-13 18:21:14 +05:00
Alexander Kryklia
81a3b72fff Merge pull request #2586 from edx/alex/fix_position_video 
Fix for saving video in studio when saving position. BLD-834
 2014-02-13 14:37:15 +02:00
Usman Khalid
21d8b40576 Added feature setting 'DISPLAY_HISTOGRAMS_TO_STAFF' to configure display of histograms in Staff Debug Info panel. 
Generating histograms requires scanning the courseware_studentmodule table on
each view. This can make staff access to courseware very slow on large courses.

Default is False.

LMS-1199
 2014-02-13 17:15:20 +05:00
Usman Khalid
f6d7cb5065 Renamed feature setting 'DISPLAY_HISTOGRAMS_TO_STAFF' to 'DISPLAY_DEBUG_INFO_TO_STAFF' to better communicate its purpose. 
Default is True.

LMS-1199
 2014-02-13 17:15:19 +05:00
Alexander Kryklia
d2f17235d9 Fix for saving video in studio when saving position. BLD-834 2014-02-13 13:12:23 +02:00
Julia Hansbrough
409e6e572a Merge pull request #2584 from edx/flowerhack/firecode 
Removed unused image
 2014-02-12 16:53:50 -05:00
Julia Hansbrough
48e35d8da2 Removed unused image 2014-02-12 21:49:05 +00:00
srpearce
f68e66ff49 Merge pull request #2583 from edx/sylvia/documentation/quick_fix 
Remove ORA info from "Specialized Problems" topic
 2014-02-12 16:34:04 -05:00
Sylvia Pearce
a863c3acd3 Remove ORA info from "Specialized Problems" topic 2014-02-12 16:31:46 -05:00
Julia Hansbrough
d6c0ce161e Merge branch 'release' 2014-02-12 21:24:19 +00:00
Greg Price
38ee585dd7 Merge pull request #2580 from edx/gprice/cs-accept-language 
Send language preference to the comments service
 2014-02-12 16:22:07 -05:00
Mark Hoeber
814009e277 Merge pull request #2582 from edx/markhoeber/documentation/release-notes-02-12-14 
Markhoeber/documentation/release notes 02 12 14
 2014-02-12 16:15:48 -05:00
Christina Roberts
b0b8257eee Merge pull request #2543 from edx/christina/reference_bug 
Rewrite Reference and ReferenceList fields on import
 2014-02-12 16:07:37 -05:00
Ali Reza Sharafat
302b5746f3 Merge pull request #2334 from edx/ali123/course-short-description 
Changes to make the course short description editable in cms
 2014-02-12 12:51:49 -08:00
Greg Price
1c188c9f89 Send language preference to the comments service 2014-02-12 15:25:34 -05:00
Greg Price
5841d460f0 Clean up usage of CS API key 2014-02-12 15:24:30 -05:00
Ali Reza Sharafat
85058ec460 Course short descriptions -- couple of more asserts and pep8 fixes 2014-02-12 20:24:26 +00:00
cahrens
894c40b89d Change Reference and ReferenceList instances on import to new namespace. 
STUD-149
 2014-02-12 15:22:12 -05:00
Christina Roberts
89ac19e81f Merge pull request #2503 from edx/christina/conditional 
Conditional module changes to support Locator/Location conversion.
 2014-02-12 15:03:29 -05:00
Mark Hoeber
0818b47fab Merge pull request #2581 from edx/sylvia/documentation/TIM-137 
Sylvia/documentation/tim 137
 2014-02-12 14:56:09 -05:00
Sylvia Pearce
2c253b5ddc Update screen shots for advanced settings in Specialized Problems 2014-02-12 14:53:23 -05:00
Sylvia Pearce
651babfdd1 Remove specific advanced setting info from ORA 2014-02-12 14:52:27 -05:00
Mark Hoeber
acc9785b7e Merge pull request #2567 from edx/sylvia/documentation/BLD-701 
Add gene editor; update protein builder and molecule editor
 2014-02-12 14:26:20 -05:00
Sylvia Pearce
00929923a9 Add new Gene Explorer screen shot 2014-02-12 14:22:15 -05:00
Sylvia Pearce
f508bf11da Update info about gene explorer, molecule editor, and protein builder 2014-02-12 14:20:02 -05:00
cahrens
276c6e918e Store locations in ReferenceLists so they can be converted to locators. 
STUD-1027
 2014-02-12 14:08:24 -05:00
Mark Hoeber
a02beb6d31 Merge pull request #2519 from edx/markhoeber/documentation/stud-1258 
First draft of documentation for Image Modal tool
 2014-02-12 13:53:53 -05:00
Mark Hoeber
b3351c4569 Documentation for Image Modal tool 2014-02-12 13:53:18 -05:00
Mark Hoeber
8214daebed Removed css issue per Dave 2014-02-12 13:47:46 -05:00
Sarina Canelake
191bd2893e Merge pull request #2572 from edx/sarina/add-catalan 
Add Catalan (Valencia)
 2014-02-12 11:59:50 -05:00
Calen Pennington
869198e44b Merge pull request #2573 from cpennington/zub/bugfix/std1311-changestodraft 
Fix for STUD-1311
 2014-02-12 11:39:23 -05:00
Calen Pennington
4403eb7209 Fix STUD-1311 (Don't overwrite published content w/ draft content accidentally) 2014-02-12 11:11:01 -05:00
Sarina Canelake
75a7d69050 Add Catalan (Valencia) 2014-02-12 10:18:34 -05:00
zubiar-arbi
f7e78544de failing test for xblock_handler 
STUD-1311
 2014-02-12 10:13:58 -05:00
Anton Stupak
9b0c8d266e Merge pull request #2557 from edx/anton/revert-download-transcript-rc 
Video: Revert Download transcript button behavior.
 2014-02-12 12:41:43 +02:00
polesye
f957b34427 BLD-811: Revert functionality. 2014-02-12 12:05:02 +02:00
chrisndodge
25b127ef45 Merge pull request #2482 from edx-solutions/splash-screen 
splash-screen: Add ability to redirect to a splash screen URL
 2014-02-11 23:40:33 -05:00
Sarina Canelake
12e598cca7 Merge pull request #2531 from edx/sarina/LMS-2201 
i18n points possible display LMS-2201
 2014-02-11 19:07:50 -05:00
Sarina Canelake
defa2374a8 Merge pull request #2568 from edx/sarina/update-i18n-translator-docs 
Update i18n translator documentation
 2014-02-11 18:55:44 -05:00
Sarina Canelake
191aafe3f4 Update i18n translator documentation 2014-02-11 18:54:47 -05:00
Sarina Canelake
ba0fbf0762 i18n points possible display LMS-2201 2014-02-11 18:25:00 -05:00
Sylvia Pearce
8eb704b0dd Add gene editor; update protein builder and molecule editor 2014-02-11 17:37:54 -05:00
Sarina Canelake
41f7f55365 Merge pull request #2564 from edx/sarina/new-esperanto 
Update Esperanto (dummy) translation files
 2014-02-11 17:34:00 -05:00
David Adams
e5354f24be Merge pull request #2403 from edx/dcadams/tinymce_mods 
Addition of 3 TinyMCE plugins to toolbar
 2014-02-11 13:54:00 -08:00