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
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
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
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
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
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
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
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
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
Giulio Gratta
db802fb543
update code to reflect comment
2013-10-17 11:30:54 -07: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
Don Mitchell
9fc5a8a4d6
Allow - ~ and . in course, branch, & block ids
2013-10-17 13:31:44 -04:00
Giulio Gratta
5e45861dfb
Merge pull request #1374 from edx/giulio/video-help-text
...
Added help text to multiple speed video fields
2013-10-17 09:46:07 -07:00
Don Mitchell
2b99947241
Merge pull request #1309 from edx/dhm/mongo_migrate
...
Compute ObjectId locally rather than delegating to Mongo db
2013-10-17 08:32:55 -07:00
Don Mitchell
dda08930cd
Compute ObjectId locally rather than delegating to Mongo db
...
Was following a std sql pattern, but non-sql db's are slow write
and pymongo's ObjectId() is supposed to generate a true GUID
equivalent to waiting for the db to do so.
2013-10-17 10:49:07 -04: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
a6ad531d50
Merge pull request #1287 from edx/dhm/restful_crud
...
Restful api prototype
2013-10-17 05:50:05 -07:00
Giulio Gratta
1fad68b5ca
Adding ICE undo feature
2013-10-16 16:01:56 -07:00
Don Mitchell
fbc68df88b
Ensure bootstrapping tests start w/ clean slate.
2013-10-16 16:54:31 -04:00
Don Mitchell
95ea4dc9cc
Tests for Locator <-> Location help functions
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
Giulio Gratta
23bd9f5012
added help text to multiple speed video fields
2013-10-16 13:35:59 -07:00
David Baumgold
ab5664ab9d
Merge pull request #1366 from edx/db/fix-video-test
...
Fix video unit test
2013-10-16 10:42:53 -07:00
David Baumgold
545563c77b
Fix video unit test
2013-10-16 12:55:19 -04:00
polesye
283777dac2
Merge pull request #1297 from edx/anton/fix-lti-export
...
LTI: Fix import/export.
2013-10-16 09:54:21 -07:00
David Baumgold
e363e5a72d
Merge pull request #1337 from edx/db/fix-video-requirejs
...
fix video module issue with require.js
2013-10-16 09:40:48 -07:00
brianhw
014089e62a
Merge pull request #1364 from edx/ned/cherry-pick-pr-1297
...
Add EmptyDataRawDescriptor.
2013-10-16 09:09:19 -07:00
polesye
de48e4a9d6
Add EmptyDataRawDescriptor.
2013-10-16 10:39:02 -04:00
Valera Rozuvan
4b371d4748
Fixing Jean Michel access. bug.
2013-10-16 15:45:13 +03:00
Valera Rozuvan
30ddaf7757
Enabling showing of captions always when mouse is over CC.
2013-10-16 15:45:08 +03:00
polesye
0bd706b6a1
Tidy up the code.
2013-10-16 15:44:55 +03:00
Valera Rozuvan
c3030e8f94
Fixing minor typo.
2013-10-16 15:44:50 +03:00
Valera Rozuvan
f17a84c965
Minor tweak.
2013-10-16 15:44:45 +03:00
Valera Rozuvan
3b7cc6a419
Furthe addressing comments on PR.
2013-10-16 15:44:40 +03:00
Valera Rozuvan
05eb13f086
Fixing JS.
...
There were previous merge conflicts in the file.
2013-10-16 15:44:35 +03:00
Valera Rozuvan
2a6418ec04
Updated fixtures for Jasmine tests.
2013-10-16 15:44:11 +03:00
Valera Rozuvan
49f4a71178
Added functionality to show captions on "CC" button mousemove.
...
When auto-show/auto-hide is disabled, the captions will be shown when
the user will move the mouse over the "CC" button. They will then
auto-hide after a while if the user doesn't continue to move the
mouse over the "CC" button, or over the captions themselves, or use
the keyboard to select a specific caption. If the mouse pointer is not
over the captions or the "CC" button, they will hide after a while.
This is the key in the fix for bug BLD-355: Transcript hovers over
over videoplayer itself for PKU videos.
2013-10-16 15:44:05 +03:00
