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

8580 Commits

Author SHA1 Message Date
James Tauber
99cfea153c dummy theme templates for testing 2014-06-26 10:37:58 -04:00
Alexander Kryklia
35aacfb6f2 Merge pull request #4105 from edx/alex/remove_unused_code_when_downloading_from_youtube 
Remove unused code when download from youtube.
 2014-06-26 14:44:45 +03:00
David Baumgold
0c0859f17b Merge pull request #4026 from edx/db/requests-2 
Upgrade `requests` module
 2014-06-25 19:34:05 -04:00
Christine Lytwynec
96e5139d66 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/tests/test_video.py
 2014-06-25 13:51:31 -04:00
Anton Stupak
04d27a83f9 Merge pull request #2571 from Szczork/szczork/log-video-ended 
log stop_video event
 2014-06-25 17:57:15 +03:00
Alexander Kryklia
1f5c95ba9a Remove unused code when download from youtube. 2014-06-25 16:12:16 +03:00
Alexander Kryklia
c9afa056ad Move video descriptor instantiation in tests to single place. 2014-06-25 14:41:15 +03:00
Oleg Marshev
715fde27c4 Redirect Chinese students to a Chinese CDN for video. 2014-06-24 18:39:52 +03:00
Dave St.Germain
d9bb5365dd Merge pull request #3982 from edx/dcs/move-i18ntools 
Moved i18n tools to i18n-tools repo
 2014-06-23 16:35:50 -04:00
Piotr Mitros
4eb234e79f Merge pull request #4174 from edx/pmitros/chromeless-xblocks 
XBlocks can disable navigation chrome.

This allows for full-screen XBlocks (such as code IDEs), as well as allowing us to somewhat hackishly build top-level XBlocks. This is the first step on the path to non-hackish top-level XBlocks.
 2014-06-23 11:56:05 -04:00
Adam
2b1712afe1 Merge pull request #4170 from lduarte1991/lduarte-harvardx-pr6 
Annotation Tools: Removed background-color from image annotations
 2014-06-23 10:24:53 -04:00
Dave St.Germain
834c2c472f Moved test_generate from i18n-tools 2014-06-23 10:06:28 -04:00
lduarte1991
cd9c6c5f3e Annotations Tools: Commented OSDA code and added clarification to catch changes 2014-06-21 16:25:53 -04:00
Andy Armstrong
20675857dc Merge pull request #3999 from edx/christina/updating-split-test 
Ability to change the associated group configuration for a split test
 2014-06-20 14:15:41 -04:00
Andy Armstrong
4b4736cc77 Disable periodically failing Bok Choy test 2014-06-20 14:15:18 -04:00
muhammad-ammar
46541eb8a5 Merge pull request #4112 from edx/ammar/youtube-video-quality-tests 
Youtube Video Quality Button Tests
 2014-06-20 22:42:58 +05:00
Don Mitchell
7e2bdeb367 Merge pull request #4155 from edx/dhm/stud-1654 
Ensure all split methods consuming Keys check that key is fully specified
 2014-06-20 13:33:15 -04:00
cahrens
a395c2fa4b Complete Studio support for handling group configuration changes 
STUD-1658
 2014-06-20 11:41:23 -04:00
cahrens
73e7ced6f9 Introduce constants for studio_view, student_view, and author_view. 2014-06-20 11:41:23 -04:00
Andy Armstrong
11c25e8c1a Add Studio handling for changes to group configurations 
STUD-1658
 2014-06-20 11:41:22 -04:00
Muhammad Ammar
15839147c2 Youtube Video Quality Button Tests 2014-06-20 13:48:27 +00:00
Mat Peterson
3a35121099 Useless code path in import_from_xml causing errors removed 2014-06-20 13:21:40 +00:00
Piotr Mitros
4f303a623b XBlocks can disable navigation chrome. 
There is an option to:
* Enable/disable accordion navigation
* Enable/disable/repoint tab navigation

This allows for full-screen XBlocks (e.g. a code IDE, or large video
player). It is also the first pass at allowing top-level XBlocks. It's
also now possible to make a chromeless XBlock, point a tab to it, and
make it point back to that tab.

Next steps down that path would be:
* Fix up how tabs are handled. The current version is a hack.
* Create appropriate XBlocks for courseware, tabbed navigation,
  etc. to reach feature parity
