Greg Price
5268d982ce
Merge pull request #2067 from edx/fix/gprice/mktg-button-closed-registration
...
Disable marketing registration button for courses that user cannot enrol...
2013-05-17 12:40:54 -07:00
Greg Price
db3189d5ad
Disable marketing registration button for courses that user cannot enroll in
2013-05-17 14:10:04 -04:00
Greg Price
e4509ae3ad
Make "access courseware" buttons for marketing site break out of iframes
2013-05-17 13:31:22 -04:00
Greg Price
ff2ba68d79
Tweak behavior of registration button for marketing site
...
If a user is already registered for a course but the course has not started
yet, display a grey button that says "you are registered" and goes nowhere
instead of the blue "access courseware" button, which goes to the LMS course
about page (which 404s).
2013-05-16 15:06:48 -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
Giulio Gratta
953af59b0d
fixing some more LMS accessibility issues
2013-05-07 10:25:16 -07:00
Greg Price
ef27b8f787
Make register button for marketing site break out of iframe
...
Use window.top.location.href instead of location.href for redirection.
2013-05-07 12:41:33 -04:00
Greg Price
2c67352606
Fix new view containing only register button to properly enroll
2013-05-07 11:34:41 -04:00
Brian Talbot
9a01bb5e52
edx.org - adding back js-dependent register class to register button
2013-05-07 11:02:02 -04:00
Brian Talbot
3b84d77131
edx.org - resolved (in a dirty way) iframed buttons picking up style in IE and added in coming soon style treatment
2013-05-07 10:25:41 -04: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
John Jarvis
d69bbf272e
using new template for "coming-soon"
2013-05-06 12:30:18 -04:00
John Jarvis
e852574a17
adding 404 handling for courses that do not exist
2013-05-06 11:54:09 -04:00
jarv
bf5ac6c263
Merge pull request #1950 from edx/jarv/drupal-new/iframe
...
Jarv/drupal new/iframe
2013-05-06 07:46:28 -07:00
John Jarvis
258537e3d2
adding csrf middleware token to form submission
2013-05-03 13:05:10 -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
Brian Talbot
d7d68a1e8c
edx.org - resolved JQuery submit() method error on <iframe> register button actions
2013-05-02 15:31:17 -04:00
John Jarvis
59c56c2610
fixing old about view, iframe updates
2013-05-02 15:05:12 -04:00
Brian Talbot
7705941a65
edx.org - added in isolated register button styling/states for <iframe>-based registration fix
2013-05-02 11:54:16 -04:00
John Jarvis
01f8c4c816
Adding iframe view
...
example:
http://localhost:8000/courses/HarvardX/CB22x/2013_Spring/mktg-about
2013-04-30 09:44:21 -04:00
ichuang
f1a899ac1c
Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/masquerade-v3
2013-04-20 12:25:47 -04:00
ichuang
3de927fe01
untabify course_nagivation.html
2013-04-17 21:22:08 -04:00
Calen Pennington
6644b78819
Fix gradebook when using grade cutoffs other than A/B/C
2013-04-16 11:38:58 -04:00
ichuang
ffb125f8a9
course_navigation for masquerade
2013-04-13 22:46:48 -04:00
ichuang
fb0a23238a
allow staff to masquerade as student - works
...
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/courseware/course_navigation.html
2013-04-13 22:46:39 -04:00
cahrens
f0d2ff7ba4
Change display_timezone to show_timezone.
2013-04-08 09:11:10 -04:00
cahrens
e4dac6e310
Add display_timezone so course authors can choose not to display timezones in LMS.
2013-04-08 08:38:52 -04:00
Calen Pennington
262050e4ff
Merge pull request #1778 from MITx/feature/ichuang/add-dump-grades-config-to-instructor-dashboard
...
add dump of description of grading configuration to instructor dashboard
2013-04-05 06:30:43 -07:00
Christina Roberts
de44813732
Merge pull request #1808 from MITx/bug/christina/studio
...
Show course end date on course about page
2013-04-04 13:34:00 -07: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
Brian Wilson
d3e7739b3b
add user name and email to progress page
2013-04-04 12:03:08 -04:00
Don Mitchell
9a7324ebfa
Merge pull request #1798 from MITx/bug/christina/studio
...
Fix due date bug.
2013-04-03 10:26:40 -07:00
cahrens
42fbc16006
Feedback from code review.
2013-04-02 14:10:56 -04:00
ichuang
5477d6430a
add instructions to idashboard for deleting state of non-problem xblocks
2013-04-01 19:59:20 +00:00
cahrens
8b26d3a8a1
Protect against no due property (as was there before).
2013-04-01 14:42:05 -04:00
cahrens
ee2b92ab02
Protect against no due property (as was there before).
2013-04-01 14:38:56 -04:00
cahrens
845e86b8d1
Format timestamp.
2013-04-01 14:32:03 -04:00
cahrens
16f4a3f9c1
Convert due date to a Date (vs. a string with no year).
2013-04-01 11:37:05 -04:00
ichuang
cac7f8a289
allow student state of module other than problem to be reset by instructor
...
this makes it possible to reset open ended response problems
2013-03-31 19:43:39 +00:00
ichuang
de5fa56b19
add dump of description of grading configuration to instructor dashboard
2013-03-31 13:18:54 +00:00
Calen Pennington
fb8352e2cc
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
2013-03-15 10:33:54 -04:00
David Ormsbee
e135a4052b
Better error checking with Analytics are unavailable.
2013-03-13 15:16:36 -04:00
David Ormsbee
cc82ffe10a
Give a more comprehensive grade distribution of problems analytic
2013-03-10 00:48:46 -05:00
David Ormsbee
3bb3cf3ca3
Consolidate some of the analytic fetching logic in the instructor dashboard.
2013-03-09 18:52:20 -05:00
Calen Pennington
93db5acc15
Make display_name defaulting explicit
2013-03-08 14:58:09 -05:00
Calen Pennington
d8b99e1e8e
Make remote_gradebook use the new field instead of metadata
2013-03-08 13:21:58 -05:00
David Ormsbee
c43d4b3469
re-added Students with correct answers to analytics dashboard
2013-03-07 23:39:10 -05:00
David Ormsbee
c144795588
Re-enable a couple of analytics on the dashboard to test layout
2013-03-07 10:01:56 -05:00
David Ormsbee
d0bff1ed3c
Merge branch 'master' into jmpm-analytics
...
Conflicts:
lms/djangoapps/instructor/views.py
lms/envs/common.py
lms/templates/courseware/instructor_dashboard.html
2013-03-06 17:09:09 -05:00
Calen Pennington
8a9ba79d1f
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/views.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
2013-03-06 12:15:07 -05:00
