Commit Graph

12296 Commits

Author SHA1 Message Date
Matthew Mongeau
e1113d9ca9 Get voting hooked up 2012-08-29 10:07:20 -04:00
kimth
fb5501855c Merge master 2012-08-28 12:37:24 -04:00
David Ormsbee
5ba76a505f Merge pull request #572 from MITx/feature/arjun/fix_progress_scores_order
Fixing order that problem scores are displayed on the progress page
2012-08-28 08:06:32 -07:00
David Ormsbee
231b8c6aa4 Merge pull request #548 from MITx/kimth/limit-queue-dos
Kimth/limit queue dos
2012-08-28 08:03:02 -07:00
David Ormsbee
18127cf967 Merge pull request #569 from MITx/feature/rocha/wiki-cheatsheet
Refactored wiki cheatsheet code.
2012-08-28 07:59:05 -07:00
Victor Shnayder
bd2374b6fe Remove trailing slash from ajax url in ModuleSystem
* also add a check for valid location in modx_dispatch
2012-08-28 10:22:08 -04:00
Arjun Singh
3842c39f8a Fixing order that problem scores are displayed in 2012-08-27 23:52:27 -07:00
kimth
26051f9939 Waittime passed through ModuleSystem.xqueue 2012-08-27 19:39:33 -04:00
John Hess
2cf4b28cf7 added additional query to show number of users with any given number of registrations (power users) 2012-08-27 19:22:19 -04:00
John Hess
a9a73561f4 updated admin_dashboard to show count of unique students 2012-08-27 19:05:00 -04:00
Carlos Andrés Rocha
8b0d1f09e0 Refactored wiki cheatsheet code. 2012-08-27 18:30:38 -04:00
Matthew Mongeau
82c9d045cd Initial work on single thread view. 2012-08-27 17:24:05 -04:00
David Ormsbee
4e9ce2bd4b Merge pull request #565 from MITx/feature/victor/fix-queue-access-control
Fix latent bug in access checks in get_module
2012-08-27 13:34:00 -07:00
Victor Shnayder
1e72e1c91e change 404 message 2012-08-27 16:24:43 -04:00
Matthew Mongeau
91c5b88248 Initial sidebar 2012-08-27 16:21:12 -04:00
Calen Pennington
3480665602 Merge pull request #541 from MITx/feature/ichuang/add-manage-course-groups-command
add manage_course_groups command to lms_migration
2012-08-27 08:16:42 -07:00
Victor Shnayder
9102c7609c Fix latent bug in access checks in get_module
* All access checks now done for the "user" param, ignoring request.user
  - This matters for xqueue callbacks and for instructor view of student progress
* An effect of this change is that if a student couldn't see their own 'progress' tab,
  the course instructor won't be able to see it either
2012-08-27 10:20:16 -04:00
David Ormsbee
955dc94711 Merge pull request #554 from MITx/feature/victor/fix-staff-profile-view
Set request.user = student when impersonating a student
2012-08-25 08:39:46 -07:00
kimth
25ea8b2990 Use LMS secret key to seed anonymizer 2012-08-25 09:18:10 -04:00
kimth
f7c87aa7a1 Anonymous student id is a property of ModuleSystem 2012-08-25 09:03:47 -04:00
kimth
1dcaf21f81 Send idhash 2012-08-25 07:57:17 -04:00
Victor Shnayder
7a6fa1dd41 Fix access control for impersonation case
- only relevant in tests due to start dates
- still irritatingly intricate logic...
2012-08-24 16:52:19 -04:00
kimth
115eebdb76 Use reverse for course_info url replacement 2012-08-24 16:47:50 -04:00
Victor Shnayder
b8659e084c Set request.user = student when impersonating a student
* currently only in the staff view of student progress page

[Fix #34379687]
2012-08-24 16:30:16 -04:00
kimth
31216ccd9f Do URL replacement in course info page 2012-08-24 16:16:26 -04:00
ichuang
dc52956c28 don't list all users if too many 2012-08-24 14:09:57 -04:00
Rocky Duan
fe74f9bc85 reconstruct after editing 2012-08-24 02:17:58 -07:00
Rocky Duan
80195176e9 use escape html everywhere and only send discussion data relavent 2012-08-24 01:45:55 -07:00
Rocky Duan
3761b02ce8 hide reply button after closing thread 2012-08-23 15:12:22 -07:00
ichuang
8e7eef24a2 add manage_course_groups command to lms_migration 2012-08-23 13:10:08 -04: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
Calen Pennington
f2c5a064aa Pull the http or https from the forwarded proto for the xqueue callback url 2012-08-23 11:49:23 -04:00
David Ormsbee
0b309ea40a Can't return Http404, have to raise it. 2012-08-23 11:27:54 -04:00
Arjun Singh
a075cc79fd remove stray import 2012-08-23 06:50:16 -07:00
Arjun Singh
7f3a4889b8 make discussions work for new users 2012-08-23 06:48:37 -07:00
Calen Pennington
5af67c1bf2 Put course location urls in heartbeat page, rather than lists 2012-08-23 09:19:26 -04:00
Calen Pennington
57444bdd25 Make heartbeat url wait for courses to be loaded 2012-08-23 09:16:40 -04:00
Arjun Singh
d1a8cd3f65 Limiting depth of comments 2012-08-23 04:50:03 -07:00
Rocky Duan
e4890a8bff fixed pluralize 2012-08-23 02:52:51 -07:00
Rocky Duan
5d90366917 fixed file uploading 2012-08-23 02:50:26 -07:00
Rocky Duan
0b00e3b099 make similar posts url working 2012-08-23 02:17:17 -07:00
Rocky Duan
007de179e1 add user profile page back 2012-08-22 23:44:50 -07:00
David Ormsbee
e3cdad0d2b change url regexp to handle discussions in coursenames with dashes 2012-08-23 01:17:49 -04:00
Rocky Duan
0e21ed030c removed new post button & added recent threads to single thread page 2012-08-22 19:22:35 -07:00
Rocky Duan
43ef4f6482 fixed recent threads & tags links 2012-08-22 19:09:58 -07:00
David Ormsbee
baa6eadfb5 Merge branch 'master' into feature/dave/forum_fixes 2012-08-22 20:30:49 -04:00
Victor Shnayder
1b25433a39 Allow error-template-rendering errors to propagate to top-level 500 handler
* hopefully won't come up, but if they do, our 500 page
  should be better than  HttpResponse("There was an unrecoverable error")
2012-08-22 20:21:10 -04:00
Rocky Duan
908a5c5d59 Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-22 14:11:44 -07:00
Rocky Duan
3b76fe16d8 make inline page working 2012-08-22 14:04:42 -07:00
Rocky Duan
951fb06341 Merge branch 'master' of github.com:MITx/mitx into merge
Conflicts:
	lms/envs/dev.py
2012-08-22 14:04:34 -07:00