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

131 Commits

Author SHA1 Message Date
David Ormsbee
bbbd976671 Added some more sample data. The command to export to Pearson reads from the table, but currently just adds the entries it needs at runtime. 2012-10-24 15:02:05 -04:00
David Ormsbee
e4ffb2a514 Add TestCenterUser model and export for Pearson 2012-10-24 11:15:14 -04:00
David Ormsbee
9fbdeeb6c6 Send email change notice email to both old and new email addresses. 2012-10-18 14:36:52 -04:00
David Ormsbee
0dee2e9233 resend the same activation link instead of a new one when someone who is not active tries to log in 2012-10-18 13:33:14 -04:00
David Ormsbee
3385e06304 As per code review, added note that accept_name_change is no longer being used. 2012-10-18 12:22:44 -04:00
David Ormsbee
1154c4b897 auto-resend activation email if they try to log in and aren't activated 2012-10-13 23:20:33 -04:00
David Ormsbee
01ac01b62c Re-enable change name, and fix up change email styles 2012-10-12 14:31:20 -04:00
David Ormsbee
05c5ac3482 Allow people who haven't activated to reset their password. 2012-10-11 11:04:18 -04:00
John Jarvis
bd45dbd8d4 Adding django-admin/rake command to set the staff bit 2012-10-10 09:46:30 -04:00
Victor Shnayder
0b40e75166 Fix login-if-?next behavior 
* for more context, see https://basecamp.com/1892446/projects/631155-devops/messages/4719963-strange-caching
 2012-09-23 22:33:20 -04:00
Victor Shnayder
a788db53e9 Show login modal if there's a next param to index, university index 
* also replace the external-auth-related popping up of the signup form with jquery.
Presumably it takes care of the browser specific stuff.
 2012-09-14 14:31:04 -04:00
Victor Shnayder
8b7390c966 Turn of discussion service in test env 
- add a check for the feature flag before trying to save user info to the service
 2012-09-06 17:11:21 -04:00
ichuang
34ea1e0b95 fix FORCE_UNIVERSITY_DOMAIN check in student.views 2012-09-05 11:19:02 -04:00
ichuang
0c3d054253 fix: university domain should not be determined by HTTP_HOST for dev or behind proxy 2012-09-04 18:36:26 -04:00
ichuang
258274f2a7 add string to model class unicode 2012-09-04 10:25:28 -04:00
ichuang
9e8ec09b4d pep8 fixes 2012-09-02 20:15:57 -04:00
ichuang
2efe481237 move instructor dashboard into its own lms djangoapp; add new 
functionality - grade dump and download as csv, manage staff list,
force reload of course from xml
 2012-09-02 19:05:34 -04:00
David Ormsbee
877ae91b7f Don't show View Courseware buttons if they don't have access to load the courseware 2012-08-31 21:50:33 -04:00
Arjun Singh
202edb0ecb making password reset email link have the current site's domain rather than edx.org hardcoded. 2012-08-23 11:47:30 -07:00
Arjun Singh
ed6317f37c getting rid of terrible hack in favor of re enabling the dispatcher to sync w/ the comment service 2012-08-23 10:03:36 -07:00
Arjun Singh
7f3a4889b8 make discussions work for new users 2012-08-23 06:48:37 -07:00
Calen Pennington
5ca636e606 Use the university profile page for courses and index if we are in a branded subdomain. N.B. THIS DOESN'T WORK WITH MIT_SSL_AUTH 2012-08-22 14:43:49 -04:00
Victor Shnayder
2f9b2f19fc s/[]/{}/ 2012-08-21 15:01:10 -04:00
Victor Shnayder
ccf2cff2ba bugfix: set errored_courses in default case 2012-08-21 15:00:21 -04:00
Victor Shnayder
b97a2af2a2 Show policy, grading policy, and top-level errors 
* Save errors for courses that failed to load in modulestore
* global staff can see course errors on their dashboard
* put policy loading errors into the error trackers
* add has_access(user, 'global', 'staff'), which is equiv to user.is_staff for now
 2012-08-21 15:00:21 -04:00
David Ormsbee
783a3905a4 disable user replication and associated tests 2012-08-21 11:39:36 -04:00
David Ormsbee
eb96497cff Merge branch 'master' into feature/bk_forum_int 
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/courseware.html
	requirements.txt
 2012-08-20 18:57:46 -04:00
Victor Shnayder
c6c95c63ac Keep each course's descriptors separate 
* apply policy per-course, even if multiple courses share course and org fields
* keep descriptors separate in xml store, so that if two such courses
  change the same module in different ways, it works.  Such edits will need to
  merged on CMS import...
* add get_instance(course_id, location) method to replace get_item(location).
  Update all the call sites
* tests, including a 2nd toy course with same course and org.
 2012-08-20 09:26:16 -04:00
Rocky Duan
028bd23c1c Merge branch 'master' of github.com:MITx/mitx into profile 
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-18 16:57:00 -07: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
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
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