kimth
a40e8eaefb
Clean up widow prevention logic
2012-09-13 18:10:11 -04:00
kimth
5dbc0b7e7a
Fix widow prevent logic
2012-09-13 18:02:46 -04:00
kimth
cf9130a811
Widow prevention should be active when there are actual words
2012-09-13 17:51:25 -04:00
kimth
a9b03483aa
Fix widow js
2012-09-13 17:38:20 -04:00
Matthew Mongeau
5b9967e5a0
Paging wip
2012-09-13 17:35:29 -04:00
kimth
5b413aa5da
Merge pull request #681 from MITx/bug/kfiedler/empty-subtitle
...
fixed empty space below accordion nav items that dont have a subtitle
2012-09-13 12:45:02 -07:00
David Ormsbee
889dc9959f
Merge pull request #675 from MITx/feature/kfiedler/last-press-release
...
Added one last press release
2012-09-13 11:54:10 -07:00
David Ormsbee
4a4b4a5c56
Merge pull request #679 from MITx/feature/bridger/wiki_fixes
...
Feature/bridger/wiki fixes
2012-09-13 11:53:52 -07:00
Kyle Fiedler
c17a9b78f8
fixed empty space below accordion nav items that dont have a subtitle
2012-09-13 13:52:47 -04:00
Tom Giannattasio
021f86a9a8
Merge pull request #669 from MITx/feature/kfiedler/widows
...
Added widow fix for subtitles too
2012-09-13 09:40:03 -07:00
Bridger Maxwell
a3760d484d
Added call to load schematics on wiki pages.
2012-09-13 12:38:28 -04:00
Bridger Maxwell
b4142246fe
Added ie fixes stylesheet to main_django.html. Cleaned up whitespace to more closely match main.html.
2012-09-13 11:39:32 -04:00
Tom Giannattasio
bcb7ad343c
fixed anonymous inline bug
2012-09-13 11:25:55 -04:00
kimth
7f67e9a060
Merge pull request #668 from MITx/bug/kfiedler/ie
...
Fix IE bugs including schematic editor text alignment
2012-09-13 08:20:11 -07:00
Tom Giannattasio
a152041ef8
fixed inline thread replace error
2012-09-13 10:25:10 -04:00
Victor Shnayder
f4a93b7c70
Merge remote-tracking branch 'origin/master' into feature/kfiedler/ocw-links
2012-09-13 10:22:44 -04:00
Victor Shnayder
66343884dc
pull ocw links from about/ocw_links.html
...
format should be
<ul>
<li>link</li>
<li>other link</li>
</ul>
2012-09-13 10:22:02 -04:00
Kyle Fiedler
67547e2b09
Added one last press release
2012-09-13 10:19:45 -04:00
Tom Giannattasio
85abb71398
styles for inline comment count
2012-09-13 10:13:49 -04:00
Tom Giannattasio
b3335ec551
brought vote button back to collapsed inline discussions
2012-09-13 10:08:31 -04:00
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
Carlos A. Rocha
e0c7cef65f
Workaround for swfobject - pipeline problems
2012-09-13 01:38:52 -04:00
Ibrahim Awwal
8c9febe549
Add quotes to fix thread editor title bug.
2012-09-12 20:55:55 -07: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
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
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
Tom Giannattasio
1d71a2cfbd
tweaked usernames so they were more prominent throughout
2012-09-12 13:40:11 -04:00
Kyle Fiedler
2f8a7d0744
Removes unused widowfix script
2012-09-12 12:37:19 -04: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
Matthew Mongeau
1a402f7fda
Mark responses and comments as staff
2012-09-12 11:09:36 -04:00
Kyle Fiedler
05c3e028c2
Added new press releases
2012-09-12 10:38:17 -04:00
Tom Giannattasio
ff94541e40
tweaked inline hide/show and new post buttons
2012-09-12 09:41:34 -04:00
Kyle Fiedler
064b5e7932
Remove widows in accordion header
2012-09-11 11:25:54 -04:00
Ibrahim Awwal
2d105265f9
Add @references for deeply nested (3+) comments.
2012-09-11 05:43:21 -07:00
Ibrahim Awwal
ce16d22451
Fix anonymous posts on the inline discussion view.
2012-09-11 04:09:53 -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
45ba58318f
Hide usernames for anonymous posts.
2012-09-11 01:33:59 -07:00
Arjun Singh
a49b638027
Edit post works now.
2012-09-11 01:07:03 -07:00
Ibrahim Awwal
c2f741c392
Revert "Disable posting anonymously for now."
...
This reverts commit 6ee6e1c656
2012-09-10 20:18:46 -07:00
Arjun Singh
ca8b299711
drop unread counts for now
2012-09-10 19:16:57 -07:00
Matthew Mongeau
6ee6e1c656
Disable posting anonymously for now.
2012-09-10 16:14:04 -07:00
Arjun Singh
7ad9b39b98
Merge master
2012-09-10 15:33:59 -07:00
Tom Giannattasio
d0c2d31558
new show/hide button for inline discussions
2012-09-10 12:12:46 -07:00
Arjun Singh
aa7af4e6fe
Make thread view with subview work
2012-09-10 11:40:52 -07:00
ichuang
ccbbb5a993
commit_id may be specified for modulestore reload - for multi-worker configs
...
also show pid in migration and instructor dashboard views for thread debugging
2012-09-09 19:39:11 -04:00