* Invert/rejigger the XML format.
 2014-06-19 21:06:08 -04:00
lduarte1991
95c0738361 Annotation Tools: Removed background-color from image annotations 
- Also fixed edit bug when annotation is not created first
- Also fixed indentation issues
 2014-06-19 13:52:44 -04:00
jsa
e6871af2d3 forums: add UX for username search results. 
JIRA: FOR-627
 2014-06-19 11:33:52 -04:00
Tim Babych
f4280377c5 Do not print exception message below stacktrace 2014-06-19 12:19:21 +03:00
Sarina Canelake
4477c2857f Merge pull request #4156 from edx/sarina/fix-i18n-bugs 
Fix variable names to give context for translators
 2014-06-19 00:13:38 -04:00
Sarina Canelake
30c8da1596 Fix variable names to give context for translators 
fix other various i18n issues
 2014-06-18 23:28:39 -04:00
Adam
d3d45b8863 Merge pull request #4157 from edx/release 
Release
 2014-06-18 17:26:39 -04:00
Don Mitchell
17925f3c9b Ensure all split methods consuming Keys check that key is fully specified 
STUD-1654
 2014-06-18 15:08:32 -04:00
Christina Roberts
b7eea135d4 Merge pull request #4119 from edx/christina/requirejs-promise 
Wait for scripts defined in common xmodule code to execute.
 2014-06-18 14:56:10 -04:00
Calen Pennington
7a452b6265 Merge pull request #4113 from cpennington/remove-locator 
Remove locator.py (now sourced from the external opaque_keys library)
 2014-06-18 14:44:10 -04:00
Calen Pennington
c00f80d4fa Remove locator.py (now sourced from the external opaque_keys library) 
[LMS-2757]
 2014-06-18 13:16:25 -04:00
Ben McMorran
702bdd36a9 Merge pull request #4060 from edx/benmcmorran/edit-tracking 
Tracks last edited date and user, and adds has_changes for blocks
 2014-06-18 13:13:26 -04:00
cahrens
3acf394d05 Wait for scripts defined in common xmodule code to execute. 
STUD-1792
 2014-06-18 13:11:37 -04:00
Ben McMorran
ea97dd4508 Tracks last edited date and user, and adds has_changes for blocks. 2014-06-18 11:36:49 -04:00
Usman Khalid
3d0409773b Set position for collapsible.js full-bottom link. 
Currently it is covering the whole parent div.

LMS-2852
 2014-06-18 18:20:11 +05:00
Waqas Khalid
9e6333f689 Remember the user last thread sort preference 
FOR-545
 2014-06-18 14:26:30 +05:00
Gabe Mulley
2ca79f34cf Merge branch 'release' 2014-06-17 17:07:13 -04:00
Sarina Canelake
a8cd760ce3 Merge pull request #4121 from edx/sarina/fix-i18n-bugs 
Fix i18n translation issues
 2014-06-17 16:14:41 -04:00
Jay Zoldak
e52c948135 Temporarily disable the studio bok-choy CoursePagesTest 2014-06-17 13:28:10 -04:00
Sarina Canelake
b70bd2be78 Use ngettext rather than "word(s)" for plural phrases 2014-06-17 13:25:46 -04:00
Don Mitchell
17210d18ad Merge pull request #4078 from edx/dhm/heartbeat 
Refactor heartbeat to delegate to the modulestores and sql
 2014-06-17 08:44:37 -04:00
Dave St.Germain
0b37c987c6 Merge pull request #3908 from edx/dcs/support-dashboard 
Added manual refund page for support.
PR-615
 2014-06-17 08:27:34 -04:00
Dave St.Germain
f2fb57e196 Added manual refund page for support. 
PR-615
 2014-06-17 08:24:02 -04:00
Szczork
77fc849cce log stop_video event 2014-06-17 13:56:40 +02:00
zubair-arbi
3a26e813bf Merge pull request #3898 from edx/zub/bugfix/std1629-annotationtool 
fix reply/return to annotation links
 2014-06-17 16:35:13 +05:00
zubair-arbi
6cb6680139 fix reply/return to annotation links 
STUD-1629
 2014-06-17 12:16:07 +05:00
polesye
af67873b7b Fix seek log. 2014-06-17 08:59:11 +03:00
Sarina Canelake
8191d3c77e fixup! Fix i18n translation issues 2014-06-16 23:10:03 -04:00