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

19253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Bau
ec7d9578ea add error handling for update_score for OEE when no child_history 2013-10-31 15:33:13 -07:00
Sarina Canelake
944c433699 Merge branch 'release' 2013-10-31 15:04:48 -04:00
Sarina Canelake
6aa5d2cc82 Merge pull request #1562 from edx/hotfix-2013-10-31 
Hotfix 2013 10 31
 2013-10-31 12:03:10 -07:00
Slater-Victoroff
e3cef4e2a6 Merge pull request #1545 from edx/slater/mixed_mongo_abstract 
Proper abstraction of Module store base class implemented
 2013-10-31 11:35:52 -07:00
Diana Huang
d41a974558 Merge pull request #1556 from edx/diana/wiki-skip-links 
Add skip link to django template pages.
 2013-10-31 10:17:51 -07:00
Julia Hansbrough
70b7ac41c0 Merge pull request #1493 from edx/flowerhack/fix/wiki-textarea-trap 
Fixing accessibility bug where users could not tab through on wiki
 2013-10-31 10:02:29 -07:00
Julia Hansbrough
d3845970fa Removing alt-tab and alt-shift-tab 2013-10-31 16:54:48 +00:00
brianhw
a445009825 Merge pull request #1551 from edx/brian/add-email-datadog 
Add datadog stats for duplicate subtask and subtask update errors.
 2013-10-31 09:48:44 -07:00
Diana Huang
d8862927e1 Add skip link to django template pages. 
Bug: LMS-1387
 2013-10-31 11:03:03 -04:00
Sarina Canelake
7aa80f6336 Merge pull request #1554 from edx/sarina/fix-violations 
Clean up pep8/pylint
 2013-10-31 05:55:40 -07:00
Valera Rozuvan
9b3bc84c29 Merge pull request #1480 from edx/valera/bugfix_start_end_time_correct_navigation 
Bug fix: video end time proper seek beyond.
 2013-10-31 05:24:29 -07:00
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
d711d29d74 Clean up pep8/pylint 2013-10-30 20:43:44 -04:00
Sarina Canelake
51ab852c69 Package the instructor dash javascript separately 
LMS-1418
 2013-10-30 20:41:38 -04:00
Sarina Canelake
c89c85c70f Merge pull request #1541 from cpennington/hotfix-conditional-course-id-access 
Provide access to the course_id directly on XModules/Descriptors
 2013-10-30 15:46:32 -07:00
Brian Wilson
782a07e0ea Add datadog stats for duplicate subtask and subtask update errors. 2013-10-30 17:09:40 -04:00
Slater
e2ba1122c4 Proper abstraction of Module store base class implemented 
Read/Write inheritance split up into separate base classes
 2013-10-30 16:35:56 -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
Diana Huang
16f5e91938 Merge pull request #1538 from edx/diana/certs-upgrade-path 
Add upsell for verified certs on the dashboard.
 2013-10-30 08:25:45 -07:00
Calen Pennington
32af903f85 Provide access to the course_id directly on XModules/Descriptors 
Fixes [BLD-456] and [LMS-1392], but making sure that we're always asking
XModules about their course_id (since the ModuleSystem has access to
that data).
 2013-10-30 11:23:11 -04: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
Diana Huang
42a63310b8 Update upsell copy. 
LMS-1127
 2013-10-30 09:26:32 -04:00
Diana Huang
9c362eacd4 Fix acceptance tests 
LMS-1127
 2013-10-30 09:26:32 -04:00
Diana Huang
5b10e016eb Make sure the correct mode is chosen during upgrade 
LMS-1127
 2013-10-30 09:26:32 -04:00
Brian Talbot
d68b2ced8a LMS: adds verifiied track visuals to upgrade UI on dashboard 2013-10-30 09:26:32 -04:00
Brian Talbot
6038639565 LMS: revises verified track upgrade UI on dashboard 2013-10-30 09:26:32 -04:00
Brian Talbot
8442f6e093 LMS: adds conditional content/instructions for registration upgrade flow 2013-10-30 09:26:32 -04:00
Diana Huang
e50397002f Better handling of the expiration date. 
LMS-1127
 2013-10-30 09:26:32 -04:00
Brian Talbot
ae6ec92672 LMS: resolves styling issues for button UI in verification flows 2013-10-30 09:26:32 -04:00
Diana Huang
c13d965f8e Fix up acceptance tests for upsell. 
LMS-1127
 2013-10-30 09:26:32 -04:00
Diana Huang
aae13c584b Move more logic into the views 
Also includes some tests

Story: LMS-1127
 2013-10-30 09:26:32 -04:00
Brian Talbot
baa73f0a1e LMS: adds in UI and styling for verified track upgrade to dashboard view 2013-10-30 09:26:32 -04:00
Brian Talbot
7a1a69b96a LMS: revises styling/placement of message for verified status on dashboard 2013-10-30 09:26:32 -04:00
Diana Huang
607deb0114 Add new acceptance test for complete upgrade flow 2013-10-30 09:26:32 -04:00
Julia Hansbrough
19c21d2023 Fixed LMS-1062 2013-10-30 09:26:32 -04:00
Brian Talbot
c1ab324d33 LMS: preps track selection view for upgrade cases 2013-10-30 09:26:32 -04:00