Commit Graph

530 Commits

Author SHA1 Message Date
Tom Giannattasio
00a72cf86a updated thread styles: voting, actions, comments, sort 2012-08-07 11:27:13 -04:00
Tom Giannattasio
6cdd3a7ec2 started thread styles 2012-08-06 18:17:21 -04:00
Tom Giannattasio
0ec7e3d3cd added "top" sort type 2012-08-06 17:04:07 -04:00
Tom Giannattasio
fa7d1745dc removed extraneous elements (page title, search within) 2012-08-06 17:03:49 -04:00
Brittany Cheng
5e9dfabfda comment info 2012-08-06 14:33:37 -04:00
Brittany Cheng
27eaffe246 sort styles 2012-08-06 11:47:16 -04:00
Rocky Duan
20926e839b fixed ajax retrieved search bar in forum view 2012-08-05 14:57:35 -04:00
Rocky Duan
cacd58ca9f fixed sort bug 2012-08-04 19:50:50 -04:00
Rocky Duan
e22371b80d fixed some notification stuff 2012-08-04 19:41:24 -04:00
Rocky Duan
7c58fd27a1 Merge branch 'master' of github.com:MITx/mitx
Conflicts:
	lms/templates/profile.html
2012-08-04 18:07:27 -04:00
Rocky Duan
a1575799ba Merge branch 'discussion2' of github.com:dementrock/mitx 2012-08-04 18:04:07 -04:00
Rocky Duan
9308e39d4e bug fix 2012-08-04 18:03:59 -04:00
Rocky Duan
7cd0914541 minor changes 2012-08-04 16:06:15 -04:00
Brittany Cheng
5643903efc small change in html 2012-08-03 17:40:51 -04:00
Calen Pennington
9b322f68b4 Merge pull request #337 from MITx/feature/victor/use-url-names
Feature/victor/use url names
2012-08-03 13:23:31 -07:00
Rocky Duan
d507ac6cc0 should be like this 2012-08-03 16:23:19 -04:00
Calen Pennington
b1494da02c Merge pull request #330 from MITx/ExternalAuth
External auth
2012-08-03 13:18:55 -07:00
Rocky Duan
79497287d7 moved some stuff & ajax link to page 2012-08-03 15:55:21 -04:00
Rocky Duan
600beb2849 ajax vote / unvote comments 2012-08-03 14:52:39 -04:00
Brittany Cheng
5d30c2de06 sort arrows 2012-08-03 14:28:04 -04:00
Rocky Duan
038d7f89e5 ajax editing comments / threads 2012-08-03 14:26:37 -04:00
Rocky Duan
9b2578c79c fix reply & some random stuff 2012-08-03 13:35:15 -04:00
Brittany Cheng
15fa639e8b merge conflict 2012-08-03 12:31:28 -04:00
Brittany Cheng
69475c63c8 move follow, remove hover 2012-08-03 12:30:21 -04:00
Rocky Duan
e59ea854ca ajax submit new post 2012-08-03 12:29:45 -04:00
Rocky Duan
0b96d0091b ajax reply & why am I on discussion2.. 2012-08-03 12:15:45 -04:00
Victor Shnayder
b46172da9b Rename module.name and descriptor.name to url_name
* update templates and code references
* also a display_name property that defaults to cleaned url_name
2012-08-03 11:36:54 -04:00
Rocky Duan
f7e9746eb3 Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2 2012-08-03 10:16:45 -04:00
Rocky Duan
7ab137328f Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-08-03 10:16:35 -04:00
Brittany Cheng
2238137df8 sort styles 2012-08-02 18:09:37 -04:00
Rocky Duan
833b89502c add class for selected sort option 2012-08-02 17:45:34 -04:00
Rocky Duan
f579730f16 should have done this long time ago 2012-08-02 17:20:12 -04:00
Rocky Duan
bad84669b7 Merge branch 'master' into discussion2 2012-08-02 16:01:41 -04:00
Rocky Duan
0375710d22 i meant sort before...this time it's search ajax 2012-08-02 16:01:27 -04:00
Brittany Cheng
4a605ab9c8 Merge branch 'master' of github.com:dementrock/mitx into discussion2 2012-08-02 15:43:51 -04:00
Brittany Cheng
7f0282a222 paginator styles 2012-08-02 15:43:05 -04:00
Rocky Duan
7b65663e2b ajax search in inline view 2012-08-02 15:34:29 -04:00
Rocky Duan
381fe9514b make cancel/submit work and hide watch discussion 2012-08-02 15:12:55 -04:00
Rocky Duan
fd1e91aef2 display show comments button 2012-08-02 15:02:10 -04:00
Rocky Duan
1e7e2f25ad Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2 2012-08-02 14:42:12 -04:00
Rocky Duan
380c6f86e7 random fixes 2012-08-02 14:41:45 -04:00
Victor Shnayder
987b9c11a9 Use url_name for chapters and sections in lms views
* got rid of the hackish conversions between ' ' and '_'
* use url_name and display_name where appropriate
* update templates to match.
2012-08-02 14:28:44 -04:00
Brittany Cheng
7d414346d6 Merge branch 'master' of github.com:dementrock/mitx into discussion2 2012-08-02 14:21:15 -04:00
Victor Shnayder
95e139f39b Merge pull request #336 from MITx/feature/victor/xml-verify
Feature/victor/xml verify
2012-08-02 11:12:43 -07:00
ichuang
10b2c212b6 fix javascript for signup modal .click() in index.html for safari 2012-08-02 13:52:25 -04:00
ichuang
46bc7bc499 remove unnecessary hidden fields 2012-08-02 13:44:37 -04:00
Rocky Duan
de2f48b3bf Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-08-02 12:55:09 -04:00
Rocky Duan
f1b3f69656 retrieve threads by ajax 2012-08-02 12:54:09 -04:00
Brittany Cheng
2d54aa07f3 Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-08-02 11:55:28 -04:00
Brittany Cheng
907e763606 sort styles 2012-08-02 11:55:21 -04:00