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

13011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Greg Price
6f06a3d92a Make login link button in header work with course enrollment flow 
When an unauthenticated user clicks the registration button for a course, they
are redirected to the registration page with query params that are ultimately
included in the form that gets submitted so they can be enrolled in the course
upon successful registration. The header login button is fixed to pass the same
query parameters to the login page so the user can be enrolled in the course
upon successful login.
 2013-05-10 11:03:38 -04:00
Greg Price
a0fb4d6c85 Merge branch 'master' into drupal-new 
Conflicts:
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/base/_base.scss
	lms/templates/forgot_password_modal.html
 2013-05-10 10:30:10 -04:00
Greg Price
c765906fc5 Merge pull request #1986 from edx/feature/gprice/fix-help-modal-text 
Update "thank you" text in help modal
 2013-05-09 14:37:13 -07:00
Greg Price
89d0dc1963 Update "thank you" text in help modal 
As per request from Mary.
 2013-05-09 17:16:43 -04:00
Diana Huang
f9023fd112 Merge pull request #1983 from edx/diana/jobs-page-update 
Jobs page updates.
 2013-05-09 11:04:14 -07:00
Diana Huang
e5b18a5688 Put Front End Developer back in. 2013-05-09 13:58:25 -04:00
David Baumgold
d09e93142f Merge pull request #1980 from edx/backbone-1.0.0 
Upgrade to Backbone 1.0.0
 2013-05-09 09:34:35 -07:00
Greg Price
623c55222f Merge pull request #1987 from edx/feature/gprice/redirect-if-logged-in 
Redirect authenticated users from registration or login to dashboard
 2013-05-09 07:50:49 -07:00
Diana Huang
ec5f239d91 Add in new Coordinator position. 2013-05-09 09:12:07 -04:00
Jason Bau
ca1aeb5bb8 Merge pull request #1988 from edx/devops/jbau/server_email_lms_setting 
Set SERVER_EMAIL so that mail_admins works
 2013-05-08 14:30:19 -07:00
Greg Price
4bba6c7d55 Merge pull request #1981 from edx/fix/gprice/drupal-mktg-links 
Remove marketing URLs from common.py
 2013-05-08 14:23:48 -07:00
Jason Bau
1354cd412a Set SERVER_EMAIL so that mail_admins works 2013-05-08 14:16:20 -07:00
Greg Price
f8539cc2d7 Redirect authenticated users from registration or login to dashboard 2013-05-08 17:10:54 -04:00
Greg Price
8e6a0914d4 Merge pull request #1984 from edx/feature/gprice/accept-zendesk-ssl-cert 
Disable SSL cert validation for Zendesk API
 2013-05-08 13:30:04 -07:00
Diana Huang
1e61bbd1c8 Jobs page updates. 2013-05-08 16:06:08 -04:00
Brian Talbot
b36a05b8cb Merge pull request #1982 from edx/fix/btalbot/studio-alerts 
studio - alerts: synced up styles and sample markup
 2013-05-08 12:51:45 -07:00
Greg Price
0e525d69ff Disable SSL cert validation for Zendesk API 
They are currently using a CA that is not installed on our servers. Since it
isn't a top-tier CA and we aren't submitting anything particularly sensitive
anyway, we don't have to feel too bad about this.
 2013-05-08 15:45:12 -04:00
Brian Talbot
25dd2c7d67 studio - alerts: synced up example HTML to show advanced settings live notification, aria roles, and action classes; integrated typography mixins 2013-05-08 15:30:17 -04:00
Christina Roberts
0c6c7868ae Merge pull request #1965 from edx/feature/christina/fields 
Pass through the value (either default or inherited) that a metadata field WILL have if it is not explicitly set.
 2013-05-08 10:32:55 -07:00
Greg Price
e190dc00d6 Remove marketing URLs from common.py 
The MKTG_URLS dictionary is overwritten completely in aws.py anyway, and we
shouldn't be trying to keep both the production config and LMS code in sync
with changes to the marketing site.
 2013-05-08 11:06:02 -04:00
Diana Huang
d522b53f6d Merge pull request #1974 from edx/diana/hide-api-key 
Hide the Comments Service API key during logging.
 2013-05-08 07:50:31 -07:00
David Baumgold
7f69e45b9e whitespace changes 2013-05-08 09:29:20 -04:00
David Baumgold
ec79ebd4a7 Updated Backbone.js and Underscore.js 
Backbone 1.0.0, Underscore 1.4.4
 2013-05-08 09:29:15 -04:00
