Don Mitchell
80af538dd1
URLencode $ and . in location.name when used as key
2013-10-18 16:05:02 -04: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
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
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
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
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
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
Brian Talbot
58548af9c7
LMS - revises pipeline vendor file references
2013-10-17 15:55:37 -04:00
Sarina Canelake
b3faf5c476
Merge pull request #1390 from edx/sarina/disable-student-email-settings-with-auth
...
Student Dash: Disable "Email Settings" when course isn't authorized
2013-10-17 12:17:58 -07:00
Sarina Canelake
9fb1d9ecf2
Remove 'Email Settings' link on student dashboard for unauth courses
2013-10-17 15:10:47 -04:00
Giulio Gratta
db802fb543
update code to reflect comment
2013-10-17 11:30:54 -07:00
brianhw
ff7d906d07
Merge pull request #1388 from edx/brian/fix-email-subtask-dupes
...
Check that a subtask has not already completed before running.
2013-10-17 11:22:21 -07:00
Will Daly
7316a3dc3b
js-test-tool generates xunit reports.
2013-10-17 14:22:09 -04:00
Don Mitchell
2678f2a148
Merge pull request #1386 from edx/dhm/bug-courseid
...
Allow - ~ and . in course, branch, & block ids
2013-10-17 11:21:21 -07:00
Will Daly
c1a5f18e9b
Updated testing docs
2013-10-17 14:17:48 -04:00
Sarina Canelake
bec6be1b9b
Merge pull request #1389 from edx/sarina/error-catch
...
Catch email exceptions on the legacy dash
2013-10-17 11:03:57 -07:00
Sarina Canelake
582e21b92d
Course Auth tests for legacy dash
2013-10-17 13:49:42 -04:00
Sarina Canelake
951837f7c9
Catch email exceptions on the legacy dash
2013-10-17 13:39:13 -04:00
Brian Talbot
d0fe1d69a0
Merge pull request #1385 from edx/talbs/fix-lms-css
...
LMS: CSS Fixes for Re-architected Pipeline
2013-10-17 10:38:05 -07:00
Brian Talbot
25b24bef2b
LMS: revises IE banner logic to show for IE9 as well
2013-10-17 13:38:02 -04:00
Brian Talbot
73f2cdf670
LMS: syncs up IE warning banner UI with new IE detection technique
2013-10-17 13:38:02 -04:00
Brian Talbot
1c7882a6bb
LMS: syncs up edge-based view with new pipeline CSS assets
2013-10-17 13:38:02 -04:00
