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

515 Commits

Author SHA1 Message Date
Muhammad Shoaib
914ecac9ac added the course price in the course about page 2014-12-15 12:53:37 -05:00
Clinton Blackburn
fc242ea23e Merge branch 'release' 
Release 2014-12-10
 2014-12-09 17:39:17 -05:00
Sarina Canelake
a1c8f8c468 Style cleanups: legacy instructor dashboard 2014-12-09 13:57:21 -05:00
Brian Talbot
a5913a4836 LMS: adding in basic is-deprecated visual styling 2014-12-09 13:57:20 -05:00
Sarina Canelake
919e411fd9 Only show "Course Statistics at a Glance" in the Admin tab 2014-12-09 13:57:20 -05:00
Sarina Canelake
bfa8349ec4 Clean up Datadump section on legacy dashboard 2014-12-09 13:57:20 -05:00
Sarina Canelake
5aeb412bbe Remove deprecated cohorts management on legacy dashboard 2014-12-09 13:57:20 -05:00
Sarina Canelake
762b0d9b6b Clean up Manage Groups section on legacy dashboard 2014-12-09 13:57:20 -05:00
Sarina Canelake
3474601321 Add CSS rules for legacy dash deprecation warnings 2014-12-09 13:57:20 -05:00
Sarina Canelake
e3179c37cd Clean up Email section of legacy dashboard 2014-12-09 13:57:20 -05:00
Sarina Canelake
d4a06794d0 Clean up Forum Admin section of legacy dashboard 2014-12-09 13:57:19 -05:00
Sarina Canelake
5d7f820d93 Clean up Admin section of legacy dashboard 2014-12-09 13:57:19 -05:00
Sarina Canelake
d8904d9091 Clean up Grade Downloads section of legacy dash 2014-12-09 13:57:19 -05:00
Sarina Canelake
a15110f01c Remove Grade Adjustment code from legacy dash 2014-12-09 13:57:19 -05:00
Sarina Canelake
0a5af2a385 Rename legacy dash template 2014-12-09 13:57:19 -05:00
Will Daly
0fd6dddbae Fix reference error with emailOptIn variable 2014-12-09 08:31:03 -05:00
Waheed Ahmed
222b05a158 Added IMG tag instead of css background property for important visual indicator. 
TNL-892
 2014-12-09 12:38:54 +05:00
Clinton Blackburn
71bc536c6d Merge pull request #6183 from edx/renzo/email-opt-in-copy 
Improved support for multiple organization names
 2014-12-08 14:55:06 -05:00
Renzo Lucioni
1d1baa5009 Improved support for multiple organization names 
Updates copy used in the checkbox label, constructs strings within the view instead of passing through a separate context variable, and alleviates unipain
 2014-12-08 14:10:09 -05:00
Will Daly
1c6d197bd0 Merge pull request #6156 from edx/will/revert-logistration-enablement 
Revert enable login/registration
 2014-12-05 13:06:44 -05:00
Will Daly
8580620b52 Revert "If feature flag is enabled, replace the old login/registration pages with the new combined login/registration page." 
This reverts commit f40447b3c8.

Conflicts:
	lms/urls.py

Revert "Add support for external auth on the combined login/registration page"

This reverts commit 988753395f.

Conflicts:
	lms/templates/courseware/mktg_course_about.html
	lms/urls.py
 2014-12-05 10:41:42 -05:00
Chris
c45e34bf2e Merge pull request #5842 from Stanford-Online/giulio/prerequisites-style-fixes 
Remove extra prerequisites style and class
 2014-12-05 09:03:14 -05:00
Renzo Lucioni
5e41a34dd1 Refrain from setting email opt-in preference when checkbox is missing 2014-12-04 17:35:19 -05:00
Giulio Gratta
54b7a578a2 Remove extra prerequisites style and add classes 2014-12-04 14:25:26 -08:00
srpearce
f2e20f333e Merge pull request #5998 from edx/sylvia/docs/1162 
Sylvia/docs/1162
 2014-12-04 12:19:39 -05:00
