Commit Graph

22621 Commits

Author SHA1 Message Date
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
Tom Giannattasio
1d71a2cfbd tweaked usernames so they were more prominent throughout 2012-09-12 13:40:11 -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
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
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
Matthew Mongeau
1a402f7fda Mark responses and comments as staff 2012-09-12 11:09:36 -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
Ibrahim Awwal
1be378e697 Render comment replies properly, and update them after receiving a response. 2012-09-11 14:31:03 -07:00
Ibrahim Awwal
a91a5df499 Use regular javascript attributes for parent reference rather than setting
Backbone.Model attributes because Model attributes get serialized into
JSON which is wasteful.
2012-09-11 13:57:51 -07:00
Ibrahim Awwal
f97d4fe983 Add @login_required to forum views so that they redirect to a login page if you're not logged in. 2012-09-11 13:41:30 -07:00
Ibrahim Awwal
2c6c64d533 Sort comment replies in chronological order, keeping the parent references. 2012-09-11 13:12:01 -07:00
Carlos Andrés Rocha
2900c169cc Load inline comments templates at render time and not during page load 2012-09-11 15:58:16 -04:00
Bridger Maxwell
5df381e728 Merge remote-tracking branch 'origin/master' into feature/bridger/course_grading 2012-09-11 13:37:54 -04:00
Matthew Mongeau
f4ba65c5d5 Show and hide search correctly. Added loading icon. 2012-09-11 13:30:00 -04:00
Kyle Fiedler
4732e39cb4 info-title margin fixed 2012-09-11 12:09:42 -04:00
Kyle Fiedler
064b5e7932 Remove widows in accordion header 2012-09-11 11:25:54 -04:00
Tom Giannattasio
a0eefd1ea2 tweaked inline responses and new response toolbar 2012-09-11 10:59:40 -04:00
Kyle Fiedler
3fd640aef3 Removed display none for histogram 2012-09-11 10:22:03 -04:00
Ibrahim Awwal
2d105265f9 Add @references for deeply nested (3+) comments. 2012-09-11 05:43:21 -07:00
Ibrahim Awwal
fc459f7e44 Displays deeply nested comments inline.
This just puts them in three traversal order rather than chronological order.
Not sure which makes the most sense, but I'll implement both ways.
2012-09-11 05:08:55 -07:00
Ibrahim Awwal
7e96f668c0 Render courseware context after creating a new post. 2012-09-11 04:28:24 -07:00
Ibrahim Awwal
ce16d22451 Fix anonymous posts on the inline discussion view. 2012-09-11 04:09:53 -07:00
Ibrahim Awwal
8b7940f413 Fixed context links after searching for real, and removed some more dead code. 2012-09-11 03:40:33 -07:00
Ibrahim Awwal
8f776ab2d8 Comment out some things which I am 99.9% sure are vestigial, which cuts
down on the amount of data shuffled around and saves some rendering time
on the forum index as well.
2012-09-11 02:02:15 -07:00
Ibrahim Awwal
b60feb164c Remove user_id from content renderer although I'm 99.9% sure this isn't
used anywhere anyway.
2012-09-11 01:51:16 -07:00
Ibrahim Awwal
9266ade9b6 Removed helpers.show_if.
I don't know why this was ever defined when python has a ternary operator
which doesn't require its arguments to be evaluated if the condition
evaluates to false, whereas this helper method does.
2012-09-11 01:49:43 -07:00
Ibrahim Awwal
fd6e30abfc Don't try to retrieve roles for anonymous posts. 2012-09-11 01:33:59 -07:00