Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,531 Commits 1 Branch 0 Tags
03bcd19b8d6473c042dfee6bc02a14e8fa9fa85b
Commit Graph

16531 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ichuang
03bcd19b8d catch error in delete_course management script when group does not exist 2013-08-13 08:46:21 -04:00
chrisndodge
4f321897df Merge pull request #620 from edx/feature/cdodge/convert-to-portable-links-on-import-and-clone 
Feature/cdodge/convert to portable links on import and clone
 2013-08-11 06:20:11 -07:00
Peter Fogg
8b2346fc51 Merge pull request #628 from edx/peter-fogg/fix-unit-delete-jump 
Fix jumping to the top of the page on unit delete.
 2013-08-10 06:48:51 -07:00
Chris Dodge
e23ec4f221 on the new envs configuration file, we need to squelch pylint errors on the from dev import * 2013-08-10 00:29:17 -04:00
Chris Dodge
20b957518c resolve last code violation 2013-08-09 20:53:17 -04:00
Chris Dodge
f170d85547 fix wrapping, but mainly want to kick off another build due to Jenkins problem 2013-08-09 20:46:14 -04:00
Chris Dodge
1c2958e35d address PR feedback 2013-08-09 20:46:14 -04:00
Chris Dodge
c6f277427c add a few debug messages to get localhost debug information. Also partition out the MongoDjangoToolbar configuration into a separate env config. This is because doing imports on large courses grinds localdev to a halt due to all the stack trace generation. 2013-08-09 20:46:14 -04:00
Chris Dodge
b1b8f19c88 add another test. Seems like we never had an explicit test on an import into a new course-id. This fixes that 2013-08-09 20:46:13 -04:00
Chris Dodge
6b0e992d9e change regex names to better reflect what the actually match on 2013-08-09 20:46:13 -04:00
Chris Dodge
d9d8d96e05 also support a link rewriting on course import and clone for the following format /courses/[org]/[course]/[run]/. We just need to substitute in the new course-id. 2013-08-09 20:46:13 -04:00
Chris Dodge
607573fbd9 add test files 2013-08-09 20:46:13 -04:00
Chris Dodge
e2358af6a9 add ability to rewrite links on the old /courses/<org>/<course>/<run>/jump_to/i4x://<org>/<course> .. intracourseware linking to the new portable /jump_to_id/<id> format 2013-08-09 20:46:13 -04:00
Chris Dodge
25d6de243e add portable link rewriting on clone. Added tests. 2013-08-09 20:46:12 -04:00
Chris Dodge
36fda35040 do portable link rewriting on import and add test to confirm it 2013-08-09 20:46:12 -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
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
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
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
Adam Palay
893f05976d make template string unicode 2013-08-09 12:25:14 -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
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
Valera Rozuvan
6f431df910 Fixed bug dealing with empty subtitles Url string. 
Now when subs parameter is empty or the YouTube IDs are not specified,
captions will not try to fetch non-existent file.
 2013-08-09 09:22:56 +03:00
Valera Rozuvan
fb0efd1b16 Made it so that keyboard also prolongs auto hiding of controls. 2013-08-09 09:22:56 +03:00
Valera Rozuvan
594ed6e0c3 Fixed failing test for VideoAlpha caption heiht. 
It turns out that there was wrong invocation of toBeCloseTo() function. Most likely a typo.
Updated the readme.
 2013-08-09 09:22:56 +03:00
Valera Rozuvan
d46542cba8 Removing JavaScript qTip tooltips. 
Because sometimes the tooltips generated by qTip get in the way, and the controls becomes
not responsive, it was decided to use standard title attributes for tips.

Also along the way, an error was discoevered in Jasmine tests. It was fixed, but that test is
failing so it was marked specifically to be skipped when all VideoAlpha tests run.
 2013-08-09 09:22:56 +03:00