Commit Graph

7051 Commits

Author SHA1 Message Date
Sarina Canelake
44cff00f50 Fix display titles on video pages 2012-08-28 12:20:36 -04:00
Calen Pennington
5c17366cd5 Add a wsgi file for the lms that loads the modulestores immediately after the application starts 2012-08-28 12:01:05 -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
Matthew Mongeau
5d67e01f1c Style fixes 2012-08-27 16:41:52 -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
Ibrahim Awwal
773a32e39f Fix bug with sorting discussion forums (event was not being passed into the event handler). 2012-08-27 13:00:02 -07:00
Tom Giannattasio
d0a8027ad3 Merge branch 'master' into feature/rocha/wiki-cheatsheet 2012-08-27 11:49:09 -04:00
Tom Giannattasio
7b3098edc0 fixed cheatsheet bug on new article page 2012-08-27 11:48:54 -04:00
Calen Pennington
5bd919b5dc Merge pull request #549 from MITx/feature/victor/unique-names
Feature/victor/unique names
2012-08-27 08:25:31 -07: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
Kyle Fiedler
9d6bf9a8fd Added some fixes for the calculator 2012-08-27 10:15:31 -04:00
Matthew Mongeau
8d747e4423 Conditionally show calculator 2012-08-27 10:15:30 -04:00
Matthew Mongeau
db492cc400 Add back in calculator related code. 2012-08-27 09:43:37 -04:00
Matthew Mongeau
80b31f46df Wip 2012-08-27 09:43:37 -04:00
Tom Giannattasio
9b5285ad8a Merge branch 'master' into feature/rocha/wiki-cheatsheet 2012-08-27 09:08:48 -04:00
Rocky Duan
eb8ee01d21 fixed a tiny bug that loading icon sometimes doesn't appear at the right place / doesn't go away 2012-08-25 12:12:57 -07: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
David Ormsbee
9734347c48 Merge pull request #556 from MITx/kimth/course-replace-in-infopage
Do URL replacement in course info page
2012-08-24 14:52:48 -07: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
Tom Giannattasio
4a06decafd Merge branch 'master' into feature/tomg/courseware_signin 2012-08-24 16:42:01 -04:00
Tom Giannattasio
7d14632c3a added log in button to unauthenticated courseware 2012-08-24 16:41:12 -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
Tom Giannattasio
d1760f9a22 styled markdown modal and link 2012-08-24 16:14:04 -04:00
John Jarvis
4c21abc433 empty default for comments_service_key and comments_url because it was breaking configs that do not have it in env.json 2012-08-24 15:05:18 -04:00
Calen Pennington
b5c90166df Merge pull request #553 from MITx/feature/bridger/new_wiki
Added SECURE_PROXY_SSL_HEADER to env/aws. Re-enabled wiki directories
2012-08-24 11:47:25 -07:00
Bridger Maxwell
268a87442e Added SECURE_PROXY_SSL_HEADER to env/aws. 2012-08-24 14:18:49 -04:00
Arjun Singh
f7e299d04e fix inline discussion 2012-08-24 11:15:06 -07:00
ichuang
dc52956c28 don't list all users if too many 2012-08-24 14:09:57 -04:00
Bridger Maxwell
8e9211d2dd Re-enabling link to wiki 'see all children'. The bug for which this was disabled is already fixed. 2012-08-24 14:04:17 -04:00
Victor Shnayder
2cf612051c turn subdomain listings off by default in dev env 2012-08-24 13:58:14 -04:00
Tom Giannattasio
9cab1d9de8 fixed merge conflict 2012-08-24 13:33:48 -04:00
Tom Giannattasio
b72ec72528 pulled temp data from gradebook 2012-08-24 13:32:16 -04:00
David Ormsbee
d0f2f31063 Merge pull request #547 from MITx/feature/rocky/discussion
fixed profiled user id (toggle moderator status)
2012-08-24 08:25:42 -07:00