Commit Graph

19654 Commits

Author SHA1 Message Date
Ibrahim Awwal
62b047f3c2 Refactored DiscussionThreadInlineView to inherit from DiscussionThreadView and
use subviews for rendering. Functionality should be the same. Changed a few things
in DiscussionThreadView to make this a little easier.
2012-09-13 03:11:30 -07:00
Ibrahim Awwal
58fc3eca12 Fix staff markers for inline threads and double staff markers for threads with deeply nested comments. 2012-09-13 02:20:35 -07:00
Ibrahim Awwal
d9018658b7 Remove whitespace around post body in edit template.
Extra spaces actually get added to a post when activating a WMD editor which can
get saved into the post if you click update.
2012-09-13 00:13:34 -07:00
David Ormsbee
16d27737df Merge pull request #673 from MITx/rocha/hotfixes
Workaround for swfobject - pipeline problems
2012-09-12 22:42:35 -07:00
Carlos A. Rocha
e0c7cef65f Workaround for swfobject - pipeline problems 2012-09-13 01:38:52 -04:00
Carlos A. Rocha
67cbf50b83 Fix swfobject and django-pipeline - Cosmetic fix for youtube player 2012-09-13 01:08:59 -04:00
Carlos A. Rocha
df5e6d6860 Replace http with https for embedder youTube 2012-09-13 00:16:13 -04:00
Carlos A. Rocha
11d0c0d4b6 Remove video controls, use default youTube controls instead 2012-09-13 00:10:20 -04:00
Carlos A. Rocha
27fa9a38d8 Temporary fix for youTube iframe player issues 2012-09-12 23:56:05 -04:00
Ibrahim Awwal
8c9febe549 Add quotes to fix thread editor title bug. 2012-09-12 20:55:55 -07:00
kimth
2105755120 MathJax initial render needs to be properly queued 2012-09-12 18:24:52 -04:00
Ibrahim Awwal
712e59a68d Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/static/sass/_discussion.scss
2012-09-12 15:18:34 -07:00
Ibrahim Awwal
9a0798b68f Remove old backbone views (the last place they were being used was the profile page). 2012-09-12 15:16:44 -07:00
Ibrahim Awwal
b4828db1e3 User profile page redone to act like the inline discussion, except threads are
loaded into the page in a data attribute instead of loaded on request via ajax.
The user profile page also does not provide facilities for adding
comments/responses, which I think would clutter the page too much.

