Don Mitchell
|
8dc9fa8861
|
Test providing a collection in doc_store_config to contentstore.
|
2013-10-21 12:15:51 -04:00 |
|
Carlos Andrés Rocha
|
0be9daf9d5
|
Merge pull request #1419 from rocha/fix-config-root-env
Fix error when reading tokens on aws configuration
|
2013-10-21 08:24:15 -07:00 |
|
e0d
|
a5715bf243
|
Merge pull request #1425 from edx/e0d/remove-default
The default value was removed from common.
|
2013-10-21 07:57:38 -07:00 |
|
polesye
|
fa23543682
|
Merge pull request #1418 from edx/anton/restore-cc-button-mouseover
Added back on hover CC button functionality.
|
2013-10-21 07:47:55 -07:00 |
|
e0d
|
e6955c641f
|
The default value was removed from common.
|
2013-10-21 10:45:05 -04:00 |
|
David Baumgold
|
68f6aa8c98
|
Merge pull request #1404 from edx/db/requirejs-configure-mathjax
Configure MathJax using require.js
|
2013-10-21 07:33:08 -07:00 |
|
e0d
|
fb62f0c52a
|
Merge pull request #1417 from edx/e0d/config-fix
E0d/config fix
|
2013-10-21 07:29:52 -07:00 |
|
e0d
|
5adf524ad6
|
removing redundant default.
|
2013-10-21 09:55:27 -04:00 |
|
Christina Roberts
|
475cf07700
|
Merge pull request #1393 from edx/christina/checklists-restful
Include tail from header tag in course update.
|
2013-10-21 06:28:36 -07:00 |
|
Calen Pennington
|
12cc4a19c0
|
Merge pull request #1224 from cpennington/lms-xblock-js-execution
Add an XBlock javascript runtime, and use it to run XModules
|
2013-10-21 05:53:36 -07:00 |
|
Carlos Andrés Rocha
|
b764b9b4cf
|
Fix error when reading tokens on aws configuration
The error was caused by the CONFIG_ROOT environmental variable,
which was incorrectly assumed to be a path.py valid path.
|
2013-10-21 03:19:22 -04:00 |
|
polesye
|
a1f8aca6c9
|
Restore functionality.
|
2013-10-19 09:32:36 +03:00 |
|
Calen Pennington
|
ce6fbae693
|
Add an XBlock javascript runtime, and use it to run XModules
[LMS-57]
|
2013-10-18 16:31:32 -04:00 |
|
e0d
|
5995a76254
|
sanity restored.
|
2013-10-18 16:26:23 -04:00 |
|
e0d
|
a008cc6b74
|
path fix.
|
2013-10-18 16:12:51 -04:00 |
|
cahrens
|
a8ad56fa0e
|
Remove pipeline config not needed with RequireJS.
Was re-introduced in a bad merge.
|
2013-10-18 15:57:50 -04:00 |
|
e0d
|
6700a3ec14
|
Fixes for the AWS environment config.
|
2013-10-18 15:56:15 -04:00 |
|
Will Daly
|
2109fdb33f
|
Disable test seen to fail in master
|
2013-10-18 15:45:49 -04:00 |
|
polesye
|
70e5e80e31
|
Merge pull request #1339 from edx/anton/fix-video-js-unit-tests
Fix broken tests for video player
|
2013-10-18 11:45:43 -07:00 |
|
brianhw
|
f831a0adcb
|
Merge pull request #1406 from edx/post-release-2013-10-17-master
Post release 2013 10 17 master
|
2013-10-18 11:16:24 -07:00 |
|
David Baumgold
|
97941530e3
|
Configure MathJax using require.js
|
2013-10-18 13:31:51 -04:00 |
|
polesye
|
eaf5eb2945
|
Enable acceptance test.
|
2013-10-18 19:58:18 +03:00 |
|
Will Daly
|
9f1c5dd1ce
|
Merge pull request #1400 from edx/will/fix-grading-test
Added explicit wait to avoid reading default grading value
|
2013-10-18 09:15:00 -07:00 |
|
Brian Wilson
|
aa172272f3
|
Update master with hotfixes from release-2013-10-17.
|
2013-10-18 11:50:42 -04:00 |
|
polesye
|
322b17ee0b
|
Uncomment acceptance tests.
|
2013-10-18 18:44:48 +03:00 |
|
polesye
|
e95ee9948b
|
Add acceptance test instead of broken js unit test.
|
2013-10-18 18:44:48 +03:00 |
|
Will Daly
|
14b5f42c7c
|
Added explicit wait to avoid reading default grading value
|
2013-10-18 09:54:49 -04:00 |
|
Don Mitchell
|
8fe99a6be2
|
Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation""
This reverts commit a517dc2085.
|
2013-10-18 09:22:30 -04:00 |
|
Jay Zoldak
|
70cea99856
|
Merge pull request #1394 from edx/zoldak/fix-cms-problem-acceptance
Add synchronization logic for waiting after adding components
|
2013-10-18 05:36:48 -07:00 |
|
Will Daly
|
7aff8a7791
|
Merge pull request #1362 from edx/will/acceptance-test-logs
Write Django logs to file during acceptance tests
|
2013-10-18 05:07:53 -07:00 |
|
Gabe Mulley
|
d2b03e28fb
|
add course_id to event context
|
2013-10-17 17:44:01 -04:00 |
|
cahrens
|
0c5b511c57
|
Include tail from header tag in course update.
Fixes bug STUD-590.
|
2013-10-17 17:14:11 -04:00 |
|
Jay Zoldak
|
5d84cd0627
|
Add synchronization logic for waiting after adding components in acceptance tests
|
2013-10-17 16:48:40 -04:00 |
|
Don Mitchell
|
fe438bec27
|
Ensure contentstore has no assets before generating test set
|
2013-10-17 11:08:25 -04:00 |
|
frances botsford
|
9f5bd4e65b
|
Merge pull request #1373 from edx/frances/fix/studio-grading-helptext
Bug fix STUD-771: updated grading help text...
|
2013-10-17 07:42:16 -07:00 |
|
Don Mitchell
|
978c19dd2c
|
Merge pull request #1325 from edx/dhm/paginate_assets
Add asset pagination
|
2013-10-17 07:16:09 -07:00 |
|
Don Mitchell
|
ee2a3750ac
|
Test leaving /start out of url.
|
2013-10-17 09:51:56 -04:00 |
|
David Baumgold
|
b0689a4ed5
|
Merge pull request #1375 from edx/db/requirejs-load-tender
Fix up Tender load order
|
2013-10-17 06:29:15 -07:00 |
|
Don Mitchell
|
a6ad531d50
|
Merge pull request #1287 from edx/dhm/restful_crud
Restful api prototype
|
2013-10-17 05:50:05 -07:00 |
|
Jay Zoldak
|
dbfc38dfa9
|
Merge pull request #1370 from edx/zoldak/refactor-cms-acceptance-js
refactor studio component creation in acceptance tests
|
2013-10-16 14:47:29 -07:00 |
|
David Baumgold
|
76e6f8bc0d
|
Fix up Tender load order
So that tender_widget.js loads after we've defined window.Tender
|
2013-10-16 17:25:58 -04:00 |
|
Jay Zoldak
|
33f6d3b819
|
Address code review comments
|
2013-10-16 17:08:32 -04:00 |
|
Adam Palay
|
1fc993ce18
|
add functionality to disable users
add middleware to detect students with disabled accounts
add tests
|
2013-10-16 16:57:11 -04:00 |
|
Don Mitchell
|
d45beaebfa
|
Test the new RESTful course index and outline views.
|
2013-10-16 16:54:32 -04:00 |
|
Don Mitchell
|
095a4e3d93
|
Remove IDE-specific placeholder from before we had manage.pyUse manage.py instead (with cms --settings dev runserver --noreload --traceback 8001)
|
2013-10-16 16:54:32 -04:00 |
|
Don Mitchell
|
fbc68df88b
|
Ensure bootstrapping tests start w/ clean slate.
|
2013-10-16 16:54:31 -04:00 |
|
Don Mitchell
|
010905eb99
|
RESTful api for getting course listing and opening course in studio.
Pattern for how to do refactoring from locations to locators and from
old style urls to restful ones.
|
2013-10-16 16:54:31 -04:00 |
|
Frances Botsford
|
ff52afbd79
|
i18n the tip text on studio grading page, and adding a missing space on the 'New Assignment' button
|
2013-10-16 16:26:09 -04:00 |
|
Frances Botsford
|
f90e336b18
|
updated grading help text on weight of total grade to be more clear that it should be an integer without the percent sign
|
2013-10-16 15:52:05 -04:00 |
|
Will Daly
|
f2c417b638
|
Write Django logs to file during acceptance tests
|
2013-10-16 15:44:35 -04:00 |
|