Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

6923 Commits

Author SHA1 Message Date
Stephen Sanchez
aba57382ab Merge pull request #5420 from edx/sanchez/enrollment-success-message 
Add new enrollment message to the dashboard
 2014-10-02 09:59:39 -04:00
Stephen Sanchez
bf112f7ef0 Add new enrollment message to the dashboard 
The body of the enrollment message template

Tokenize platform name in message.

Changing to a datetime enrollment approach

Adding sorting. A little refactoring.

Adding confguration model for time delta

Adding admin registration and basic form for new config model.

Fixing docstring typo

Updating default time delta to 0, adding test to show it disabled functionality.

Removing the form from configuration and tweaking the enrollment message html
 2014-10-02 12:32:35 +00:00
Adam
db82d45681 Merge pull request #5461 from edx/release 
Release
 2014-10-01 13:14:20 -04:00
Calen Pennington
183e04106a Merge pull request #5392 from cpennington/escape-course-ids-in-html 
Properly escape CourseKeys and UsageKeys in html templates
 2014-10-01 12:32:54 -04:00
Christina Roberts
7f4cc1c75c Merge pull request #5407 from edx/cohort-management 
Cohorts UI
 2014-10-01 11:01:03 -04:00
Calen Pennington
77a04daa07 Properly escape CourseKeys and UsageKeys in html templates 
[LMS-11372]
[LMS-11370]
 2014-10-01 10:26:52 -04:00
Adam
6a5fc054ba Merge pull request #5445 from edx/release 
Release
 2014-10-01 09:32:23 -04:00
Andy Armstrong
6219ecacfe Support adding cohorts from the instructor dashboard 
TNL-162
 2014-10-01 09:22:32 -04:00
Brian Talbot
62db7a82a1 converting instructor dashboard message UI to use .is-hidden vs.is-shown stateful CSS classes 2014-10-01 09:22:31 -04:00
Andy Armstrong
8627fdef32 Support adding students to a cohort via the instructor dashboard. 
TNL-163
 2014-10-01 09:22:31 -04:00
Brian Talbot
13882b7544 adding copy revisions and light styling support for cohort management 2014-10-01 09:22:31 -04:00
Brian Talbot
3aa842db52 Adding static rendering for cohort group creation UI 
* adding styling/markup for "add new group" controls, messages, and form
* small FED and UI changes to overall cohort management UI
 2014-10-01 09:22:31 -04:00
Nimisha Asthagiri
b4c826e747 TNL-329 Client-side work for displaying cohort description. 2014-10-01 09:22:30 -04:00
Brian Talbot
8df19d819f correcting needed markup for cohort management static UX template 2014-10-01 09:22:30 -04:00
Brian Talbot
267e8c97f1 LMS: adds static cohort group management UI to the Instructor Dashboard 2014-10-01 09:22:30 -04:00
Brian Talbot
f753a09fbd LMS: revises membership UI layout on instructor dashboard 2014-10-01 09:22:29 -04:00
Andy Armstrong
9e366fe202 Show cohorts on the new instructor dashboard 
TNL-161

Remove placeholder text
 2014-10-01 09:22:29 -04:00
Usman Khalid
548b01ab7c Disable http range requests in pdf.js. 
A bug in pdf.js or Chrome is causing pdf books to not load.

TNL-488
 2014-10-01 18:12:30 +05:00
Renzo Lucioni
254a0ce6c8 Allow changing of language preference from profile page 2014-09-30 21:11:02 -04:00
Adam Palay
0c4f98a89b update password reset template (TNL-503) 2014-09-29 16:15:31 -04:00
Will Daly
9083c49f07 Put student profile third party auth behind a feature flag 2014-09-29 11:05:53 -04:00
Sarina Canelake
c57f1c818b Merge pull request #5290 from mitocw/bdero/fix-grade-summary-opaque-keys 
Remove unimplemented legacy dashboard grade_summary feature
 2014-09-28 16:02:49 -04:00
Brandon DeRosier
5bfa313dcb Remove unimplemented grade_summary feature. 2014-09-26 12:53:53 -04:00
Stephen Sanchez
c88e914077 Merge pull request #5398 from edx/sanchez/fix_about_page_header 
Allowing new styles on White Label about pages.
 2014-09-26 08:18:08 -04:00
Stephen Sanchez
3fd3bd4e43 Crude solution to allowing new styles on White Label about pages. 2014-09-25 20:31:18 +00:00
Andy Armstrong
0ed3a95d3a Merge branch 'release' 
Conflicts:
	AUTHORS
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
	common/test/acceptance/pages/lms/dashboard.py
 2014-09-25 16:25:45 -04:00