Also removed some unused stuff from views.py.
2012-09-12 15:16:35 -07:00
Matthew Mongeau
ba56afae7c Clear search when clicking topic dropdown. 2012-09-12 16:57:19 -04:00
Matthew Mongeau
d425f525b8 Display tags. 2012-09-12 16:43:52 -04:00
Kyle Fiedler
da87af5351 Fix missplaced k 2012-09-12 16:37:41 -04:00
Kyle Fiedler
2b9268ad48 Added widow fix for subtitles too 2012-09-12 16:35:21 -04:00
Kyle Fiedler
9837acd68f Remove ie sass from wiki 2012-09-12 16:01:39 -04:00
Kyle Fiedler
b6e03c60b6 Added back the ie fixes from before 2012-09-12 16:01:39 -04:00
Kyle Fiedler
1dceff78b5 Fix alignment in tables for ie 2012-09-12 16:01:38 -04:00
David Ormsbee
53d0a6add8 Merge pull request #654 from MITx/feature/victor/fix-trailing-location-url
make the test ajax_url format consistent with real code
2012-09-12 12:19:53 -07:00
Sarina
b6b9b15912 Make clear where to specify display_name in xml 2012-09-12 14:58:23 -03:00
Tom Giannattasio
1d71a2cfbd tweaked usernames so they were more prominent throughout 2012-09-12 13:40:11 -04:00
kimth
e3c6477826 Merge branch 'master' into kimth/fix-dynamath-6002x 2012-09-12 13:34:01 -04:00
Victor Shnayder
e47134bd10 turn off psychometrics in dev.py--the necessary migration is not present 2012-09-12 13:20:15 -04:00
Carlos Andrés Rocha
18b5a1f5a2 Temporary fix to get the discussion profile page rendering 2012-09-12 13:20:04 -04:00
kimth
87750f3140 Merge pull request #666 from MITx/bug/kfiedler/tutorial-list-bullets
removed list bullets from tutorials
2012-09-12 10:04:08 -07:00
Kyle Fiedler
ec9521a9f5 removed list bullets from tutorials 2012-09-12 13:01:10 -04:00
Kyle Fiedler
2f8a7d0744 Removes unused widowfix script 2012-09-12 12:37:19 -04:00
Tom Giannattasio
032610e801 Merge pull request #660 from MITx/feature/kfiedler/cms-edits
Added fixes to some style and one Cale fix to get things working properl...
2012-09-12 08:53:45 -07:00
Tom Giannattasio
ba52523d6d Merge pull request #657 from MITx/bug/kfiedler/histogram
Removed display none for histogram
2012-09-12 08:53:07 -07:00
Tom Giannattasio
40eba7f792 Merge pull request #664 from MITx/feature/kfiedler/pressrelease
Add new press releases
2012-09-12 08:52:49 -07:00
Tom Giannattasio
841cb9b504 Merge pull request #659 from MITx/feature/kfiedler/widows
Remove widows in accordion header
2012-09-12 08:52:32 -07:00
kimth
1f4384265f Merge pull request #658 from MITx/bug/kfiedler/info-title
info-title margin fixed
2012-09-12 08:29:04 -07:00
kimth
98ba1ef564 Merge pull request #665 from MITx/bug/kfiedler/sequnce-over-video
Added fix so that sequnce nave doesn't go over full screen videos
2012-09-12 08:26:00 -07:00
Matthew Mongeau
1a402f7fda Mark responses and comments as staff 2012-09-12 11:09:36 -04:00
Kyle Fiedler
596d926eac Added fix so that sequnce nave doesn't go over full screen videos 2012-09-12 11:06:01 -04:00
Tom Giannattasio
d1292949be fixed spinner positioning on inline discussions 2012-09-12 11:03:18 -04:00
Kyle Fiedler
05c3e028c2 Added new press releases 2012-09-12 10:38:17 -04:00
Tom Giannattasio
9ef83b0ca5 edit post style clean up 2012-09-12 10:19:25 -04:00
Tom Giannattasio
7098b2e658 cleaned up loading animation in post-list 2012-09-12 10:07:16 -04:00
Tom Giannattasio
87dcd07112 delayed appearance of spinner in thread so things are less jumpy 2012-09-12 10:07:16 -04:00
Tom Giannattasio
d88de52181 fixed jump to top on browse buttons 2012-09-12 09:41:34 -04:00
Tom Giannattasio
ff94541e40 tweaked inline hide/show and new post buttons 2012-09-12 09:41:34 -04:00
Arjun Singh
452414da37 Kill requests for loading responses when selecting another thread. This ensures that the thread you're viewing has the right responses loaded. 2012-09-12 06:13:46 -07:00
Arjun Singh
a900998145 Fix anonymity leak; fix editing when rendering from main page. 2012-09-12 04:32:32 -07:00
Ibrahim Awwal
3bc9c7496c Update discussion setup instructions to clarify that you need to specify a
course id for seed_permissions_roles, and also the script itself to tell you that.
2012-09-11 19:15:18 -07:00
Calen Pennington
cb66946175 Merge pull request #663 from MITx/feature/arjun/js_seeds
make seeds consistent with other responsetypes
2012-09-11 18:12:11 -07:00
Arjun Singh
bd5fc64462 make seeds consistent with other responsetypes 2012-09-11 18:08:27 -07:00