Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,214 Commits 1 Branch 0 Tags
5cd4bae35d6fb67cb0c969ea815ba25282e1ad0e
Commit Graph

19214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Valera Rozuvan
5cd4bae35d Start and end times function the same for YouTube and HTML5 modes. 
Fix bug when the user clicks on the video time-line either
before or after the specified end time, it jumps
to the very beginning of the video.

BLD-392
 2013-10-31 13:52:34 +02:00
polesye
2628e4f182 Merge pull request #1512 from edx/anton/video-disallow-to-use-http-protocol 
Video Player: Disallow users to enter video url's in http.
 2013-10-30 23:17:39 -07:00
Sarina Canelake
de1955dca6 Merge pull request #1549 from edx/sarina/ins-dash-js-bundle 
Package the instructor dash javascript separately
 2013-10-30 18:30:56 -07:00
Sarina Canelake
51ab852c69 Package the instructor dash javascript separately 
LMS-1418
 2013-10-30 20:41:38 -04:00
Don Mitchell
e071ebb981 Merge pull request #1542 from edx/dhm/restful_course 
RESTful refactoring of /course access continued
 2013-10-30 12:16:32 -07:00
Adam
2220c5303b Merge pull request #1548 from edx/adam/fix/typo-registration-email 
fix typo in registration email
 2013-10-30 12:02:43 -07:00
Adam Palay
4ed6ee64d3 fix typo in registration email [LMS-1419] 2013-10-30 14:59:13 -04:00
Sarina Canelake
cb4025b1a6 Merge pull request #1539 from edx/sarina/inst-dash-tasks 
Enable Pending Tasks on beta dash // Course Info prettifying
 2013-10-30 11:03:50 -07:00
Sarina Canelake
b86e912905 Make event handlers fire properly 
Respond to review comments

LMS-1242
 2013-10-30 13:43:39 -04:00
Sarina Canelake
57a57e8af7 Move PIT code into util.coffee 
Add testing coverage
LMS-1242

Add "Edit This Course In Studio" link for studio courses
LMS-1291
 2013-10-30 13:43:39 -04:00
Sarina Canelake
123e18109d Reorganize Course Info dash section 
LMS-1242
 2013-10-30 13:43:39 -04:00
Sarina Canelake
9330ef65a8 Enable Pending Tasks section on new dash 
Add Pending Tasks section to the following tabs:
* Course Info
* Student Email
* Data Download
* Email

LMS-1242
 2013-10-30 13:43:39 -04:00
Don Mitchell
f41816637e RESTful refactoring of /course access continued 
Move index access into the url
Move course creation into the url
Add helper methods for testing to serialize json data and set accept header.
 2013-10-30 13:28:22 -04:00
Will Daly
eb1b9260aa Merge pull request #1537 from edx/will/fix-unicode-vagrant-issue 
Fixed test that was failing in Vagrant due to filesystem encoding mismatch
 2013-10-30 09:17:08 -07:00
Greg Price
7e6f22a46b Merge pull request #1540 from edx/gprice/fix-forums-typo 
Fix a typo that caused an error to be raised
 2013-10-30 08:37:31 -07:00
Greg Price
87e0ddf398 Fix a typo that caused an error to be raised 2013-10-30 11:18:27 -04:00
Sarina Canelake
620f217169 Merge pull request #1536 from edx/sarina/email-copy-changes 
Copy changes to Inst Dash email
 2013-10-30 07:27:04 -07:00
Sarina Canelake
9cea6ab599 Copy changes to Inst Dash email 2013-10-30 10:03:29 -04:00
Will Daly
83fcc318c6 Fixed test that was failing in Vagrant due to filesystem encoding 
mismatch
 2013-10-30 09:23:48 -04:00
polesye
6cb5c3900f BLD-408: Don't allow users to enter video url's in http. 2013-10-30 14:58:17 +02:00
Don Mitchell
80c83f0b88 Merge pull request #1508 from edx/dhm/expect_json 
Change expect_json to put parsed json in new attr
 2013-10-29 14:02:32 -07:00
Christina Roberts
9c6d0d6d70 Merge pull request #1523 from edx/christina/import-export 
Convert import to new URL pattern.
 2013-10-29 13:41:55 -07:00
