Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

7051 Commits

Author SHA1 Message Date
Tom Giannattasio
5267f03b97 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-08-30 11:38:46 -04:00
Matthew Mongeau
362bbb1794 Close form 2012-08-30 11:38:34 -04:00
Tom Giannattasio
1559b86e27 added new post markup, style and basic interactions 2012-08-30 11:37:50 -04:00
Matthew Mongeau
abc0092fe1 Formatting around wmd 2012-08-30 11:23:06 -04:00
Carlos Andrés Rocha
87967b9eb8 [34078525] Makes OpenID provider login box modal. 2012-08-30 11:15:08 -04:00
Matthew Mongeau
04e8e5378c Fix load order. 2012-08-30 11:12:16 -04:00
Victor Shnayder
4ce41c0111 fix course_ids for Berkeley internal courses and 3.091 2012-08-30 10:53:38 -04:00
Matthew Mongeau
24c7632664 Start responses. 2012-08-30 10:17:47 -04:00
Ibrahim Awwal
b80ceecf87 Note when posts have been updated, and put the creation date in the title text. 2012-08-30 00:19:42 -07:00
Ibrahim Awwal
02e6fd17e4 Make 'date' the first sort key since it's the new default (students seem to prefer it, especially since top is kind of unclear). 2012-08-29 22:20:20 -07:00
Ibrahim Awwal
cd84b63228 Make the search button line up with the search field better. 2012-08-29 22:13:38 -07:00
Ibrahim Awwal
b13c5acd4f Save the user's selected sort order on the comments service. 
Requires cs_comments_service to have the field default_sort_key on users.
 2012-08-29 22:13:37 -07:00
Ibrahim Awwal
7655e9eea0 Ensure that js files are returned in alphabetical order by django-pipeline. 
On most systems this seems to be the default behavior, but glob2.glob's order isn't guaranteed and on my machine the order seems to be random, which causes javascript which depends on include order to fail.
 2012-08-29 22:13:37 -07:00
Ibrahim Awwal
e1aa30b36f Style comments from moderators in light blue, and admins in light green. Also puts text after the author's name (there should be something for colorblind people, not sure what form it should take though). 2012-08-29 21:52:22 -07:00
Ibrahim Awwal
e58af44620 Annotate comment content wrappers with classes for the roles of the author. 2012-08-29 19:41:46 -07:00
Ibrahim Awwal
08b233f603 Ensure that js files are returned in alphabetical order by django-pipeline. 
On most systems this seems to be the default behavior, but glob2.glob's order isn't guaranteed and on my machine the order seems to be random, which causes javascript which depends on include order to fail.
 2012-08-29 19:41:14 -07: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
Matthew Mongeau
3a254380d5 Hook up comment counts 2012-08-29 17:26:18 -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
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
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
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