Commit Graph

19363 Commits

Author SHA1 Message Date
marco
68199da821 added oe-tools header areas to eventually consolitate all messaging 2013-08-09 18:44:15 -04:00
Vik Paruchuri
29d9cfc54e Better handle edge cases 2013-08-09 18:04:11 -04:00
caesar2164
5b5c8151d0 Merge pull request #618 from edx/giulio/secure-embeds
changing http:// to // on intro video urls
2013-08-09 14:19:21 -07:00
Giulio Gratta
464141c72a changing http:// to // on intro video urls to prevent browsers from blocking video embeds 2013-08-09 14:13:41 -07:00
Vik Paruchuri
c4a2f7dcdc Fix invalid state 2013-08-09 17:01:07 -04:00
Sarina Canelake
6b16ef0adf Merge pull request #631 from edx/sarina/upgrade-diff-cover
Upgrade diff-cover to newest version
2013-08-09 13:59:56 -07:00
Vik Paruchuri
5c9538a9a1 Address review comments 2013-08-09 16:46:25 -04:00
Jonah Stanley
f4799f983e Merge pull request #630 from edx/jonahstanley/fix-courseteam-tests
Jonahstanley/fix courseteam tests
2013-08-09 13:09:17 -07:00
Sarina Canelake
d6e06e441f Upgrade diff-cover to newest version 2013-08-09 15:55:43 -04:00
JonahStanley
0595459c01 Revert back to old way of logging someone else in 2013-08-09 15:27:46 -04:00
Peter Fogg
cde8ee50d7 Fix jumping to the top of the page on unit delete. 2013-08-09 15:18:08 -04:00
Vik Paruchuri
6543343388 Merge remote-tracking branch 'origin/feature/vik/oe-ui' into feature/vik/oe-ui 2013-08-09 14:51:13 -04:00
Vik Paruchuri
33da3ec1cf Fix self assessment template 2013-08-09 14:50:57 -04:00
cahrens
835edbf32f Change locators to a restful interface.
Don't use ; @ and # as separators.
2013-08-09 14:49:32 -04:00
Vik Paruchuri
8cf82f2973 Fix self assessment test 2013-08-09 14:38:30 -04:00
Miles Steele
e9aca13636 enable beta dashboard 2013-08-09 14:22:56 -04:00
Miles Steele
f6fc1aeed9 hide empty management list selector, add explanation text 2013-08-09 14:22:56 -04:00
Miles Steele
58c6b9bb61 add privilege copy 2013-08-09 14:22:55 -04:00
Miles Steele
53bda391ae Merge pull request #625 from edx/fix/msteele/instr-i18n
Fix enroll-multiple button
2013-08-09 11:05:32 -07:00
JonahStanley
8feaa0ffa4 Added in a wait upon logging in 2013-08-09 13:57:22 -04:00
Miles Steele
8f8d70aeae fix enroll multiple button, fix module_error report 2013-08-09 13:45:27 -04:00
Feanil Patel
822f3a7865 Merge pull request #607 from edx/feanil/master_with_release
Feanil/master with release
2013-08-09 10:44:44 -07:00
Adam
abd17a2472 Merge pull request #623 from edx/adam/unicode-encode-error
make template string unicode
2013-08-09 10:35:32 -07:00
Miles Steele
25d45b8578 Merge pull request #574 from edx/feature/msteele/instrdash
Add cronjob analytics to instructor dashbaord
2013-08-09 10:26:50 -07:00
Vik Paruchuri
6e41c082b1 Fix tests 2013-08-09 12:30:05 -04:00
Adam Palay
893f05976d make template string unicode 2013-08-09 12:25:14 -04:00
Will Daly
9769f364e1 Updated tests to weaken "number" input field requirement, which
isn't supported in Firefox.
2013-08-09 12:10:53 -04:00
marco
166c4c6939 cleaned up merge issue in combined_open_ended.html 2013-08-09 11:31:33 -04:00
marco
e1cba4b0b4 cleaned up html structure for various pages, style fixed for show/hide prompt item 2013-08-09 11:26:59 -04:00
Vik Paruchuri
5d16bc9eb6 Remove ad-hoc patch for xblock issue 2013-08-09 11:24:07 -04:00
Vik Paruchuri
2612fc2bce Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui 2013-08-09 11:23:52 -04:00
Sarina Canelake
0f9d7230c3 Merge pull request #614 from edx/sarina/update-xblock-version
Update the XBlock version to fix save bugs
2013-08-09 07:51:28 -07:00
chrisndodge
09a83dcd1e Merge pull request #589 from edx/fix/cdodge/better-export-error-messaging
give some debug message regarding why export has failed
2013-08-09 07:21:20 -07:00
Brian Talbot
5b4c15a57d Studio: revises export prompt control copy 2013-08-09 10:01:23 -04:00
Vik Paruchuri
f929b4930a Add in jasmine test for rubric, fix combinedopenended jasmine failures 2013-08-09 08:42:02 -04:00
Vik Paruchuri
adbfdccee8 Prevent student from resetting problem unless they have completed required peer grading. Grant an exemption if there is no available peer grading. 2013-08-09 08:18:23 -04:00
Valera Rozuvan
0b58c22b97 Merge pull request #593 from edx/valera/captions_keyboard_access_2
Valera/captions keyboard access 2
2013-08-09 00:49:28 -07:00
Valera Rozuvan
1efea116f6 Removed unnecessary leading and trailing spaces from heading in template. 2013-08-09 10:26:18 +03:00
Valera Rozuvan
f301231051 Enabled tabbing to volume slider. 2013-08-09 09:22:57 +03:00
Valera Rozuvan
5380b5cfc3 Making it possible to tab through individual speeds.
In speed control, when it is focused, a drop down becomes available which contains all
of the available speeds that the player can switch to. When using the Tab button to
tab through all of the controls, it should be possible to select individual speed with
the keyboard.
2013-08-09 09:22:57 +03:00
Valera Rozuvan
8bbe1c39f6 Turned off all VideoAlpha Jasmine tests. 2013-08-09 09:22:57 +03:00
Valera Rozuvan
4c7250a000 Improved strings in template.
Only relevant part of string will go through the Python internationalization function.
2013-08-09 09:22:57 +03:00
Valera Rozuvan
8a3ef33985 Fixing tests related to fetching YouTube metadata.
Previously we were using dummy YouTube IDs such as "slowerSpeedYoutubeId", and "normalSpeedYoutubeId".
This was causing errors when the code tried to fetch metadata from YouTube with that ID. We can't
stub these fetch requests because the data that is fetched is necessary. For example it contains
the length of the video.
2013-08-09 09:22:57 +03:00
Valera Rozuvan
417bf6dd85 Removed some more comments. 2013-08-09 09:22:57 +03:00
Valera Rozuvan
f9f9123ce4 Removed unnecessary commented out code from Jasmine tests. 2013-08-09 09:22:57 +03:00
Valera Rozuvan
4f207299db Changed back handling of Video by original Video code. 2013-08-09 09:22:57 +03:00
Valera Rozuvan
1f238b953b Fixed test for height of player when CC is disabled.
It turned out that we were reading the heights of the contols and other elements
before we initialized the heights.
2013-08-09 09:22:57 +03:00
Valera Rozuvan
326d958727 Replaced Video with VideoAlpha.
Now all Video tags and VideoAlpha tags will be handled by VideoAlpha.
2013-08-09 09:22:57 +03:00
Valera Rozuvan
f08394ac2c Volume and speeds dialogs are fully extended.
When the controls receive focus not via mouse click or mouse hover, their appropriate
slider and selection menu are fully extended and shown to the user.
2013-08-09 09:22:57 +03:00
Valera Rozuvan
740a343b76 Styling improvements. 2013-08-09 09:22:56 +03:00