Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,327 Commits 1 Branch 0 Tags
56fc4e2fe803f97adb2c55347eb29dd2079dde95
Commit Graph

95 Commits

Author SHA1 Message Date
David Ormsbee
d0f2641890 Account for the fact that sometimes we don't get HTTP_HOST (like for tests) 2012-08-15 11:53:21 -04:00
David Ormsbee
346d5b91a1 implement subdomain-based course displays 2012-08-15 11:53:20 -04:00
Victor Shnayder
2df3a6ef11 Big access control refactor 
* All access control logic is now in access.py
* It exports a single method for general use: has_access(user, object, action)
 - possible actions depend on object type (e.g. 'see_exists', 'enroll', 'staff')
* Removed DARK_LAUNCH feature flag--it is now the default behavior
* Replaced check_course with three separate more focused functions that use has_access

Minor things:
* note on using pdb in testing
* moved time parsing helper into timeparse.py
* x_modules now have a .start attribute (None if not in metadata)
 2012-08-14 23:30:37 -04:00
Victor Shnayder
276f22b965 remove debugging print stmt 2012-08-13 15:32:04 -04:00
Calen Pennington
0297aff761 Merge pull request #400 from MITx/feature/victor/enrollment-windows 
add course enrollment windows
 2012-08-13 12:29:14 -07:00
Victor Shnayder
8716f88155 add course enrollment windows 
* if the course metadata have enrollment_start and/or enrollment_end,
  only allow normal users to enroll post start and pre end.
* If DARK_LAUNCH is on, staff can enroll outside the window
 2012-08-13 15:03:46 -04:00
David Ormsbee
c4d89cd535 One more test to make sure users are really being copied 2012-08-13 13:34:24 -04:00
David Ormsbee
a25f289ca7 re-enable User save signal handler 2012-08-13 13:16:33 -04:00
David Ormsbee
301695a5c4 Remove outdated comment 2012-08-13 13:11:27 -04:00
David Ormsbee
b5beb13964 Fix side-effect related problems with User replication. 
1. Multiple save()s on the same model are now handled properly. We
   had to unmark model objects after the appropriate signals had
   fired.
2. There was a side-effect where we were saving the portal User
   object to the course_db with the using kw param, but models
   remember where they were last saved to, so a later save on that
   model object would go to the wrong database.
 2012-08-13 13:06:35 -04:00
Calen Pennington
bd95c03d9b Merge pull request #396 from MITx/feature/ichuang/xqa-and-patches 
Provide content QA (quality assessment) interface
 2012-08-13 06:55:05 -07:00
David Ormsbee
4ac7862975 Merge branch 'master' into feature/server_split 
Conflicts:
	lms/urls.py
 2012-08-13 09:21:02 -04:00
David Ormsbee
3cabb2dea6 Remove the no-longer-used is_valid_course_id code 2012-08-13 01:00:55 -04:00
David Ormsbee
d24ee25615 Remove debug checking for UserProfile 2012-08-13 00:57:33 -04:00
David Ormsbee
c6ed6fc066 Merge branch 'master' into feature/server_split 2012-08-13 00:36:31 -04:00
ichuang
47c48e9c66 fix student.views.create_account to handle errors from _do_create_account 2012-08-12 19:07:31 -04:00
ichuang
f072979a6c fix error in student views - js was undefined in _do_create_account 2012-08-12 18:45:24 -04:00
Victor Shnayder
af7e70a979 Log content problems as warnings, not errors 
* will avoid newrelic complaining
* NOTE: Is this what we want post-ship?
  - need some way of notifying instructors of problems
 2012-08-12 17:21:40 -04:00
David Ormsbee
54b0a465fa Ugly hack so that an LMS-specific test of the shared Student djangoapp doesn't break CMS test runs 2012-08-12 16:10:08 -04:00
David Ormsbee
cbfdf59760 Fix test error regarding UserProfiles (a UserProfile must exist before a CourseEnrollment) 2012-08-10 16:41:46 -04:00
David Ormsbee
b3676cd760 Add replication tests 2012-08-10 14:43:43 -04:00
Victor Shnayder
6882b4b53d responding to review comments on #383 2012-08-10 11:42:54 -04:00
Victor Shnayder
5882a89c82 Add management command to create random users 
* required some refactoring in create_account() view
 2012-08-10 11:41:05 -04:00
Victor Shnayder
8740ba8837 Did a quick security scan through views. 
* we appear to be fairly consistent in using is_staff and has_staff_access_to_course
* cleaned up some docstrings and little code things as I went
* fixed small bug in change_enrollment view (check for non-anon user)
 2012-08-10 10:43:20 -04:00
David Ormsbee
8d9297ea04 Some refactoring of how user info is copied over when enrollments are created. 2012-08-10 02:02:44 -04:00
David Ormsbee
731e04e013 Add an explanation of replication 2012-08-10 02:02:44 -04:00
David Ormsbee
b597b17db1 Add support for replicating course enrollment/unenrollment to course databases 2012-08-10 02:02: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