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

10228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ibrahim Awwal
b5671e0fe9 Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions 2012-09-14 02:23:45 -07:00
Ibrahim Awwal
ac9dd7bd1e Fix hiding the more pages button. 2012-09-14 02:23:39 -07:00
Ibrahim Awwal
910be64aa2 Make pagination respect any filters or searches or sort keys. Searches and filters will 
query the comment service to get their results rather than filtering threads that have
already been loaded.
 2012-09-14 02:13:53 -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
a46b8e5f01 fix old-style customresponses 2012-09-13 23:16:47 -07:00
Arjun Singh
9197efc3a1 Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions 2012-09-13 21:59:09 -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
Ibrahim Awwal
4d59013955 Remove dead code. 2012-09-13 19:58:17 -07:00
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
David Ormsbee
47b1c809dd Merge pull request #686 from MITx/rocha/hotfixes 
Reverting to original video player
 2012-09-13 16:04:37 -07: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
arjun810
1597bdf41c Merge pull request #685 from MITx/kimth/fix-widow-js 
Kimth/fix widow js
 2012-09-13 15:14:02 -07: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
3164af650d Merge pull request #684 from MITx/kimth/fix-widow-js 
Fix widow js
 2012-09-13 14:41:25 -07: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
arjun810
ffd9c03051 Merge pull request #683 from MITx/kimth/put-back-bullets-in-course-info 
Bring back bullets in lists
 2012-09-13 13:48:29 -07: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
kimth
b43da7463a Do variable substitution for detailed solutions 2012-09-13 15:12:18 -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
kimth
f0638f8a6f Merge pull request #677 from MITx/bug/kfiedler/tonys-bugs 
A bunch of solutions for bugs Tony had reported
 2012-09-13 08:36:37 -07:00
kimth
bee1c50d9f Merge pull request #678 from MITx/rocha/hotfixes 
Temporary fix to set the speed of video player to 1.0
 2012-09-13 08:29:35 -07:00
Carlos Andrés Rocha
9fb5346571 Temporary fix to set the speed of video player to 1.0 regardless of previous state 2012-09-13 11:26:52 -04:00
Tom Giannattasio
bcb7ad343c fixed anonymous inline bug 2012-09-13 11:25:55 -04:00