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

17975 Commits

Author SHA1 Message Date
Arjun Singh
3cbc075f7b Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions 2012-09-13 19:41:18 -07:00
Arjun Singh
e4c7a5ea97 Fix courseware context links; filter out unstarted topics. 2012-09-13 19:41:07 -07:00
Ibrahim Awwal
d92a070ab1 Obey current search query and sort order when retrieving additional pages. 2012-09-13 18:34:01 -07:00
Ibrahim Awwal
236756e4ca Default argument value for options in Discussion so that inline discussions can still 
work without modification. Eventually we'll want to switch the pagination there to
match the pagination on the main forum though.
 2012-09-13 17:53:30 -07:00
Kyle Fiedler
03ad061a2f style for submission feedback 2012-09-13 20:10:45 -04:00
Kyle Fiedler
a32d9686ae One more IE fix and added comments so there is some explination of what is there 2012-09-13 19:21:55 -04:00
Arjun Singh
a83b9322ae Allow for course subscriptions 2012-09-13 16:03:19 -07:00
Arjun Singh
8bad4c8dbc Allow for course subscriptions 2012-09-13 16:00:48 -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
Tom Giannattasio
031a7d4e28 firefox border-box bug fix 2012-09-13 17:01:15 -04:00
kimth
81e01c8c72 Bring back bullets in lists 2012-09-13 16:46:19 -04:00
kimth
26158e78ea Merge pull request #682 from MITx/feature/kfiedler/updates 
Update styles for the info updates
 2012-09-13 12:45:43 -07: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
Tom Giannattasio
6c481b8aa3 fixed post list sort active state bug 2012-09-13 15:41:25 -04:00
Kyle Fiedler
e0e94ee1f1 A little more space for each list 2012-09-13 15:23:46 -04:00
Tom Giannattasio
cb9697ba58 fixed jump to top bug on edit form cancel button click 2012-09-13 15:16:17 -04:00
Kyle Fiedler
15ffd7e01d Better styles for updates 2012-09-13 15:13:42 -04:00
Tom Giannattasio
d2c6ae9391 tweaked inline tag styles; added href to tags 2012-09-13 15:01:54 -04: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
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