Commit Graph

736 Commits

Author SHA1 Message Date
Ibrahim Awwal
773a32e39f Fix bug with sorting discussion forums (event was not being passed into the event handler). 2012-08-27 13:00:02 -07:00
Tom Giannattasio
9b5285ad8a Merge branch 'master' into feature/rocha/wiki-cheatsheet 2012-08-27 09:08:48 -04:00
Rocky Duan
eb8ee01d21 fixed a tiny bug that loading icon sometimes doesn't appear at the right place / doesn't go away 2012-08-25 12:12:57 -07:00
Tom Giannattasio
4a06decafd Merge branch 'master' into feature/tomg/courseware_signin 2012-08-24 16:42:01 -04:00
Tom Giannattasio
7d14632c3a added log in button to unauthenticated courseware 2012-08-24 16:41:12 -04:00
Tom Giannattasio
d1760f9a22 styled markdown modal and link 2012-08-24 16:14:04 -04:00
Arjun Singh
f7e299d04e fix inline discussion 2012-08-24 11:15:06 -07:00
Tom Giannattasio
9cab1d9de8 fixed merge conflict 2012-08-24 13:33:48 -04:00
David Ormsbee
d0f2f31063 Merge pull request #547 from MITx/feature/rocky/discussion
fixed profiled user id (toggle moderator status)
2012-08-24 08:25:42 -07:00
Tom Giannattasio
10c953e8a4 Merge pull request #534 from MITx/feature/kfiedler/wiki
fix wiki falsh message
2012-08-24 08:03:37 -07:00
Arjun Singh
eb4068cc11 Make profile page look reasonable 2012-08-24 03:14:42 -07:00
Arjun Singh
eb65b95232 Removing stray return statement 2012-08-24 03:06:44 -07:00
Rocky Duan
fe74f9bc85 reconstruct after editing 2012-08-24 02:17:58 -07:00
Rocky Duan
cc5fbdd5a7 fixed appearance of loading icon near sort bar 2012-08-24 02:05:11 -07:00
Rocky Duan
80195176e9 use escape html everywhere and only send discussion data relavent 2012-08-24 01:45:55 -07:00
Rocky Duan
88a3e828f6 don't use raw html when rendering 2012-08-24 01:04:11 -07:00
Rocky Duan
3761b02ce8 hide reply button after closing thread 2012-08-23 15:12:22 -07:00
David Ormsbee
575a91e2ef Merge pull request #539 from MITx/feature/rocky/blank_slate_fix
remove blank slate after new post
2012-08-23 15:08:25 -07:00
Rocky Duan
ca09c7427b some tiny bug fixes 2012-08-23 14:33:18 -07:00
Tom Giannattasio
2783ff7e63 added simple table filtering to gradebook 2012-08-23 16:57:03 -04:00
Tom Giannattasio
b494441e7a started new gradebook functionality 2012-08-23 16:40:48 -04:00
Carlos Andrés Rocha
d94ef54549 Added cheatsheet popup to wiki editor. 2012-08-23 16:30:58 -04:00
Tom Giannattasio
9a3a4f4a88 set active accordion state 2012-08-23 13:10:14 -04:00
Rocky Duan
3e6f3430b6 remove blank slate after new post 2012-08-23 10:06:27 -07:00
Tom Giannattasio
5950520e71 tweaked sequence nav and discussion profile sidebar 2012-08-23 11:11:22 -04:00
Kyle Fiedler
773055cf54 fix wiki falsh message 2012-08-23 10:28:31 -04:00
Tom Giannattasio
a2372e659c Merge branch 'master' into feature/tomg/fall-design 2012-08-23 10:04:17 -04:00
Tom Giannattasio
2c1571d66c applied line height to course content wrapper to avoid strange line heights with improper markup 2012-08-23 10:04:00 -04:00
John Jarvis
f0b60fed10 adding maintenance static data 2012-08-23 08:30:04 -04:00
Tom Giannattasio
cf2f5d2af2 Merge branch 'master' into feature/tomg/fall-design 2012-08-23 08:24:58 -04:00
Tom Giannattasio
163eb9d49f fixed bottom sequence nav buttons and firefox outling bug 2012-08-23 08:24:54 -04:00
Victor Shnayder
d8342255be Merge pull request #519 from MITx/feature/arjun/cs188_css
cs188 styling
2012-08-23 04:58:24 -07:00
David Ormsbee
dc13ff81b7 Merge pull request #521 from MITx/feature/rocky/loading
added a loading icon when retrieving ajax
2012-08-23 04:31:11 -07:00
Tom Giannattasio
bc005e5f46 adjusted dashboard sidebar to accommodate long emails 2012-08-23 07:29:35 -04:00
Rocky Duan
f2507d7c52 hide similar post wrapper when no results 2012-08-23 02:51:46 -07:00
Rocky Duan
0b00e3b099 make similar posts url working 2012-08-23 02:17:17 -07:00
Rocky Duan
5fb2bbbd7f make similar posts go away when submitted post 2012-08-23 02:03:50 -07:00
Rocky Duan
2b6a0928ca fixed loading for discussion module 2012-08-23 01:55:31 -07:00
Rocky Duan
16ca13f203 Merge branch 'feature/rocky/discussion' into feature/rocky/loading 2012-08-23 01:52:07 -07:00
Rocky Duan
233f817f0b include discussion js group in coursewar & removed unnecessary code 2012-08-23 01:51:51 -07:00
Rocky Duan
abe12ddd7c display loading status 2012-08-23 01:47:47 -07:00
Rocky Duan
007de179e1 add user profile page back 2012-08-22 23:44:50 -07:00
Rocky Duan
4dae36cd8e only execude code when backbone is defined 2012-08-22 23:44:50 -07:00
Rocky Duan
45431ae789 scroll to top after reloading threads 2012-08-22 23:44:50 -07:00
Arjun Singh
1c9029c163 cs188 styling 2012-08-22 22:57:14 -07:00
David Ormsbee
8e560688ae Merge pull request #516 from MITx/feature/fix_backbone_js
Feature/fix backbone js
2012-08-22 21:21:59 -07:00
David Ormsbee
af079a9362 Fix coffee includes for discussion forum. 2012-08-23 00:19:55 -04:00
David Ormsbee
4e7ba6e651 Merge pull request #513 from MITx/feature/bridger/new_wiki
Feature/bridger/new wiki
2012-08-22 20:18:36 -07:00
Bridger Maxwell
e7732bf32f Wiki directory links now go to the article, with a smaller link for viewing sub-listings. 2012-08-22 21:05:17 -04:00
Rocky Duan
952c9d56cf moved some stuff 2012-08-22 15:57:04 -07:00