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

127 Commits

Author SHA1 Message Date
Usman Khalid
316b4eee95 Merge pull request #1073 from edx/usman/lms1026-find-courses-link-optional 
Added setting to disable 'find courses' links
 2013-09-27 12:40:07 -07:00
Usman Khalid
724fc5adbd Updated copy in dashboard 2013-09-26 15:04:43 +05:00
Renzo Lucioni
ac0e65ab2a Update CHANGELOG 2013-09-25 16:26:04 -04:00
Renzo Lucioni
f1ccf1c06b Integrate split testing and LMS tabs experiments 2013-09-25 00:27:36 -04:00
Usman Khalid
3ff203d11f Renamed setting ENABLE_STUDENT_SELF_ENROLLMENT to COURSES_ARE_BROWSABLE 2013-09-23 15:04:11 +00:00
Usman Khalid
d2cd8a6a58 Added setting to disable find courses links 2013-09-20 15:59:34 +05:00
Adam
75b7514c4f Merge pull request #965 from felipemontoya/features/fmo/lms-i18n-strings 
Features/fmo/lms i18n strings
 2013-09-19 12:05:35 -07:00
Felipe Montoya
0c44ec1996 String extraction at input value attributes is done with single quotes 2013-09-19 13:54:35 -05:00
Felipe Montoya
893d22515d Something for the user dashboard 2013-09-19 10:52:29 -05:00
James Tauber
c6dfd97eeb Merge pull request #902 from antoviaque/accessibility 
Help Modal - Accessibility Fixes
 2013-09-13 08:21:47 -07:00
Felipe Montoya
a5fd04a95d i18n: submit buttons at dashboard 2013-09-12 18:12:49 -05:00
Xavier Antoviaque
23eab5c5bd accessibility: Replace close modal button <div> by <a> link (LMS-582) 
The close button for the modal dialog was marked up as a paragraph,
containing a graphical text character, inside two div elements, with an
associated click event. This made the button unusable for keyboard
users.

Replaced <divs> with a link element (<a role="button"), adapted the CSS
accordingly, and updated the existing <a> modal close buttons.
 2013-09-09 16:43:44 -03:00
Brian Talbot
f4bdd73839 Verification: adds in verified/enrollment status into dashboard course listings 2013-09-05 14:29:11 -04:00
David Ormsbee
78acd083be Merge branch 'master' into ormsbee/verifyuser3 
Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss
 2013-09-04 10:58:30 -04:00
Sarina Canelake
52d9320e62 Hide "Email Settings" from student dash if bulk email not enabled 
Some minor pep8 cleanup
 2013-08-29 12:40:33 -04:00
Sarina Canelake
65f7b098dd Bulk Email: Add design styling 
Switch to using decorators; refactor and cleanup tests.
 2013-08-29 12:40:32 -04:00
Kevin Luo
907bf6e1b7 Add bulk email feature for instructors, with optout option 
Adds a new Email link to the instructor dashboard for frontend interface to send
email to course members. Adds a feature flag ENABLE_INSTRUCTOR_EMAIL to toggle this.
Creates a new djangoapp bulk_email that handles this action by getting the recipient
list and batching the emails to different celery tasks to do the actual sending.
Requires lynx package to convert HTML email to plaintext. Handles SMTP errors by
retrying or falling through to the next email. Adds the option to opt out of course
specific emails in the user dashboard with an Email Settings link for each course.
Uses severable configurable settings with defaults. DEFAULT_BULK_FROM_EMAIL
specifies the from address for email. EMAILS_PER_TASK specifies the number of emails
each celery task takes on. EMAIL_HOST, EMAIL_PORT, EMAIL_HOST_USER,
EMAIL_HOST_PASSWORD, and EMAIL_USE_TLS for the SMTP email backend settings.

Co-authored-by: Akshay Jagadeesh <akjags@gmail.com>
 2013-08-29 12:40:31 -04:00
Diana Huang
40393b21f7 Add in a new HTML class that represents the enrollment mode. 2013-08-27 09:42:25 -04:00
Chris Dodge
2e1eb1dce5 add escaping 2013-08-19 23:41:49 -04:00
Chris Dodge
f599d4b508 don't put the substitutions in quotes 2013-08-19 23:41:49 -04:00
Chris Dodge
f041ab1ccc fix rebase conflicts 2013-08-02 11:22:25 -04:00
Chris Dodge
3a2bb7ba01 add escaping 2013-08-02 09:51:41 -04:00
Chris Dodge
93df9c4c30 resolve merge conflicts 2013-08-02 09:41:02 -04:00
Adam Palay
69ffb6a87b replace edx with variable substitution 
fixes template errors

keep tos untranslated

formatting fixes
 2013-07-31 19:39:15 -04:00
Calen Pennington
e8ee29786f Remove news carousel and other unused pages 
Remove unused course_filter page

removes university_profile urls and templates

removes all university_profile views

remove news from templates/index
 2013-07-31 19:39:15 -04:00
Calen Pennington
0d3c44996a LMS i18n from Tsinghua 2013-07-31 19:39:15 -04:00
Giulio Gratta
86a1e4263d added alt tags to course cover images and find course page logo 2013-07-02 09:26:41 -07:00
Jason Bau
824fb9a311 The bulk of Shibboleth authentication for Stanford 
Highlights:
* The url '/shib-login/' interfaces with apache/mod_shib via
  request.META to handle shibboleth login and registrations
* Courses can designate 'enrollment_domains' to limit enrollment
  to users with a linked ExternalAuthMap verified by a particular
  identity provider
