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
Kyle Fiedler
f253186e31
Added right style for label
2012-09-13 11:57:46 -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
991e3fd1b7
fixed sidebar height glitch
2012-09-13 11:37:08 -04:00
Tom Giannattasio
bcb7ad343c
fixed anonymous inline bug
2012-09-13 11:25:55 -04:00
Kyle Fiedler
5c76a1fbaf
Added fix for sequence nav in vertical
2012-09-13 11:24:07 -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
ffd60fbd7e
added margin to tags
2012-09-13 11:19:57 -04:00
Tom Giannattasio
cb1db86100
additional margins for thread-tags
2012-09-13 11:01:42 -04:00
Tom Giannattasio
6e217b315d
added conditional to render tags wrapper only if there are tags
2012-09-13 10:59:47 -04:00
Tom Giannattasio
3496e4ee05
added sidebar load more styles
2012-09-13 10:47:50 -04: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
aa6e878626
Fix repeated edits on inline threads.
2012-09-13 05:50:43 -07:00
Ibrahim Awwal
b03bcae4a2
Re expand thread if edit is canceled.
...
Should rework how inline threads are expanded/collapsed a little so that this kind of
thing is not needed.
2012-09-13 05:45:32 -07:00
Ibrahim Awwal
5fd45a50bc
Enable editing for inline threads.
...
Currently there's a bug where editing more than once without reloading the page
causes it to successively get more and more broken.
2012-09-13 05:36:46 -07:00
Ibrahim Awwal
30b4918e77
Fix tags updating after editing a post.
2012-09-13 04:14:19 -07: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
Carlos A. Rocha
67cbf50b83
Fix swfobject and django-pipeline - Cosmetic fix for youtube player
2012-09-13 01:08:59 -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
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
