Commit Graph

1926 Commits

Author SHA1 Message Date
kimth
8c0780bcdc Adjust comments 2012-08-31 18:05:54 -04:00
kimth
e482a32d27 Accordion distinguishes items to be graded 2012-08-31 18:05:54 -04:00
David Ormsbee
69ea7aa873 Merge pull request #597 from MITx/feature/victor/nested-links
Feature/victor/nested links
2012-08-31 13:48:05 -07:00
Tom Giannattasio
3889388abf Merge pull request #596 from MITx/features/kfiedler/multicourse-buttons
Make the two buttons that lead to the courseware more actionable
2012-08-31 13:19:03 -07:00
Kyle Fiedler
3edf1a6a84 Added buttons for both pages to make it even more clear to start class 2012-08-31 15:58:44 -04:00
Kyle Fiedler
7c1cc4ed21 Added hover on course about and more actionable text 2012-08-31 15:58:44 -04:00
Kyle Fiedler
0ff70472c9 Added styles for dashboard to have link around whole class 2012-08-31 15:58:44 -04:00
David Ormsbee
04439a3217 add comments explaining prefetch need 2012-08-31 15:20:13 -04:00
David Ormsbee
29be6f8209 Prefetch user groups to speed up auth checks required to render Progress page view for students 2012-08-31 15:16:31 -04:00
kimth
05da125aed Merge pull request #600 from MITx/feature/kfiedler/hints
Added styles for problems
2012-08-31 10:30:50 -07:00
Kyle Fiedler
e6f9f8d9b0 Add js to the problem and move around that css and js to accomodate Tonys new HTML Structure 2012-08-31 11:15:06 -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
Arjun Singh
32cb0897e9 Fixing sequentials nested inside of verticals, provides a path to sequentials nested in sequentials. Changes jump_to to redirect to courseware index. 2012-08-31 04:24:52 -07:00
Carlos Andrés Rocha
d702082daa [34078525] Add test settings for openid 2012-08-31 06:31:18 -04:00
Victor Shnayder
d815d50aee Remove obsolete eager flag for xml modulestore
* has to be eager
2012-08-30 19:26:50 -04:00
Victor Shnayder
021ccde1b4 Make jump_to work with the xml modulestore
* it now works in the context of a specific course_id
* add tracking of parent locations to xml modulestore
* adjust lots of tests, including some refactoring
* NOT working yet: jumping to the right position in a sequence.
2012-08-30 18:47:11 -04:00
Victor Shnayder
22aa325d83 Enable linking into the middle of sequences
* add a url that has an extra /{position} at the end
* pass it through to get_module
2012-08-30 16:37:40 -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