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

1221 Commits

Author SHA1 Message Date
Tom Giannattasio
cb1db86100 additional margins for thread-tags 2012-09-13 11:01:42 -04:00
Tom Giannattasio
3496e4ee05 added sidebar load more styles 2012-09-13 10:47:50 -04:00
Victor Shnayder
f4a93b7c70 Merge remote-tracking branch 'origin/master' into feature/kfiedler/ocw-links 2012-09-13 10:22:44 -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
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
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
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
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
Kyle Fiedler
ec9521a9f5 removed list bullets from tutorials 2012-09-12 13:01:10 -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
d1292949be fixed spinner positioning on inline discussions 2012-09-12 11:03:18 -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
ff94541e40 tweaked inline hide/show and new post buttons 2012-09-12 09:41:34 -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
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
Arjun Singh
a49b638027 Edit post works now. 2012-09-11 01:07:03 -07:00
Tom Giannattasio
5688cbf0f9 hid inline response toolbar due to lacking inline styles for the icons 2012-09-10 16:14:04 -07:00
Tom Giannattasio
d673b3bcf9 tweaked expanded style 2012-09-10 16:14:04 -07:00
Tom Giannattasio
cf998898bd tweaked new post modal styles 2012-09-10 16:14:03 -07:00
Arjun Singh
7fa68bcc80 Remove unused css class 2012-09-10 15:52:53 -07:00
Arjun Singh
7ad9b39b98 Merge master 2012-09-10 15:33:59 -07:00
Tom Giannattasio
19bd60e905 tightened dropdown topic name treatment 2012-09-10 12:23:47 -07:00
Tom Giannattasio
d0c2d31558 new show/hide button for inline discussions 2012-09-10 12:12:46 -07:00
Tom Giannattasio
8b64dd6a27 new inline thread styles 2012-09-10 12:11:43 -07:00
Tom Giannattasio
5841bdcef0 tweaking loading animation so that it removes more smoothly 2012-09-10 12:11:01 -07:00
Tom Giannattasio
4f4f35f59e prevent defaults added 2012-09-07 17:04:06 -04:00
Tom Giannattasio
891a223f72 tweaked styling of inline pagination 2012-09-07 16:50:32 -04:00
Tom Giannattasio
a0c887cd5f new inline post styles 2012-09-07 16:24:25 -04:00
Tom Giannattasio
319d7e149e restyled inline new post form 2012-09-07 14:43:44 -04:00
Kyle Fiedler
bce61cd6e5 Revert "Merge pull request #642 from MITx/bug/kfiedler/ie" 
This reverts commit 2b5e8a4944, reversing
changes made to db0549be78.
 2012-09-07 14:18:34 -04:00
Tom Giannattasio
e5817f532b fixed sass error for toast notifications 2012-09-07 13:37:28 -04:00
Kyle Fiedler
4d4e5824cd Change form style for login and signup modals so it is consistant in every browser and we have no usability problems 2012-09-07 13:29:49 -04:00
Kyle Fiedler
aec8cc42dc Add ie fix for wiki 2012-09-07 12:59:30 -04:00
Tom Giannattasio
f7e20801cd added toast style error message styling 2012-09-07 11:44:17 -04:00
Tom Giannattasio
deaa49b15a fixed dogear issue 2012-09-07 11:44:17 -04:00
Kyle Fiedler
012edbfd40 Fix main navigation and footer links also make text not italic 2012-09-07 11:14:26 -04:00
David Ormsbee
db0549be78 Merge pull request #594 from MITx/feature/ibrahim/discussion_distinguish_instructors 
Feature/ibrahim/discussion distinguish instructors
 2012-09-07 06:52:15 -07:00
Kyle Fiedler
81ad9530d6 Some edits for the resources box 2012-09-07 09:49:43 -04:00
Kyle Fiedler
bd199ef5c3 Added opencourseware box on course about page 2012-09-07 09:49:43 -04:00
David Ormsbee
b276d8b4b1 Changes as per cpennington's code review 2012-09-07 09:47:13 -04:00
Ibrahim Awwal
b2f3eee93b Pagination in inline discussion views. 2012-09-07 03:37:19 -07:00