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
David Baumgold
97941530e3
Configure MathJax using require.js
2013-10-18 13:31:51 -04: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
1ee1eb6946
Fix comments.
2013-10-18 20:01:13 +03:00
polesye
547dc11c99
Revert "Fix a malformed custom_parameter bug."
...
This reverts commit 75bdc1eebfd444bf00102b486a881f5776bbc407.
2013-10-18 20:01:13 +03:00
polesye
a6a5300b90
Fix custom parameter.
2013-10-18 20:01:13 +03:00
polesye
e62c047fdf
Fix a malformed custom_parameter bug.
2013-10-18 20:01:13 +03:00
polesye
c4bb2ac757
Remove adding prefix to custom parameters.
2013-10-18 20:01:12 +03: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
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
Ned Batchelder
d3c7c0834d
Simple cleanups of DictFieldData
...
I tried to make DictFieldData strict about only being used with one
block. That effort failed ultimately, but these are reasonable changes
I made along the way.
2013-10-18 04:51:42 -04:00
polesye
613e7f5772
Merge pull request #1336 from edx/anton/fix-video-display-issue
...
Fix Video player display issue
2013-10-18 01:21:20 -07:00
polesye
df091e5023
Remove $.cookie.
2013-10-18 11:04:06 +03:00
polesye
dda6fbd45c
Fix typo.
2013-10-18 08:51:46 +03:00
polesye
730113837b
Add js unit tests.
2013-10-18 08:47:09 +03:00
polesye
eeab7847b4
Add resizing.
2013-10-18 08:47:09 +03:00
Giulio Gratta
cca057df56
Merge pull request #1395 from edx/giulio/ICE-confirm-reset
...
Add confirm dialog to ICE reset changes
2013-10-17 17:23:22 -07:00
Gabe Mulley
c1450c8375
Merge pull request #1349 from mulby/gabe/course-id-context
...
add course_id to all emitted events
2013-10-17 15:45:37 -07:00
Jason Bau
e5cda013a2
Merge pull request #1357 from edx/jbau/shoppingcart-user-middleware
...
Jbau/shoppingcart user middleware
2013-10-17 15:41:11 -07:00
Gabe Mulley
d2b03e28fb
add course_id to event context
2013-10-17 17:44:01 -04:00
Greg Price
0138322c2b
Merge pull request #1371 from edx/gprice/cs-request-logging
...
Log all comments service requests
2013-10-17 14:32:04 -07:00
Jason Bau
7223bb125e
make condition inline
2013-10-17 14:21:44 -07:00
cahrens
0c5b511c57
Include tail from header tag in course update.
...
Fixes bug STUD-590.
2013-10-17 17:14:11 -04:00
Giulio Gratta
af0239ab0b
add confirm dialog to ICE reset changes
2013-10-17 14:11:05 -07:00
Giulio Gratta
0b8058d8c0
Merge pull request #1377 from edx/giulio/ICE-undo
...
Tweaking ICE undo feature
2013-10-17 13:58:45 -07:00
Jay Zoldak
5d84cd0627
Add synchronization logic for waiting after adding components in acceptance tests
2013-10-17 16:48:40 -04:00
Will Daly
e53c1f5f32
Merge pull request #1186 from edx/will/js-test-xunit
...
JavaScript xunit reports.
2013-10-17 13:37:53 -07:00
Giulio Gratta
6accfcd567
change various text items to be more clear for users, as well as some grammar
2013-10-17 13:18:58 -07:00
Brian Talbot
aba8fa6870
Merge pull request #1391 from edx/talbs/fix-lms-carouselcss
...
LMS: FIX - Resolves path to vendor carousel CSS (again)
2013-10-17 13:00:34 -07:00
