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

21245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
marcotuts
1b4388ee08 updated container header styling and exposed sidebar back to its location. includes some javascript to render tooltips on overflowed text headers 2014-02-14 11:47:14 -05:00
Andy Armstrong
70ba10433e Couple more changes 2014-02-14 11:47:14 -05:00
Andy Armstrong
c5fc30c58b First rough cut of a container page. 2014-02-14 11:47:14 -05:00
Ned Batchelder
b23e9fb62f Merge pull request #2405 from edx/ned/remove-massemail 
Remove unused massemail commands.
 2014-02-14 10:50:57 -05:00
Waheed Ahmed
86fd303fb9 Merge pull request #2601 from edx/waheed/ora294-ui-issue-on-staff-grading 
Added space between counts on staff grading panel.
 2014-02-14 19:49:06 +05:00
Waheed Ahmed
402a1766bd Added space between counts on staff grading panel. 
ORA-294
 2014-02-14 18:32:50 +05:00
Anton Stupak
a458cd6ef6 Merge pull request #2587 from edx/anton/fix-download-transcript 
Video: Fix download transcript behavior.
 2014-02-14 12:34:37 +02:00
polesye
faab4caeef BLD-837: Fix download transcript behavior. 2014-02-14 11:51:51 +02:00
Carson Gee
989a97963c Merge pull request #718 from edx/feature/ichuang/push-to-lms 
Let a Studio user export course to git (and via git, to elsewhere, eg LMS)
 2014-02-13 20:22:31 -05:00
Christina Roberts
0c74d6ac54 Merge pull request #2562 from edx/christina/lms-mixed 
Clean up of modulestore references (primarily LMS).
 2014-02-13 20:05:31 -05:00
Giulio Gratta
acb1c3aa55 Merge pull request #2566 from edx/giulio/remove-edx-bg-image 
Removed default background image for home and courses pages
 2014-02-13 16:29:56 -08:00
Giulio Gratta
14345401cc Removed default background image for home and courses pages 2014-02-13 14:11:03 -08:00
Greg Price
ca37dffd78 Merge pull request #2585 from edx/gprice/lms-forum-error-check 
Check for forum data errors in LMS
 2014-02-13 16:16:34 -05:00
Greg Price
9ae6bb0b73 Check for forum data errors in LMS 
Some messages generated by the comments service are not readily
translated because they come from third-party libraries. Thus, we plan
to try to avoid showing any comments service generated message to the
user. This check preempts the only end-user-visible CS-generated error
message that we are presently aware of.
 2014-02-13 15:44:57 -05:00
Sarina Canelake
dac26a4f25 Merge pull request #2589 from edx/sarina/update-i18n-translator-docs 
Update translator documentation
 2014-02-13 15:31:30 -05:00
Julia Hansbrough
5131818153 Merge pull request #2597 from edx/release 
Release
 2014-02-13 15:17:38 -05:00
Ned Batchelder
b980ed3740 Merge pull request #2590 from edx/ned/small-tweak-to-early-translation-fix-docs 
Small tweak to early-translation fix docs
 2014-02-13 14:59:16 -05:00
Calen Pennington
d58358a484 Merge pull request #2555 from cpennington/xblock-acid-acceptance-tests 
Add acceptance tests of the Acid block in both LMS and Studio
 2014-02-13 14:23:31 -05:00
Calen Pennington
6125d97301 Add acceptance tests using the AcidBlock for LMS and Studio 
[LMS-1645]
[LMS-2062]
[LMS-2063]
[LMS-2064]
 2014-02-13 13:22:10 -05:00
Dave St.Germain
c7c807f270 Merge pull request #2426 from edx/dcs/a11y-labels 
Add labels to CAPA inputtypes.
LMS-1895
 2014-02-13 13:19:31 -05:00
Dave St.Germain
4fa1f1163e Added labels to CAPA input types, with markdown syntax for adding them 
in studio.
LMS-1895 and others
 2014-02-13 13:18:24 -05:00
Calen Pennington
3a7b265c8a Add trailing commas to multiline lists, to prevent string concatenation bugs 2014-02-13 13:12:42 -05:00
Calen Pennington
a2efb796b6 Fix LMS-2249 (https://github.com/edx/edx-platform/issues/2516) 2014-02-13 13:12:29 -05:00
Carson Gee
5e0f781674 Major refactor and rename of feature 
All forward facing wording changed to Export to Git
Export to git functions removed from management command and put in common file
Additional error checking and documentation improvements
Nitpicks and other minor fixes
 2014-02-13 12:53:47 -05:00
Sarina Canelake
65b2701926 Update translator documentation 2014-02-13 12:44:36 -05:00
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
Ned Batchelder
1da4ac4410 Small tweak to early-translation fix docs 2014-02-12 19:13:22 -05: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