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 |
|
Rocky Duan
|
89c28115b4
|
some archived stuff for later
|
2012-08-03 11:03:58 -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 |
|
Rocky Duan
|
51961c1cf1
|
Merge branch 'master' into discussion2
|
2012-08-02 18:41:15 -04:00 |
|
Rocky Duan
|
cc477138cd
|
some refactoring on error handling
|
2012-08-02 18:41:07 -04:00 |
|
Rocky Duan
|
5ba879fc13
|
refactored some code
|
2012-08-02 18:23:50 -04:00 |
|
Brittany Cheng
|
839463e9c2
|
Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2
|
2012-08-02 18:11:26 -04:00 |
|
Brittany Cheng
|
2238137df8
|
sort styles
|
2012-08-02 18:09:37 -04:00 |
|
Brittany Cheng
|
3b312a2c92
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-08-02 17:46:40 -04:00 |
|
Rocky Duan
|
833b89502c
|
add class for selected sort option
|
2012-08-02 17:45:34 -04:00 |
|
Brittany Cheng
|
cf4ac2ef89
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-08-02 17:21:08 -04:00 |
|
Rocky Duan
|
4749f3a575
|
Merge branch 'master' into discussion2
|
2012-08-02 17:20:23 -04:00 |
|
Rocky Duan
|
f579730f16
|
should have done this long time ago
|
2012-08-02 17:20:12 -04:00 |
|
Rocky Duan
|
d183e91f3f
|
Merge branch 'master' into discussion2
|
2012-08-02 17:08:24 -04:00 |
|
Rocky Duan
|
6a23e910c2
|
small fic
|
2012-08-02 17:08:05 -04:00 |
|
Brittany Cheng
|
f649084ab2
|
rocky's coffee edits
|
2012-08-02 17:05:00 -04:00 |
|
Rocky Duan
|
88a98ef548
|
refactored discussion.coffee into separate files
|
2012-08-02 17:03:10 -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
|
55ce53f984
|
reply styles
|
2012-08-02 15:50:14 -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 |
|
Brittany Cheng
|
fffad764b3
|
styles
|
2012-08-02 15:31:04 -04:00 |
|
Rocky Duan
|
1da86a782f
|
oops
|
2012-08-02 15:16:59 -04:00 |
|
Rocky Duan
|
2811f50466
|
hide the annoying staff info for now
|
2012-08-02 15:15:35 -04:00 |
|
Rocky Duan
|
381fe9514b
|
make cancel/submit work and hide watch discussion
|
2012-08-02 15:12:55 -04:00 |
|
Rocky Duan
|
7b66cae380
|
Merge branch 'discussion2' of github.com:dementrock/mitx
|
2012-08-02 15:02:20 -04:00 |
|
Rocky Duan
|
fd1e91aef2
|
display show comments button
|
2012-08-02 15:02:10 -04:00 |
|
Brittany Cheng
|
10c1366510
|
reply styles
|
2012-08-02 14:56:00 -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
|
3b6f33f5a7
|
Fix github_sync tests
* CMS no longer syncs, it just imports when it gets a commit note
from github
|
2012-08-02 14:26:24 -04:00 |
|
Brittany Cheng
|
7d414346d6
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-08-02 14:21:15 -04:00 |
|
Brittany Cheng
|
b47edaa9c9
|
styles
|
2012-08-02 14:21:09 -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 |
|
Victor Shnayder
|
26ae88faac
|
Factor out get_item_error() into a new ModuleStoreBase class
* may be temporary if we move errors into the items themselves.
|
2012-08-02 13:41:54 -04:00 |
|
Calen Pennington
|
477b7062d4
|
Merge pull request #335 from MITx/feature/cale/cms-no-roundtrip
Only import from github when changes are made, rather than exporting. Th...
|
2012-08-02 10:39:01 -07:00 |
|
Rocky Duan
|
de2f48b3bf
|
Merge branch 'master' of github.com:MITx/mitx into discussion2
|
2012-08-02 12:55:09 -04:00 |
|
Rocky Duan
|
0f3f5de66f
|
Merge branch 'master' into discussion2
|
2012-08-02 12:54:38 -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 |
|
David Ormsbee
|
73fb8f5464
|
Merge branch 'hotfix/1.0.3'
Conflicts:
lms/urls.py
|
2012-08-02 11:51:50 -04:00 |
|
Victor Shnayder
|
64346d727b
|
todos and comments
|
2012-08-02 11:33:53 -04:00 |
|
Victor Shnayder
|
fd796478d8
|
add a handy supertrace script
|
2012-08-02 11:33:04 -04:00 |
|
Rocky Duan
|
aa29b77715
|
Merge branch 'master' of github.com:MITx/mitx
|
2012-08-02 11:05:58 -04:00 |
|
Victor Shnayder
|
31b8270cfb
|
remove too-clever lazy dictionary
|
2012-08-02 10:14:35 -04:00 |
|