David Ormsbee
b597b17db1
Add support for replicating course enrollment/unenrollment to course databases
2012-08-10 02:02:44 -04:00
Rocky Duan
0ae68e7324
Merge branch 'master' of github.com:MITx/mitx into merge
...
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/course_navigation.html
2012-08-06 22:38:31 -04:00
Rocky Duan
7c58fd27a1
Merge branch 'master' of github.com:MITx/mitx
...
Conflicts:
lms/templates/profile.html
2012-08-04 18:07:27 -04:00
Rocky Duan
09baabee0b
added command: run rake django-admin[sync_user_info] to sync info to discussion
2012-08-04 18:00:57 -04:00
Rocky Duan
69e28e3966
callback to sync user info
2012-08-04 17:59:44 -04:00
ichuang
3f83904c12
if AUTH_REQUIRE_STAFF_FOR_COURSE then course list = those accessible
2012-08-04 10:19:54 -04:00
ichuang
30922fb449
add ACCESS_REQUIRE_STAFF_FOR_COURSE feature for enrollment check
2012-08-03 21:39:23 -04:00
ichuang
a7103ff893
switch to PascalCase, remove unnecessary assignment
2012-08-02 13:39:12 -04:00
ichuang
a759850e3e
add SSL / MIT certificates auth; clean up external_auth.views
2012-08-01 22:42:06 -04:00
ichuang
4874fa51ef
remove cruft from student.views
2012-08-01 15:00:27 -04:00
ichuang
10ebcefd54
add openid authentication
2012-08-01 14:59:55 -04:00
ichuang
381d247589
djangoapps/student/views.py now uses soup.getText, which needs beautifulsoup4
2012-07-31 21:43:29 -04:00
Victor Shnayder
3cc601b398
Clean up course_info views
...
* catch exceptions and return a 404 if course not found
* add Location.is_valid(), tests
* stub of jumpto/ view.
2012-07-27 16:08:23 -04:00
Matthew Mongeau
8e2ced916f
Add field-error class to field with issues.
2012-07-26 14:06:29 -04:00
Calen Pennington
73d6565fac
Merge remote-tracking branch 'origin/hotfix/1.0.1'
...
Conflicts:
common/djangoapps/student/views.py
2012-07-26 09:05:57 -04:00
Matthew Mongeau
bd9da89fe9
Move press articles to json.
2012-07-25 17:31:34 -04:00
Calen Pennington
d8f8d8c656
Merge branch 'release/1.0'
...
Conflicts:
common/djangoapps/student/views.py
lms/djangoapps/courseware/courses.py
2012-07-24 08:52:50 -04:00
David Ormsbee
f22810524d
Use settings.SITE_NAME instead of hardcoded edx.org
2012-07-23 23:54:35 -04:00
David Ormsbee
614f4540d0
Place a domain_override to force Django to use edx.org instead of example.com.
...
Django hardcodes the subject line for password reset emails. You're supposed
to be able to override it with a properly named template, but that didn't
make it into 1.3.1 (which is what we're deploying on now). We're not using
the Sites framework at this time, so this was the "fix".
2012-07-23 23:41:45 -04:00
Bridger Maxwell
cfe1255432
Updated error messages for missing signup fields.
2012-07-23 20:03:38 -04:00
Calen Pennington
1d1a9173a4
Cleaning up pep8 violations
2012-07-23 14:44:40 -04:00
Calen Pennington
7ef8b6ac1e
Merge remote-tracking branch 'origin/release/1.0'
2012-07-23 14:27:29 -04:00
Calen Pennington
ebe67d2d7d
Merge remote-tracking branch 'origin/release/1.0'
...
Conflicts:
common/djangoapps/student/views.py
2012-07-23 13:55:20 -04:00
David Ormsbee
b9c6e36616
Merge pull request #266 from MITx/cpennington/fix_tests
...
Cpennington/fix tests
2012-07-23 10:51:31 -07:00
Calen Pennington
7a34a8c342
Fix failing tests
2012-07-23 13:49:11 -04:00
Matthew Mongeau
343f5a5393
Add dek to berkeley story.
2012-07-23 13:10:05 -04:00
Matthew Mongeau
ee72a725bb
Sort by course number. Simplify university grouping.
2012-07-23 11:38:01 -04:00
David Ormsbee
074fc24343
Fix up the signup modal for registration for the new fields.
2012-07-22 18:53:12 -04:00
David Ormsbee
44f5891fe2
Remove migration that conflicts with smooth_registration
2012-07-22 18:01:44 -04:00
David Ormsbee
7192c30985
Move migration for new reg fields so as not to conflict with smooth_registration
2012-07-22 17:52:55 -04:00
David Ormsbee
942183d765
Merge branch 'release/1.0' into dormsbee/change_reg_fields
2012-07-22 17:50:46 -04:00
Bridger Maxwell
9afb0f8b78
Disabled student migration 0011, which had not net effect and was causing InnoDB errors.
2012-07-22 16:32:15 -04:00
Bridger Maxwell
ef32adc1c9
Changed log level to exception.
2012-07-22 16:30:41 -04:00
David Ormsbee
7f3a443409
Change over to new reg fields (styling still broken)
2012-07-22 15:35:24 -04:00
Bridger Maxwell
61105134aa
Cleaned up activation pages. Added "Log In" link to notice when anonymous user tries to enroll in course.
2012-07-22 14:52:49 -04:00
Bridger Maxwell
2f4aba8042
If a user is anonymous when they click the enroll button, they will automatically be enrolled in the course if they immediately log in our create an account.
2012-07-21 17:52:28 -04:00
Bridger Maxwell
60b547273d
Registering now temporarily logs you in. A message is displayed on the dashboard, reminding you to activate your account. Logging in shows a reminder about activating.
2012-07-21 15:31:48 -04:00
Bridger Maxwell
660d11dc16
Merge remote-tracking branch 'origin/release/1.0' into unenroll
...
Conflicts:
lms/urls.py
2012-07-21 12:49:27 -04:00
Bridger Maxwell
dcafbca106
Added an index to course enrollment created field.
2012-07-21 12:44:25 -04:00
David Ormsbee
d6a67ef94d
Merge pull request #250 from MITx/pmitros/release-fixes
...
Tracking issues, import/export scripts
2012-07-20 15:14:41 -07:00
Bridger Maxwell
f337baedb0
Renamed enrollment date to created.
2012-07-20 16:48:04 -04:00
Piotr Mitros
b21ea5a8a4
Added import/export scripts
2012-07-20 16:39:19 -04:00
Bridger Maxwell
96b41e93d1
Removed old todo comment.
2012-07-20 14:33:30 -04:00
Bridger Maxwell
cdc2ff04f8
Added a datetime stamp to course enrollments.
2012-07-20 13:14:59 -04:00
David Ormsbee
17263dcd1b
Keep courses and front page from erroring when we're missing an org in the data.
2012-07-19 16:19:16 -04:00
Matthew Mongeau
a64ddc771a
Display courses in university related columns.
2012-07-18 17:36:12 -04:00
Matthew Mongeau
73df314159
wip
2012-07-18 13:40:16 -04:00
Matthew Mongeau
dd0cd57ead
Add date_of_birth
2012-07-18 13:02:56 -04:00
Matthew Mongeau
456054a261
Cleanup.
2012-07-18 13:02:31 -04:00
Matthew Mongeau
67221b0725
Added countries and other demographics to be stored in db.
2012-07-18 13:02:07 -04:00
