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

20078 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
32fa35c8f4 Merge pull request #2007 from cpennington/gst-acceptance-tests 
Add acceptance tests of GST module
 2013-12-20 11:01:27 -08:00
Calen Pennington
3bb67a8b0e Merge pull request #1996 from cpennington/conditional-module-acceptance-tests 
Add acceptance tests of the conditional module
 2013-12-20 11:01:07 -08:00
Calen Pennington
a0b8577ac3 Merge pull request #1988 from cpennington/annotation-module-acceptance-tests 
Add acceptance tests of Annotatable module
 2013-12-20 11:00:41 -08:00
Brian Talbot
6d6bcb7938 Merge pull request #1968 from edx/talbs/lms-fonts 
LMS: Use Open Sans Typeface via Google Web Fonts
 2013-12-20 10:21:41 -08:00
Brian Talbot
93d7dfb6b0 Merge pull request #1956 from edx/talbs/studio-fonts 
Studio: Updating Google Font Syntax
 2013-12-20 10:20:36 -08:00
Christina Roberts
3c0df16b0c Merge pull request #2004 from edx/christina/fix-thumbnail-warning 
Properly format errors/warnings.
 2013-12-20 10:11:12 -08:00
Ned Batchelder
dfb04bc4c9 Merge pull request #2017 from edx/ned/i18n-minor-improvements 
Minor i18n improvements
 2013-12-20 10:03:06 -08:00
Calen Pennington
0e237a85e6 Add acceptance test of the Graphical Slider Tool [LMS-1641] 2013-12-20 12:32:15 -05:00
Calen Pennington
06fadcdc0c Make conditional module and poll modules a little easier to understand 2013-12-20 12:32:15 -05:00
Calen Pennington
268c4fa01b Add acceptance tests of the conditional module [LMS-1639] 2013-12-20 12:32:15 -05:00
Calen Pennington
a9a8dcf882 Allow acceptance test problem functions to work without hardcoded course name 2013-12-20 12:32:15 -05:00
Calen Pennington
77942cecef Don't create more factory subclasses, just absorb the classes directly 2013-12-20 12:32:14 -05:00
Calen Pennington
7e91ba63ab Add acceptance tests of the annotatable module [LMS-1638] 2013-12-20 12:32:14 -05:00
Don Mitchell
6c4aae731a Merge pull request #1980 from edx/dhm/locator_block_id 
Rename BlockUsageLocator's block_id field from usage_id
 2013-12-20 08:52:46 -08:00
Sarina Canelake
1295e763cc Merge pull request #2013 from edx/sarina/update-contributing 
Set review timeframe more appropriately in contributing docs
 2013-12-20 08:46:21 -08:00
jmclaus
9de690afeb Merge pull request #1796 from edx/jmclaus/feature_jsinput_template 
Added JSInput template in Studio.
 2013-12-20 08:44:42 -08:00
jmclaus
5478525a42 Added JSInput template to Studio and a sop attribute to JSInput. Only if it's set to false, as in JSInput's template, will JSChannel be used to bypass it. In all other cases (attribute not present or set to something else), SOP is enforced. Compatibility with jsVGL is therefore maintained. Multiple JSInput are supported in a vertical. Also, save button now functions. [BLD-523, BLD-556, BLD-568] 2013-12-20 17:03:56 +01:00
srpearce
ce18bcecda Merge pull request #2016 from edx/markhoeber/documentation/stud-1033 
added detail about tolerance for numerical problems
 2013-12-20 07:59:51 -08:00
Don Mitchell
a46e112a04 Improve test coverage 
and fix found errors.
 2013-12-20 10:44:01 -05:00
Ned Batchelder
c37ab38599 Remove needless non-package non-specs from urls.py 2013-12-20 10:26:34 -05:00
Ned Batchelder
550f15caea i18n tests run better: no subprocess output, and no duplication of tests. 2013-12-20 10:26:08 -05:00
Ned Batchelder
f1f76a9ad1 Dummy text has more accents, and properly ignored more non-text things. 2013-12-20 10:25:32 -05:00
Ned Batchelder
5e244b1c3b Minor style changes to the i18n directory. 2013-12-20 10:24:33 -05:00
Ned Batchelder
c0c895cb47 Merge pull request #1886 from edx/ned/add-tests-for-file-uploads 
Add a test for Django-based file uploads to problems.
 2013-12-20 07:06:04 -08:00
