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

1913 Commits

Author SHA1 Message Date
John Jarvis
517e6ddeda Contact email address updates 2012-09-06 09:26:52 -04:00
John Jarvis
26ff14172c Email update for module-error template 2012-09-06 09:24:20 -04:00
Carlos Andrés Rocha
20e48e6615 Merge pull request #475 from MITx/tmac/openid-provider 
OpenID provider implementation
 2012-08-31 06:23:03 -07:00
Carlos Andrés Rocha
d702082daa [34078525] Add test settings for openid 2012-08-31 06:31:18 -04:00
David Ormsbee
a27ba692a8 Merge pull request #593 from MITx/feature/ichuang/fix-typo-in-lms-migration 
missing "settings." in line in lms_migration
 2012-08-30 10:11:09 -07:00
Carlos Andrés Rocha
87967b9eb8 [34078525] Makes OpenID provider login box modal. 2012-08-30 11:15:08 -04:00
Victor Shnayder
4ce41c0111 fix course_ids for Berkeley internal courses and 3.091 2012-08-30 10:53:38 -04:00
ichuang
cb07b0601e missing "settings." in line in lms_migration 2012-08-29 22:04:39 -04:00
Arjun Singh
5d6bed863a Fix discussions in xmodules 2012-08-29 16:41:01 -07:00
Carlos Andrés Rocha
902a887e79 [34078525] pep8 renaming of some extern_auth functions 2012-08-29 18:46:35 -04:00
Carlos Andrés Rocha
cd4aab13fb [34078525] Added OPENID_PROVIDER_TRUSTED_ROOTS django setting 
Added OPENID_PROVIDER_TRUSTED_ROOTS django setting. It should be a
list of glob matching patterns: ['*.cs50.net', '*.other.net']

Also did some minor refactoring and cleanup.
 2012-08-29 18:40:12 -04:00
Arjun Singh
5c5d11409a Temporary fix to make uncaptioned videos display reasonably. Will replace with proper solution. 2012-08-29 13:58:22 -07:00
Tommy MacWilliam
6de28fc592 feature flag, consumer displayed, logging 
- provider placed behind separate feature flag
- domain of openid consumer displayed in login page
- added logging for successful login, changed log messages to include
  "OpenID"
 2012-08-29 10:37:02 -04:00
Tommy MacWilliam
4b6694a4ce OpenID provider implementation 
- endpoint supports both SReg and AX
- identity taken from edX username
- sreg fullname and ax http://axschema.org/namePerson taken from edX
  name
- sreg email and ax http://axschema.org/contact/email taken from edX
  email
 2012-08-29 10:29:42 -04:00
Arjun Singh
1c176d369b add margin between checkbox and text 2012-08-29 03:25:08 -07:00
David Ormsbee
1b3c84ace7 Merge pull request #579 from MITx/sarina/fix_video_title 
Fix display titles on video pages
 2012-08-28 10:39:36 -07:00
David Ormsbee
521521c66b Merge pull request #559 from MITx/kimth/send-idhash 
Kimth/send idhash
 2012-08-28 10:15:24 -07:00
kimth
fb5501855c Merge master 2012-08-28 12:37:24 -04:00
Calen Pennington
bf6fe1022f Merge pull request #578 from MITx/feature/cale/django-under-wsgi 
Add a wsgi file for the lms that loads the modulestores immediately afte...
 2012-08-28 09:31:16 -07:00
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
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
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
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