Brittany Cheng
|
9ab745c331
|
reorganize css
|
2012-08-06 12:04:15 -04:00 |
|
Brittany Cheng
|
27eaffe246
|
sort styles
|
2012-08-06 11:47:16 -04:00 |
|
Rocky Duan
|
1f5aa5e68b
|
fixed new post editor position
|
2012-08-05 15:33:18 -04:00 |
|
Rocky Duan
|
28c1352c07
|
handleSearch not in use anymore
|
2012-08-05 15:31:44 -04:00 |
|
Rocky Duan
|
8bdefecb79
|
fixed search button
|
2012-08-05 15:22:26 -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
|
09baabee0b
|
added command: run rake django-admin[sync_user_info] to sync info to discussion
|
2012-08-04 18:00:57 -04:00 |
|
Rocky Duan
|
0af26ae8d6
|
check if mathjax exists before proceeding
|
2012-08-04 18:00:25 -04:00 |
|
Rocky Duan
|
0fd2ed99c6
|
client side function for user operations
|
2012-08-04 17:59:58 -04:00 |
|
Rocky Duan
|
69e28e3966
|
callback to sync user info
|
2012-08-04 17:59:44 -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
|
8bf4bc2d5e
|
Merge branch 'discussion2' of github.com:dementrock/mitx
|
2012-08-03 16:09:23 -04:00 |
|
Rocky Duan
|
042ccf9754
|
make everything inline (ajax) for now
|
2012-08-03 16:09:13 -04:00 |
|
Rocky Duan
|
79497287d7
|
moved some stuff & ajax link to page
|
2012-08-03 15:55:21 -04:00 |
|
Brittany Cheng
|
53b6c9944c
|
reply and edit margins
|
2012-08-03 15:22:26 -04:00 |
|
Rocky Duan
|
3c681a207f
|
fixed vote bug
|
2012-08-03 15:07:57 -04:00 |
|
Rocky Duan
|
6f798fd196
|
Merge branch 'discussion2' of github.com:dementrock/mitx
|
2012-08-03 14:59:30 -04:00 |
|
Rocky Duan
|
b2c1904c7a
|
ajax endorse
|
2012-08-03 14:59:23 -04:00 |
|
Rocky Duan
|
600beb2849
|
ajax vote / unvote comments
|
2012-08-03 14:52:39 -04:00 |
|
Brittany Cheng
|
356c44c5bf
|
voting styles
|
2012-08-03 14:48:50 -04:00 |
|
Victor Shnayder
|
94e24c1626
|
Leftover name->url_name fixes
|
2012-08-03 14:45:43 -04:00 |
|
Brittany Cheng
|
cbb39406b6
|
sort styles
|
2012-08-03 14:37:14 -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
|
a587cb5a3c
|
Merge branch 'discussion2' of github.com:dementrock/mitx
|
2012-08-03 13:43:15 -04:00 |
|
Rocky Duan
|
7d1b577b80
|
show discussion & reply fix
|
2012-08-03 13:43:07 -04:00 |
|
Brittany Cheng
|
0a2aafab08
|
follow button style
|
2012-08-03 13:40:04 -04:00 |
|
Brittany Cheng
|
4ac3eebcfb
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-08-03 13:39:23 -04:00 |
|
Rocky Duan
|
2077729d7c
|
Merge branch 'discussion2' of github.com:dementrock/mitx
|
2012-08-03 13:38:18 -04:00 |
|
Brittany Cheng
|
ec258a6346
|
follow button
|
2012-08-03 13:36:14 -04:00 |
|
Rocky Duan
|
9b2578c79c
|
fix reply & some random stuff
|
2012-08-03 13:35:15 -04:00 |
|
Brittany Cheng
|
b73e329dd8
|
follow button
|
2012-08-03 13:33:40 -04:00 |
|
Rocky Duan
|
fd922cf755
|
slight changes
|
2012-08-03 12:49:35 -04:00 |
|
Rocky Duan
|
5224856286
|
Merge branch 'discussion2'
|
2012-08-03 12:45:48 -04:00 |
|
Rocky Duan
|
8297f7b569
|
slight changes
|
2012-08-03 12:45:30 -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
|
0b2069c619
|
make clean_xml script work with stringified errors
|
2012-08-03 11:53:35 -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 |
|