* Tests
* Logging

 Changes to be committed:

	new file:   common/djangoapps/external_auth/migrations/0001_initial.py
	new file:   common/djangoapps/external_auth/migrations/__init__.py
	new file:   common/djangoapps/external_auth/tests/test_shib.py
	modified:   common/djangoapps/external_auth/views.py
	modified:   common/djangoapps/student/views.py
	modified:   common/lib/xmodule/xmodule/course_module.py
	modified:   lms/djangoapps/courseware/access.py
	modified:   lms/djangoapps/courseware/tests/test_access.py
	modified:   lms/envs/common.py
	modified:   lms/envs/dev.py
	modified:   lms/envs/test.py
	modified:   lms/templates/courseware/course_about.html
	modified:   lms/templates/dashboard.html
	modified:   lms/templates/extauth_failure.html
	modified:   lms/templates/navigation.html
	modified:   lms/templates/register.html
	modified:   lms/templates/signup_modal.html
	modified:   lms/urls.py
	renamed:    lms/wsgi_apache.py -> lms/wsgi_apache_lms.py
 2013-06-19 00:48:18 -07:00
Nate Hardison
2ab00eefa7 Use the contact email setting instead of if/else 
Remove the Stanford-specific if/else hack to set the appropriate
contact email address and use the `CONTACT_EMAIL` setting instead.
 2013-06-05 10:27:24 -07:00
Nate Hardison
227271fec6 Theme the courseware dashboard 
Again, most of the work here is replacing "edX" with the
`PLATFORM_NAME` setting. Need to ensure that the `news` boolean is
indeed a falsy value as well, or just add a `theme_enabled()` test
to disable the news block entirely (since news is an edX-specific
feature).
 2013-06-05 10:27:23 -07:00
Greg Price
b8d2276de7 Remove dashboard links for unstarted courses 
If a course is not started, the course image and title on the dashboard link
to the course about page. Because the LMS course about pages do not exist
(i.e. 404) with the marketing site enabled, we simply do not use a link if
the course has not started.
 2013-05-16 15:06:48 -04:00
Diana Huang
a081ba4bbb Merge pull request #1934 from edx/diana/drupal/fix-lms-links 
Fix links between marketing site and courseware.
 2013-05-06 14:14:29 -07:00
Diana Huang
6110b54ca8 Address code review feedback 
* Fix indentation/line break issues
* Handle marketing root URL as a separate case in marketing_link
* Move link map to its own setting.
 2013-05-06 14:56:06 -04:00
Diana Huang
c9a6fe18f0 Create new marketing_link function to abstract link generation 
and use it for the new marketing site links.
 2013-05-03 15:06:24 -04:00
Diana Huang
d35283cf65 Reduce the amount of repeated HTML and add checks for the correct settings. 2013-05-03 10:17:40 -04:00
Greg Price
e5846e64bd Modify course registration flow for new login and registration pages 
Now that we are using separate pages for login and registration rather than
modals, clicking the registration button for a course should direct an
unauthenticated user to the registration page, and the user should be enrolled
in the course upon successful registration. Likewise, an unauthenticated user
attempting to unenroll from a course should be directed to the login page and
subsequently unenrolled from the course upon successful login. The enrollment
change service also now uses HTTP status codes rather than JSON to communicate
status to the front end.
 2013-05-03 10:01:11 -04:00
Diana Huang
e0ac6834da Fix links between marketing site and courseware. 
Update links in footer to point to the right pages.
Update link on dashboard without any classes.
Update links in header.
Update links on sign in and register pages.
 2013-05-03 09:31:47 -04:00
Calen Pennington
93db5acc15 Make display_name defaulting explicit 2013-03-08 14:58:09 -05:00
Calen Pennington
e7900859b6 Remove the 'title' alias for lms.display_name 2013-03-06 15:11:08 -05:00
John Jarvis
615e6da2f4 Minor update to embargo text 2013-01-29 16:47:09 -05:00
John Jarvis
3f740976bc Adding dashboard text for certificate restriction 2013-01-29 13:24:17 -05:00
John Jarvis
3a6d45e716 Grade a student even if they are on the restricted list 2013-01-29 11:13:30 -05:00
Brian Talbot
a756776836 pearson registration - revised rejection message text on dashboard, synced up email edx link text, revised contact styles/markup to remove giant red button dashboard for rejections 2013-01-16 17:26:29 -05:00
Brian Wilson
ef0f973ca4 display client_candidate_id when registration accepted; strip whitespace from accommodation_request; cosmetic cleanup on pearson management commands. 2013-01-15 16:00:10 -05:00
Brian Wilson
9e157b91f0 change urls from xxx_test_registration to xxx_exam_registration. 2013-01-15 00:59:34 -05:00
Brian Talbot
759bb137b4 pearson registration - adjusted style for rejected message state on dashboard 2013-01-10 17:08:01 -05:00
Brian Wilson
8ad9bc5949 Move Pearson URL to settings. Fix Register button. Other small changes. 2013-01-09 11:26:54 -05:00
Brian Wilson
a5cce4769e add accommodation listing, and revise error messages 2013-01-09 02:14:02 -05:00
Brian Wilson
25f08374ca hook up more registration status boxes 2013-01-08 17:42:15 -05:00
Brian Talbot
352f284624 pearson registration - revised UI states for reg form, simplified markup for form fields, synched button styles/text b/t registration form and dashboard 2013-01-08 11:37:26 -05:00