Don Mitchell
45453fae61 Change expect_json to put parsed json in new attr 2013-10-29 16:13:58 -04:00
cahrens
15c12bc386 csrf token not passed to template. 2013-10-29 16:09:28 -04:00
Calen Pennington
13d9a8c4de Merge pull request #1460 from cpennington/incidental-cleanup 
Incidental cleanups discovered while making XBlock handler urls work
 2013-10-29 12:48:58 -07:00
cahrens
a9d1d4eefc Convert import to new URL pattern. 2013-10-29 15:33:22 -04:00
Will Daly
d0f659d67d Merge pull request #1525 from edx/will/textbook-js-wait 
Added wait for JavaScript when navigating to textbook page
 2013-10-29 12:21:23 -07:00
e0d
b9c00ae337 Merge pull request #1252 from edx/e0d/boto-upgrade 
updating boto to get boto.elasticache.layer1
 2013-10-29 11:53:33 -07:00
Sarina Canelake
7224af154b Merge branch 'release' 2013-10-29 14:21:37 -04:00
Brian Talbot
2a9f55dd26 Merge pull request #1532 from edx/talbs/fix-studio-datepicker 
Studio: FIX - Datepicker UI Background
 2013-10-29 09:21:17 -07:00
Brian Talbot
0f111c1b0c Studio: resolves issue where datepicker UI had no background-color 2013-10-29 10:53:28 -04:00
Brian Talbot
2c4efceb35 Merge pull request #1530 from edx/talbs/fix-cms-prompts 
Studio: FIX - Prompt UI Display
 2013-10-29 07:46:09 -07:00
Calen Pennington
ac8eeb681f Make sequence module use ajax_url properly 2013-10-29 10:36:22 -04:00
Calen Pennington
ae32abfd62 Give a better error message when capa recieves an unknown action 2013-10-29 10:36:22 -04:00
Calen Pennington
10ee2dea82 Clean up imports 2013-10-29 10:36:22 -04:00
Brian Talbot
f4d56ad204 Studio: resolves a display issue with prompt UIs hiding throughout app 2013-10-29 10:22:41 -04:00
Olivier Marquez
a764a466b8 Update AUTHORS 2013-10-29 10:01:22 -04:00
Olivier Marquez
453e8f50fc Update tabs.py 2013-10-29 10:01:02 -04:00
David Baumgold
94bf8a18fd Merge pull request #1522 from edx/db/fix-release-script 
Fixes to release.py script
 2013-10-29 06:47:09 -07:00
Christina Roberts
5fb487a336 Merge pull request #1517 from edx/christina/delete-unused 
Delete unused HTML templates.
 2013-10-29 06:33:59 -07:00
Will Daly
f48dbfdc50 Merge pull request #1528 from edx/will/disable-yt-js-test 
Disable multiple YT test due to flakinesss
 2013-10-29 06:02:26 -07:00
Will Daly
1435c90306 Disable multiple YT test due to flakinesss 2013-10-29 09:01:20 -04:00
Gabe Mulley
3f89967645 Merge pull request #1478 from mulby/gabe/track-user-id 
add user_id to tracking context
 2013-10-29 05:48:43 -07:00
polesye
e587817c8b Merge pull request #1527 from edx/anton/video-speed-change-bug 
Video player: speed change bug
 2013-10-29 05:19:38 -07:00
Gabe Mulley
86bb952f53 update authors file 2013-10-29 08:18:01 -04:00
Gabe Mulley
4f4e58b5f6 add user_id to tracking context 
AN-213
 2013-10-29 08:18:01 -04:00
polesye
825571fb89 BLD-424. Update CHANGELOG.rst. 2013-10-29 12:01:41 +02:00
polesye
6130189bdf Fix slider and pause bugs. 2013-10-29 11:34:47 +02:00
polesye
389beedcf9 Fix speed change bug. 2013-10-29 11:34:47 +02:00
Brian Talbot
bd858b328e Merge pull request #1189 from edx/talbs/studio-cssarch 
Studio: Revised CSS Architecture (resolves STUD-806)
 2013-10-28 17:44:50 -07:00