Commit Graph

22621 Commits

Author SHA1 Message Date
Tom Giannattasio
1026a17338 fixed sidebar styles 2012-08-29 14:02:09 -04:00
Tom Giannattasio
d19dc6a9b0 added new post button to primary nav 2012-08-29 13:34:30 -04:00
Victor Shnayder
f5754f6d1e Add some rudimentary error checking to forum views
[Hopefully fix #34992235]
2012-08-29 13:30:55 -04:00
Tom Giannattasio
f12022b774 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-08-29 13:23:20 -04:00
Tom Giannattasio
d75bb87bdd started adding updated styles 2012-08-29 13:22:55 -04:00
John Jarvis
27725ab686 making loglevel configurable for local logging 2012-08-29 13:09:00 -04:00
Matthew Mongeau
fb1368afa9 Move views and models out. 2012-08-29 11:43:09 -04:00
Matthew Mongeau
46d0d4c4f2 Hook up list to voting. 2012-08-29 11:19:29 -04:00
John Jarvis
2e1c8666e1 adding SysLogHandler 2012-08-29 10:59:33 -04: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
Matthew Mongeau
19b14f446b Follow a thread 2012-08-29 10:28:02 -04:00
Matthew Mongeau
a5b1abb2a8 Remove log 2012-08-29 10:23:17 -04:00
Matthew Mongeau
e1113d9ca9 Get voting hooked up 2012-08-29 10:07:20 -04:00
John Jarvis
1e2406fc0c updating logging config to allow for local logging 2012-08-29 10:05:08 -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
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