Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,143 Commits 1 Branch 0 Tags
08eb8fa7c19eaff4870cd0bea6d06a80915000eb
Commit Graph

23143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brian Talbot
c42bff6528 LMS: preps track selection view for upgrade cases 2013-10-30 09:26:31 -04:00
Diana Huang
349573dcdc Add acceptance tests. 2013-10-30 09:26:31 -04:00
Diana Huang
56f6711252 Add in new hooks for the dashboard into the upgrade path. 2013-10-30 09:26:31 -04:00
Diana Huang
ebd63b6188 Add an upgrade parameter to the verification views. 2013-10-30 09:26:31 -04:00
Diana Huang
97b076cb84 Hide certificates section if enrolled as audit. 
LMS-1133
 2013-10-30 09:24:00 -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
Julia Hansbrough
5a93bb793a Removing unnecessary commands 2013-10-29 21:51:40 +00:00
Julia Hansbrough
99321fc4d5 Fixed alt-tab, alt-shift-tab, shift-tab 2013-10-29 21:48:31 +00: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
Diana Huang
78bbaa02b8 Add in human-readable text for error messages. 
LMS-1133
 2013-10-29 15:21:14 -04:00
Diana Huang
df20a1028d Wire up new statuses onto the dashboard. 
LMS-1133
 2013-10-29 15:21:14 -04:00
Diana Huang
b2a755de24 Add hooks for other statuses onto the dashboard 2013-10-29 15:21:14 -04:00
Brian Talbot
74f0e88568 LMS: revises UI states for verification status in dashboard view 2013-10-29 15:21:13 -04:00
Brian Talbot
c64542e10a LMS: revises re-verification instruction UI and help text 2013-10-29 15:21:13 -04:00
Brian Talbot
0d01179ffc LMS: revises semantics and styling for dashboard messages 2013-10-29 15:17:56 -04:00
Brian Talbot
153694b75f LMS: removing non production-friendly messages 2013-10-29 15:15:10 -04:00
Brian Talbot
280c463209 LMS: adds in styling and base UI for reverification flow 2013-10-29 15:15:10 -04:00
Diana Huang
a25e413fdb Fix settings for verification statuses on the student dashboard 2013-10-29 15:13:45 -04:00
Diana Huang
ee52e0232e Put in a dummy verification status into the dashboard. 2013-10-29 15:13:45 -04:00
Diana Huang
d3a4747b06 Add new user_status functionality to PhotoVerification. 2013-10-29 15:13:45 -04:00
Diana Huang
f314965113 Add tests for some of the new views. 2013-10-29 14:57:23 -04:00
Diana Huang
dd46eb47ab Add barebones reverification flow. 2013-10-29 14:57:23 -04: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