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

1173 Commits

Author SHA1 Message Date
Bridger Maxwell
0fbfaf612f Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 2012-08-17 17:52:22 -04:00
ichuang
b6e41dc05c fix view_tracking_log to show proper timezone 2012-08-17 15:46:09 -04:00
ichuang
39e2d64207 Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/add-gitreload-to-migrate 2012-08-17 16:22:40 +00:00
ichuang
4365b4a092 more flexible event logs retrieval 2012-08-17 16:17:00 +00:00
David Ormsbee
61108c27cb When replicating CourseEnrollment, make sure Users were created in all DBs before replicating other models 2012-08-16 19:12:57 -04:00
ichuang
6e3eff304e {} -> {0} etc in .format statements 2012-08-16 16:22:26 -04:00
Calen Pennington
3b36fbf914 Move mitxmako out of common lib, and pass template rendering function into MongoModuleStore 2012-08-16 12:49:42 -04:00
kimth
3c1e67e339 Merge master 2012-08-15 15:19:08 -04:00
kimth
02d970c31e Map '/course/' urls to the course's root in the multicourse hierarchy 2012-08-15 14:45:12 -04:00
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
Rocky Duan
50e95de9ef a place to start for the user profiel & fixed some bugs 2012-08-14 15:04:36 -07:00
Rocky Duan
eb47093b1c Merge branch 'master' of github.com:MITx/mitx into merge 
Conflicts:
	common/djangoapps/student/models.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-14 12:54:43 -07: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
Calen Pennington
76c4259c15 Merge pull request #399 from MITx/feature/fix_replication_side_effects 
Feature/fix replication side effects
 2012-08-13 12:25:42 -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
Victor Shnayder
add050593a address comment on #392 2012-08-13 14:23:41 -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
Calen Pennington
fdee13e4c0 Merge pull request #393 from MITx/feature/victor/bad-content-warn-not-error 
Feature/victor/bad content warn not error
 2012-08-13 06:13:19 -07: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
ichuang
2c9652ab74 change xqa server location to suburl 2012-08-12 18:29:48 -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
Victor Shnayder
622eebc473 Don't error on missing static files 
* Just log a warning and return a dummy url
* May want smarter checking later
  (e.g. would be nice to tell staff what files are missing.)
 2012-08-12 16:21:38 -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
ichuang
656a162aba allow xqa server url to be set by MITX_FEATURES['USE_XQA_SERVER'] 2012-08-12 12:43:08 -04:00
ichuang
da64c8f0a1 add xqa interface to staff_problem_info, make staff_debug a modal 
window, add xqa modal window, add xqa_key to course metadata
 2012-08-11 20:12:37 -04:00
Calen Pennington
14bfbb06a5 If there is a missing static file, don't break the server, just leave a dead url 2012-08-10 21:22:12 -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
ichuang
f556e3f7d9 revert double-mangling patch in xmodule_modifiers; cale fixed in 
replace_urls
 2012-08-10 15:25:43 -04:00
ichuang
b6c38d3c59 replace_static_urls should only be run once (currently twice, eg if 
html is in a veritical)
 2012-08-10 15:25:42 -04:00
ichuang
881f07f3c3 revert double-mangling patch in xmodule_modifiers; cale fixed in 
replace_urls
 2012-08-10 15:25:42 -04:00
ichuang
27cd9ef986 minor change to allow github url to be overridden by metadata 2012-08-10 15:25:42 -04:00
ichuang
2e4f21ee3b replace_static_urls should only be run once (currently twice, eg if 
html is in a veritical)
 2012-08-10 15:25:41 -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
Calen Pennington
5f44b08f9c Merge pull request #382 from MITx/feature/victor/check-access-control 
Did a quick security scan through views.
 2012-08-10 07:59:24 -07: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
Calen Pennington
4f27dd436e When in debug mode, check the staticfiles.finders before mangling urls 2012-08-10 10:13:18 -04:00