Sylvia Pearce
3e779a52f3 Fix minor typo in Trigonometric Functions row 2014-12-04 11:00:37 -05:00
Will Daly
988753395f Add support for external auth on the combined login/registration page 
Add support for redirect URLs in third party auth for combined login/registration page

Remove old login/registration acceptance tests

Add deprecation warnings to old login and register views

Move third party auth util to student_account

Add exception for microsites
 2014-12-04 09:34:51 -05:00
Brian Talbot
a9daaff17b LMS: revising semantic markup of calculator tooltip content 2014-12-03 16:08:33 -05:00
AlasdairSwan
96afb82dbd Added styles for email opt in/out checkbox label 2014-12-02 11:50:31 -05:00
Renzo Lucioni
f5767a961c Prep marketing iframe and relevant courseware view for email opt-in 
Feature flagged. Puts a checkbox in the iframe. The iframe uses an organization_full_name parameter forwarded from Drupal by the courseware views and POSTs an email_opt_in parameter to the student views, preserving it on 403.
 2014-12-01 10:30:16 -05:00
Sylvia Pearce
6d8f2a4ae0 More tweaks to calculator tooltip 2014-11-19 15:04:17 -05:00
Sylvia Pearce
14e022ca30 Tweaks to calculator tooltip 2014-11-19 14:17:30 -05:00
Sylvia Pearce
1b285be264 Second try at a new calculator tooltip 2014-11-19 13:32:49 -05:00
Sylvia Pearce
d7d86cddc7 Update calculator tooltip 2014-11-18 13:57:47 -05:00
Will Daly
4a814c24ba Merge pull request #5948 from edx/will/combine-reg-login-form 
Combined Login/Registration Form
 2014-11-17 16:00:20 -05:00
Sarina Canelake
ab5da97c41 Consistently name edX branded elements within the LMS [OPEN-300] 2014-11-14 10:30:37 -05:00
Will Daly
a5001bab2a Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 
Conflicts:
	lms/static/sass/base/_grid-settings.scss
	lms/static/sass/shared/_footer.scss
	lms/static/sass/shared/_header.scss
 2014-11-13 11:16:16 -05:00
David Ormsbee
43d8c7a712 Merge branch 'release' 
Conflicts:
	lms/djangoapps/shoppingcart/processors/CyberSource2.py
 2014-11-13 10:11:12 -05:00
Dennis Jen
dd38f52358 Merge pull request #5838 from edx/dsjen/feature-flag-analytics-enrollments 
Feature flagged enrollment counts on instructor dashboard.
 2014-11-12 10:40:04 -05:00
Chris Dodge
a93faad78b try importing the exact references we need rather than deferencing it from the djangoapp module 2014-11-11 21:49:13 -05:00
Adam Palay
1d85659b13 Prevent instructors from accidentally downgrading enrollment modes through instructor dash TNL-804 2014-11-10 18:04:22 -05:00
Will Daly
5085b71677 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/third_party_auth/pipeline.py
	lms/djangoapps/verify_student/tests/test_views.py
 2014-11-10 15:05:37 -05:00
Will Daly
73163b9bb0 Use href in marketing link if available to make A/B testing easier 2014-11-10 12:04:07 -05:00
Chris Dodge
3c36f7cbad Add new course_module field which describes what the catalog visibility should be (both, about, none) 2014-11-09 10:36:00 -05:00
Dennis Jen
b27401554c Feature flagged enrollment counts on instructor dashboard. 
* enrollments counts removed from legacy dashboard
 2014-11-04 12:56:53 -05:00
Tim Babych
960f7b206a Fix to marketing iframe middle-click href: course does not always have openable url. 2014-10-28 17:20:57 +02:00
Giulio Gratta
07263de841 Convert icons on course_about to font awesome 2014-10-23 10:54:18 -07:00
Oleg Marshev
f550359d67 Merge pull request #5545 from edx/oleg/lms-dashboard-course-start-time 
Add course start/end time to student dashboard.
 2014-10-23 11:56:37 +03:00
Tim Babych
fc6cb50256 TNL-281: reduce amount of JS in marketing iframe 2014-10-22 20:54:45 +03:00
Oleg Marshev
21056b950e Use DATE_TIME format for course start or end time in student dashboard. 2014-10-22 16:23:32 +03:00