Valera Rozuvan
9f1bdc534d Merge pull request #1986 from edx/valera/move_logme_module_separate_file 
Moving logme Require JS module out of individual XModules/Capa problems.
 2013-12-20 06:45:51 -08:00
zubair-arbi
ef51f74a36 Merge pull request #1749 from zubair-arbi/zub/bugfix/std823-addbaseview 
Added baseview(extended from backbone view), which can further extended ...
 2013-12-20 06:37:58 -08:00
Mark Hoeber
4f0b800d67 added detail about tolerance for numerical problems 
Add minor detail based on feedbback in training class -- use word
tolerance for margin of error, as that's what people searched on.  add
example for both percentage and numerical tolerance
 2013-12-20 09:36:19 -05:00
Calen Pennington
7f76517ea3 Cleanup courseware acceptance tests 2013-12-20 09:29:23 -05:00
Valera Rozuvan
1542a74d2b Removed logme module. Using console.log() instead. 
Removing "logme" from comments.

BLD-608
 2013-12-20 16:25:44 +02:00
Will Daly
f58e788b83 Merge pull request #1971 from edx/will/selenium-pages 
Added Selenium page objects for LMS and studio
 2013-12-20 06:05:30 -08:00
Will Daly
d23f48f573 Merge pull request #2002 from edx/will/rebalance-shards 
Rebalance acceptance test shards
 2013-12-20 05:45:22 -08:00
Zubair Afzal
a6fbcbd781 Add baseview(extended from backbone view), which can further extended by other views + Add fucntion to modify iframe and embed tags + add related tests 
STUD-823
 2013-12-20 18:38:24 +05:00
Sarina Canelake
608aaf31e8 Merge pull request #2012 from edx/sarina/grade-download-wording 
Tweak language surrounding grade download button
 2013-12-19 21:43:25 -08:00
Sarina Canelake
f330b1e65f Tweak language surrounding grade download button 2013-12-19 18:16:07 -08:00
Sarina Canelake
93b6ca1140 Set review timeframe more appropriately in contributing docs 2013-12-19 18:09:18 -08:00
Mark Hoeber
e1451ab1c1 Merge pull request #2009 from edx/markhoeber/documentation/release-notes-12-17-13 
Markhoeber/documentation/release notes 12 17 13
 2013-12-19 16:08:37 -08:00
cahrens
65756bbf94 Properly format errors/warnings. 
STUD-1063
 2013-12-19 16:52:20 -05:00
Jay Zoldak
8b929511b5 Merge pull request #2006 from edx/zoldak/update-testing-doc 
Update testing doc
 2013-12-19 13:51:46 -08:00
Jay Zoldak
b4b611b9ad Update testing doc 2013-12-19 16:51:02 -05:00
e0d
86e3391b41 fixing merge conflict from release 2013-12-19 16:34:25 -05:00
Will Daly
04e66be705 Added Selenium page objects for LMS and studio 2013-12-19 16:21:06 -05:00
Mark Hoeber
f1b140ffb5 Merge pull request #2005 from edx/sylvia/documentation/add_image 
Add missing image file, correct typos
 2013-12-19 13:12:15 -08:00
Anton Stupak
af4e3355c6 Merge pull request #1806 from edx/anton/add-zooming-image-template 
Add template for the zooming image in Studio.
 2013-12-19 12:28:08 -08:00
polesye
042cb5c698 BLD-206: Add template for the zooming image in Studio. 2013-12-19 21:47:32 +02:00
spearce
35e30f8cac Add missing image file, correct typos 
Add the missing TextInput_MultipleAnswer.gif file. Correct
capitalization of another image file name so it'll appear in the docs.
 2013-12-19 14:11:50 -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
28e25b75ff Rebalance acceptance test shards 2013-12-19 10:41:45 -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