kimth
e62f8d7562
More info in StudentInputError
2012-08-29 20:03:26 -04:00
David Ormsbee
5ae92a19d3
Merge pull request #592 from MITx/feature/arjun/fix_discussions_in_sequences
...
Fix discussions in xmodules
2012-08-29 16:49:04 -07: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
kimth
1fd2f0c601
Fix double show answer bug
2012-08-29 18:02:37 -04:00
Matthew Mongeau
3a254380d5
Hook up comment counts
2012-08-29 17:26:18 -04:00
David Ormsbee
a29991e831
Merge pull request #590 from MITx/feature/arjun/allow_uncaptioned_videos
...
Temporary fix to make uncaptioned videos display reasonably. Will replace with proper solution.
2012-08-29 14:01:37 -07: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
Matthew Mongeau
f683d3750c
Show current following status in list view.
2012-08-29 16:52:39 -04:00
Matthew Mongeau
f23c8fa0d3
Comment details and comment voting.
2012-08-29 16:24:18 -04:00
Tom Giannattasio
30a42dd526
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
2012-08-29 16:22:21 -04:00
Tom Giannattasio
5db29b87ee
tweaked sidebar styles; added temp javascript functionality for sidebar
2012-08-29 16:22:14 -04:00
Calen Pennington
99d6296b99
Set the course static file dir to /static directories in course repos if the folder exists, and fall back to including the whole course folder otherwise
2012-08-29 15:39:36 -04:00
Matthew Mongeau
d6bece9bd2
Move user to window. Mark followed threads in list view.
2012-08-29 15:37:23 -04:00
Nate Hardison
c97db851fb
Getting rid of unneeded variables
2012-08-29 15:28:44 -04:00
Matthew Mongeau
4735ce0ab1
Display comments and active thread.
2012-08-29 15:22:01 -04:00
Matthew Mongeau
13ae85ac35
Navigating threads.
2012-08-29 14:20:03 -04:00
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
Carlos Andrés Rocha
cb67af5959
[34078525] OpenID provider cleanup and minor fixes
2012-08-29 12:43:08 -04:00
Nate Hardison
4126f3a29a
Validating OpenID request trust roots to only come from *.cs50.net
2012-08-29 11:57:41 -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
David Ormsbee
e55bbbc736
Remove __grading_policy related items, which got in here accidentally
2012-08-29 10:58:40 -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
jarv
30543d457b
Merge pull request #574 from MITx/feature/arjun/pygraphviz
...
adding pygraphviz
2012-08-29 07:07:22 -07: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
David Ormsbee
50c682e459
Merge pull request #583 from MITx/rocha/master
...
[#35065403 ] Lets video player work if subtitles cannot be loaded
2012-08-29 07:01:58 -07:00
David Ormsbee
b62d953524
Merge pull request #585 from MITx/feature/arjun/sane_save
...
Getting rid of an alert. People don't like alerts.
2012-08-29 07:01:07 -07:00
Arjun Singh
1c176d369b
add margin between checkbox and text
2012-08-29 03:25:08 -07:00
Arjun Singh
ac65e47e21
Getting rid of an alert. People don't like alerts.
2012-08-29 03:15:30 -07:00
Victor Shnayder
fe50f94437
Fix inline html bug.
...
* problem was in trying to remove the outer <html> + </html> tags.
* cleaned up the stringify function to be less magical, and more
obviously correct.
[Fix #35136297 ]
2012-08-28 19:54:57 -04:00
Victor Shnayder
cbfc117e8b
a few edits to the xml format docs
2012-08-28 19:53:46 -04:00
Carlos Andrés Rocha
aa063d5729
[ #35065403 ] Lets video player continue to work if subtitles cannot be loaded
2012-08-28 18:18:37 -04:00
David Ormsbee
1a97a1ced0
Merge pull request #582 from MITx/feature/arjun/jsresponse_compilation
...
Disable jsresponse file compilation; done manually for now.
2012-08-28 12:56:37 -07:00
Arjun Singh
6a6b24af79
Disable jsresponse file compilation; done manually for now.
2012-08-28 12:40:49 -07:00
David Ormsbee
88e485315d
Merge pull request #571 from MITx/feature/arjun/contextualize_js_params
...
Contextualizing javascript parameters
2012-08-28 11:07:49 -07:00
David Ormsbee
6255fe5a79
Merge pull request #563 from MITx/kimth/check-grader-html
...
Check grader message has proper XML structure
2012-08-28 10:47:28 -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
kimth
bad24df842
Adjust tests to reflect XML requirement for external grader messages
2012-08-28 13:31:06 -04:00
