Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,081 Commits 1 Branch 0 Tags
1a02cfec8350dd8bc98beeef70aaa632ea9b2021
Commit Graph

1103 Commits

Author SHA1 Message Date
Arjun Singh
3b13013ecc Merge whitespace fix 2012-09-15 02:14:01 -07:00
Arjun Singh
4efe1135cb fix up whitespace causing weirdness in inline response comment rendering 2012-09-15 02:12:52 -07:00
Ibrahim Awwal
c47f0ffb47 Hopefully fix code formatting showing up on comments? But it doesn't seem to happen everywhere... 2012-09-15 00:42:47 -07:00
Arjun Singh
b5351cc584 Support legacy anonymity 2012-09-14 21:59:09 -07:00
Rocky Duan
3e241182c7 Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions 2012-09-14 17:22:26 -07:00
Rocky Duan
9c19f64c01 for students, only display endorse icon if endorsed 2012-09-14 17:22:11 -07:00
Ibrahim Awwal
17c3dd913e Tooltips on follow and vote. 2012-09-14 16:55:16 -07:00
Arjun Singh
b2c88575ee fix deep comment links 2012-09-14 15:38:48 -07:00
Arjun Singh
46d830df13 Merge branch 'master' into feature/arjun/new-discussions 2012-09-14 15:15:21 -07:00
Arjun Singh
190f25c0dd Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions 2012-09-14 13:35:43 -07:00
Arjun Singh
3756d31761 Placeholder for wmd editors; specifically comment form 2012-09-14 13:20:54 -07:00
Tom Giannattasio
7b7ad3d8c2 new paragraph styles for comments 2012-09-14 16:07:45 -04:00
arjun810
0ad3e8a7b0 Merge pull request #692 from MITx/feature/dave/new-discussions 
Small fixes
 2012-09-14 13:06:53 -07:00
David Ormsbee
a32be2958c Change 'View discussion' link on user profile page to be a simple link rather than AJAX. 2012-09-14 16:00:09 -04:00
Arjun Singh
387c8ea1b5 make wmd editor for comments 2012-09-14 12:46:48 -07:00
David Ormsbee
820003b96c Prevent showing redundant roles for this user 2012-09-14 14:29:17 -04:00
Tom Giannattasio
19c5895cbe tweaked profile posted details template 2012-09-14 11:30:51 -04:00
David Ormsbee
2e34c4ae5c Merge pull request #676 from MITx/feature/kfiedler/ocw-links 
Feature/kfiedler/ocw links
 2012-09-14 07:26:53 -07:00
Arjun Singh
8f63ec4d44 merge 2012-09-14 02:56:34 -07:00
Arjun Singh
fff7bcc5a7 Remove more tags; anonymity to peers 2012-09-14 02:50:08 -07:00
Ibrahim Awwal
2d58f8dea1 Fix load more pages button on single thread. 2012-09-14 02:37:46 -07:00
Arjun Singh
b6f9dcdf74 fix inline closed threads 2012-09-14 01:25:02 -07:00
Arjun Singh
1f55763b56 Removing tags for now 2012-09-14 00:44:31 -07:00
Arjun Singh
8506cbcd15 Response editing 2012-09-14 00:11:32 -07:00
Arjun Singh
6b8e2c78ab Allow students to delete threads / respones; prepare for edit view for response comments (but not complete) 2012-09-13 21:58:59 -07:00
Arjun Singh
e4c7a5ea97 Fix courseware context links; filter out unstarted topics. 2012-09-13 19:41:07 -07:00
Carlos Andrés Rocha
5ce16738fb Reverting to original video player 2012-09-13 18:38:48 -04:00
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