Will Daly
84463ef1a5 Added test for email activation and confirmation 2014-09-25 09:46:02 -04:00
Will Daly
afa39a862e Merge pull request #5383 from edx/will/account-and-profile-rebase 
Add Django apps for student account and profile
 2014-09-25 09:34:10 -04:00
Will Daly
7f8c6bb058 Add Django apps for student account and profile. 
Add Python APIs for account/profile information to user_api
Updating profile page to have social linking

Authors: Renzo Lucioni, Alasdair Swan, Stephen Sanchez, Will Daly
 2014-09-25 08:36:22 -04:00
Anton Stupak
85af48a31c Merge pull request #5276 from edx/anton/forums-topic 
Change the topic of a previously posted post.
 2014-09-25 10:58:09 +03:00
Stephen Sanchez
c28162b5b4 Merge pull request #5335 from edx/sanchez/add_course_info_to_wiki 
Making the django main template navigation course aware.
 2014-09-24 16:16:15 -04:00
Andy Armstrong
e22bd1b667 Merge pull request #5384 from edx/frances/fix/prof-ed-status-AB-tes 
fixes for status for prof ed and verified registration
 2014-09-24 15:22:09 -04:00
Frances Botsford
b889f9ef11 fixes for status for prof ed and verified registration on both variants of AB test 2014-09-24 14:11:18 -04:00
polesye
00c7e60e07 TNL-171: Change topic of a previously posted post. 2014-09-24 20:28:14 +03:00
AlasdairSwan
328c076bf0 Merge pull request #5333 from edx/alasdair/header-footer-accessibility-updates 
Alasdair/header footer accessibility updates
 2014-09-24 13:08:15 -04:00
Paul Medlock-Walton
b797c6bd09 username and email request for lti module 
allow username and email can be passed to a lti third party app
ask user permission when lti button is clicked
allow course editor to customize text on lti launch button
 2014-09-24 20:05:42 +03:00
Waheed Ahmed
f14dd9d3c5 Disabled student view if course is not yet released for students. 
LMS-6617

Fixed wiki merge url regex.
TNL-413

ECOM-345 changed any lists that could display with only 1 item to divs

ECOM-345 Added aria tags for header

ECOM-364 Accessibility update for footer

added my name to the authors file

Addressing feedback from code review - removing unnecessary element references in selectors

Updated header aria-label to be main
 2014-09-24 16:52:21 +00:00
Stephen Sanchez
eb7611286c Making the django main template navigation course aware. 2014-09-24 15:57:00 +00:00
chrisndodge
ddb0ab9027 Merge pull request #5361 from edx/cdodge/change-invoice-email-and-attachments 
change registration code email and attachments, per product requirements
 2014-09-24 10:56:41 -04:00
Chris Dodge
0c72e37374 change registration code email and attachments, per product requirements 
remove extra lines

conditionalize address line 2
 2014-09-24 09:13:37 -04:00
chrisndodge
d2d1f7b391 Merge pull request #5357 from edx/cdodge/allow-zero-percent-discount 
per product, allow for zero percentage coupons
 2014-09-24 08:47:21 -04:00
David Baumgold
9542b0a885 Revert "Puts course listings in a sane order" 
This reverts commit 1955aade36675289bdbc01554b6f74242754a746.
 2014-09-23 18:45:59 -04:00
Chris Dodge
a28b45c46d per product, allow for zero percentage coupons 2014-09-23 15:29:26 -04:00
David Baumgold
15b8aa4b6c Merge pull request #3747 from edx/pmitros/sane-course-listing-order 
Puts course listings in a sane order
 2014-09-23 13:09:09 -04:00
frances botsford
4e1aa77b99 Merge pull request #5303 from edx/diana/update-prof-ed-flow 
Change some text when in professional ed flow
 2014-09-23 12:44:58 -04:00
Brian Talbot
1b25be655c revising markup and styling for listing header on LMS course dashboard 2014-09-23 12:02:30 -04:00
Piotr Mitros
19356ffd4b Puts course listings in a sane order 2014-09-23 12:02:30 -04:00
Frances Botsford
ef1ef98653 adjusting ID verified status to be just verified status 2014-09-22 16:10:23 -04:00
Waheed Ahmed
3c8eacd440 Disabled student view if course is not yet released for students. 
LMS-6617
 2014-09-22 12:50:46 +05:00
John Eskew
4aa2dc5289 Merge pull request #5302 from edx/release 
Release merge - post hotfix-2014-09-19-1
 2014-09-19 14:31:16 -04:00