Will Daly
b19c80ccb5 Merge pull request #1957 from edx/fix/will/bug_392 
Added unit tests for safe_key() to resolve bug 392.
 2013-05-08 06:23:49 -07:00
Greg Price
c82b28aac3 Merge pull request #1977 from edx/fix/gprice/drupal-registration-links 
Fix links to honor code, ToS, and privacy policy for marketing site
 2013-05-07 14:58:26 -07:00
Greg Price
7143749d7b Fix links to honor code, ToS, and privacy policy for marketing site 2013-05-07 17:54:32 -04:00
VikParuchuri
fb4685fe9a Merge pull request #1976 from edx/vik/fix/oe-bugs 
Vik/fix/oe bugs
 2013-05-07 14:54:17 -07:00
Vik Paruchuri
5cd9641f24 Update peer grading comment 2013-05-07 17:35:00 -04:00
Vik Paruchuri
530ac51c1c Add .error callback back in 2013-05-07 17:33:34 -04:00
Greg Price
50d8321bc5 Merge pull request #1975 from edx/fix/gprice/drupal-registration-button-text 
Fix registration button text
 2013-05-07 14:21:48 -07:00
Vik Paruchuri
2648a19cc2 Fix check for use for single location 2013-05-07 17:08:14 -04:00
Greg Price
ab7795aaf6 Merge pull request #1972 from edx/fix/gprice/drupal-fix-course-link 
Fix courses link in LMS header when not logged in
 2013-05-07 13:59:23 -07:00
Vik Paruchuri
e0d1eca6aa Delete two lines. without this, the xblock fields are never created in cases where the module is "fresh" (ie has no existing data) 2013-05-07 16:56:08 -04:00
Greg Price
23eacdbea2 Fix registration button text 2013-05-07 16:45:33 -04:00
caesar2164
fe5fc448e6 Merge pull request #1948 from edx/feature/giulio/accessibility 
Feature/giulio/accessibility
 2013-05-07 13:41:04 -07:00
Diana Huang
c6f63140a2 Hide the API key during logging. 2013-05-07 16:38:38 -04:00
Greg Price
dadb0b6931 Fix courses link in LMS header when not logged in 2013-05-07 16:35:08 -04:00
jarv
621f4c65fe Merge pull request #1971 from edx/jarv/new-mktg-url 
be more forgiving about the iframe url
 2013-05-07 13:19:10 -07:00
John Jarvis
0b7af27b4b be more forgiving about the iframe url 
If anything after mktg/ does not parse as a course-id return "coming soon"
This will prevent 404 errors when urls are incorrect on the marketing
site.
 2013-05-07 16:00:00 -04:00
Giulio Gratta
91e2a39ec7 moving preventDefault() statements to the local script tag 2013-05-07 12:50:59 -07:00
Will Daly
aaa383b8ca safe_key() now hashes the prefix/version as well, just in case 
these are configured to be too long in the settings.
 2013-05-07 15:48:51 -04:00
Vik Paruchuri
1398b55713 Comment touched modules 2013-05-07 15:48:19 -04:00
Vik Paruchuri
9e03280f50 Make peer grading fields stringy and fix js to avoid strange error 2013-05-07 15:33:15 -04:00
Greg Price
f7f791ab69 Merge pull request #1963 from edx/feature/gprice/drupal-iframe-breakout 
Make register button for marketing site break out of iframe
 2013-05-07 11:21:54 -07:00
Giulio Gratta
87362aa887 Merge branch 'master' of github.com:edx/mitx into feature/giulio/accessibility 2013-05-07 11:21:44 -07:00
Giulio Gratta
f7719a60c7 changed offending javascript:void() hrefs on anchors to preventDefault() 2013-05-07 11:20:47 -07:00
Diana Huang
30e1dd6e8e Merge pull request #1966 from edx/diana/drupal/fix-lms-links 
Better error handling for when marketing urls are missing
 2013-05-07 10:56:06 -07:00
Greg Price
0ff4d1ca9f Merge pull request #1968 from edx/feature/gprice/drupal-course-redirects 
Redirect from LMS courses page to marketing courses page
 2013-05-07 10:34:35 -07:00
Giulio Gratta
953af59b0d fixing some more LMS accessibility issues 2013-05-07 10:25:16 -07:00
Giulio Gratta
a266330b2d made signup form labels and close modal button accessible friendly and tweaked login form to match signup form 2013-05-07 10:25:08 -07:00