David Baumgold
|
613f2d8907
|
Merge pull request #1415 from edx/db/gemfile-lock
Commiting Gemfile.lock to the repository
|
2013-10-21 07:24:55 -07: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 |
|
Will Daly
|
a632377620
|
Merge pull request #1420 from edx/will/quarantine-lms-nav-tests
Temporarily disable navigation feature due to flakiness.
|
2013-10-21 06:12:50 -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 |
|
Will Daly
|
7e6a52a528
|
Temporarily disable navigation feature due to flakiness.
|
2013-10-21 08:51:01 -04:00 |
|
jmclaus
|
3605ebd016
|
Merge pull request #1398 from edx/jmclaus/bugfix_caption_a11y
Caption functionality announced when tabbing to list
|
2013-10-21 00:14:57 -07:00 |
|
jmclaus
|
1810022d73
|
Caption functionality announced when tabbing to list
|
2013-10-20 21:56:12 +02:00 |
|
David Baumgold
|
81859f64e3
|
Commiting Gemfile.lock to the repository
|
2013-10-18 16:46:14 -04:00 |
|
Christina Roberts
|
afa2a6815b
|
Merge pull request #1413 from edx/christina/fix-pipeline
Remove pipeline config not needed with RequireJS.
|
2013-10-18 13:45:25 -07:00 |
|
Calen Pennington
|
61a0319761
|
Make rake test:js:dev use the coffeescript watcher so that changes are immediately testable
|
2013-10-18 16:31:33 -04: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 |
|
Will Daly
|
4de777b716
|
Merge pull request #1414 from edx/will/zero-tolerance
Zero Tolerance
|
2013-10-18 13:30:34 -07:00 |
|
Don Mitchell
|
46201e9ee1
|
Merge pull request #1412 from edx/dhm/bug_id_syntax
URLencode $ and . in location.name when used as key
|
2013-10-18 13:17:03 -07:00 |
|
Will Daly
|
6654bb4cdf
|
Disable flakey seek test
|
2013-10-18 16:10:10 -04:00 |
|
brianhw
|
00499216b4
|
Merge pull request #1410 from edx/brian/email-from-unverified
Handle all exceptions returned by django-ses.
|
2013-10-18 13:05:04 -07:00 |
|
Don Mitchell
|
80af538dd1
|
URLencode $ and . in location.name when used as key
|
2013-10-18 16:05:02 -04:00 |
|
Will Daly
|
d23eed527d
|
Merge pull request #1409 from edx/will/fix-flakey-js-test
Fix flakey js caption test
|
2013-10-18 13:01:02 -07:00 |
|
Will Daly
|
fe387fb133
|
Disable slider test
|
2013-10-18 15:59:14 -04:00 |
|
Will Daly
|
344e9f7f5d
|
Fix flakey js caption test
|
2013-10-18 15:58:29 -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 |
|
Will Daly
|
e2d23fcc81
|
Merge pull request #1411 from edx/will/disable-captions
Disable test seen to fail in master
|
2013-10-18 12:48:04 -07:00 |
|
Will Daly
|
2109fdb33f
|
Disable test seen to fail in master
|
2013-10-18 15:45:49 -04:00 |
|
Brian Wilson
|
ba6477abef
|
Handle all exceptions returned by django-ses.
|
2013-10-18 15:12:07 -04:00 |
|
Will Daly
|
ac891b387b
|
Merge pull request #1408 from edx/will/fix-jscover-failures
Will/fix jscover failures
|
2013-10-18 11:53:35 -07:00 |
|
Jay Zoldak
|
159f020d9d
|
Merge pull request #1399 from edx/zoldak/fix-lms-navigation-tests
Change logic for section selection in navigation tests.
|
2013-10-18 11:47:21 -07: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 |
|
Don Mitchell
|
d15bfb672a
|
Merge pull request #1407 from edx/dhm/bug_config
Add temporary args to swallow deprecated parms.
|
2013-10-18 11:39:44 -07:00 |
|
Don Mitchell
|
f4cf331553
|
Add temporary args to swallow deprecated parms.
|
2013-10-18 14:39:06 -04: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 |
|
Will Daly
|
04cce630bf
|
Create reports/javascript so test:js doesn't fail the first time
|
2013-10-18 14:07:05 -04:00 |
|
Will Daly
|
7c15edf686
|
Use js-test-tool v0.1.4
|
2013-10-18 14:03:45 -04:00 |
|
Ned Batchelder
|
009b3e9c50
|
Merge pull request #1403 from edx/ned/small-dictfielddata-cleanups
Simple cleanups of DictFieldData
|
2013-10-18 11:02:38 -07:00 |
|
Giulio Gratta
|
19d3e31d97
|
Merge pull request #1332 from edx/giulio/register-page
Change various text items to be more clear for users, as well as some grammar
|
2013-10-18 11:02:00 -07:00 |
|
Brian Talbot
|
38153f95d6
|
Merge pull request #1292 from edx/talbs/update-sass-bourbon-neat
Sass 3.2.12, Neat 1.4.0
|
2013-10-18 10:17:27 -07: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
|
32ca988760
|
Fix video voulme test.
|
2013-10-18 18:44:48 +03:00 |
|
polesye
|
322b17ee0b
|
Uncomment acceptance tests.
|
2013-10-18 18:44:48 +03:00 |
|
polesye
|
c85bbabb93
|
Fix timeout.
|
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 |
|
polesye
|
7121db0a09
|
BLD-353: Fix js unit tests.
|
2013-10-18 18:44:48 +03:00 |
|
Brian Talbot
|
3a639ece1f
|
updating Neat generated utility files
|
2013-10-18 11:35:25 -04:00 |
|
Brian Talbot
|
5bbe330c0c
|
updating to Sass 3.2.12 and Neat 1.4.0
|
2013-10-18 11:35:25 -04:00 |
|
polesye
|
79f11de6de
|
Merge pull request #1342 from edx/anton/fix-video-multi-speed-bug
Video player: Fix multi speed bug
|
2013-10-18 08:09:42 -07:00 |
|
Will Daly
|
14b5f42c7c
|
Added explicit wait to avoid reading default grading value
|
2013-10-18 09:54:49 -04:00 |
|
Jay Zoldak
|
494a618c1a
|
Change logic for section selection in navigation tests.
|
2013-10-18 09:38:20 -04:00 |
|
Don Mitchell
|
9df7236065
|
Merge pull request #1307 from edx/dhm/datastore_config
Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation"...
|
2013-10-18 06:27:08 -07: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 |
|