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

8566 Commits

Author SHA1 Message Date
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
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
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
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
Diana Huang
2dbf9442a6 Revise course mode choose page. 
LMS-2796
 2014-06-16 14:08:40 -04:00
polesye
0dbcf06280 Fix i18n in ChoiceGroup and ChoiceTextGroup. 2014-06-16 13:57:28 -04:00
Don Mitchell
3c9b10112f Refactor heartbeat to delegate to the modulestores and sql 
LMS-2801
 2014-06-16 13:16:32 -04:00
Waheed Ahmed
872d7b6f42 Fixed MATLAB Run Code bug with answer boxes. 
LMS-2807
 2014-06-16 20:58:35 +05:00
Jay Zoldak
b47e397d64 Merge pull request #4089 from edx/zoldak/courses-test 
Fix the CoursePagesTest
 2014-06-16 10:45:39 -04:00
Jim Abramson
c74b34c1a8 Merge pull request #4041 from edx/jsa/forums-search-users 
implement forums endpoint for searching users.
 2014-06-16 10:15:01 -04:00
Alexander Kryklia
e032ab1877 Add examples of html5 videos to docstrings. 2014-06-16 12:46:13 +03:00
jmclaus
27cdb6820f Merge pull request #4084 from edx/jmclaus/i18n-formula-equation-input 
FormulaEquationInput: i18n
 2014-06-13 23:48:48 +02:00
jmclaus
c3520fa1e0 Merge pull request #4085 from edx/jmclaus/i18n-chemical-equation-input 
ChemicalEquationInput: i18n
 2014-06-13 23:48:07 +02:00
jmclaus
a14be4716d Merge pull request #4087 from edx/jmclaus/i18n-matlab-input 
MatlabInput: i18n
 2014-06-13 23:44:06 +02:00
David Baumgold
290906acb0 Merge pull request #4094 from edx/db/http-stub-respond-to-HEAD 
make our HTTP stub services respond to HEAD requests
 2014-06-13 16:33:40 -04:00
Steven Burch
7c71725f11 Merge pull request #4008 from edx/stv/jsinput 
Fix Jasmine tests for JSInput
 2014-06-13 13:01:31 -07:00
David Baumgold
bafdb8ecb1 make our HTTP stub services respond to HEAD requests 2014-06-13 14:42:23 -04:00