David Ormsbee
dd50ec4e82
Merge design and dev JS/UI for verify student
2013-08-26 15:32:40 -04:00
David Ormsbee
91fab4579b
Merge branch 'diana/verified-certs-payment' into ormsbee/verifyuser_func
...
Conflicts:
common/djangoapps/course_modes/models.py
lms/envs/common.py
lms/envs/dev.py
2013-08-22 14:57:34 -04:00
David Ormsbee
1676fc31a5
Halfway state for course enrollment by mode
2013-08-21 16:21:53 -04:00
David Ormsbee
086f55643e
Bare bones outline of ID verification templates
2013-08-21 16:21:52 -04:00
Jason Bau
a4f5f4e42f
about page changes, refactor processor reply handling
2013-08-21 13:14:21 -04:00
Jay Zoldak
c09da60fe3
The enrollment_action value enroll should not be translated.
2013-08-13 08:43:09 -04:00
Chris Dodge
192d51bf7a
touch-ups per review feedback
2013-08-02 21:37:27 -04:00
Chris Dodge
f041ab1ccc
fix rebase conflicts
2013-08-02 11:22:25 -04:00
Chris Dodge
0937cdcbe6
one more escaping
2013-08-02 09:56:19 -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
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
dc8bd32fb2
Theme the individual course about pages
...
Use the theme's own Google Analytics template (should probably
update to just use parameters once the default GA template is kept
up-to-date). Don't link to the university profile page when a theme
is enabled, as that's an edX-specific feature. Adjust social links
for Stanford, but leave them alone for everyone else (this is just
a hack for the 6/11/13 launch).
2013-06-05 10:27:23 -07:00
jarv
f18321cda2
Merge pull request #1919 from edx/feature/gprice/drupal-auto-enroll-on-registration
...
Update course registration flow for non-modal registration and login
2013-05-06 10:31:29 -07: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
John Jarvis
59c56c2610
fixing old about view, iframe updates
2013-05-02 15:05:12 -04:00
cahrens
d02dc37d9f
On course about page, display course end date if no about page HTML blog (end_date.html) exists.
...
#224
2013-04-04 15:22:56 -04:00
Carlos Andrés Rocha
3d5b571a7e
Move courseware related templates to their own folder
...
Fix moved links
2012-11-19 12:45:46 -05:00
