John Jarvis
|
f0b60fed10
|
adding maintenance static data
|
2012-08-23 08:30:04 -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 |
|
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 |
|
Rocky Duan
|
631aaaf5ba
|
removed unnecessary file
|
2012-08-22 15:51:45 -07:00 |
|
Rocky Duan
|
908a5c5d59
|
Merge branch 'master' of github.com:MITx/mitx into merge
|
2012-08-22 14:11:44 -07:00 |
|
Rocky Duan
|
3cbaba1961
|
fixed autosubscribe
|
2012-08-22 14:11:19 -07:00 |
|
Rocky Duan
|
3b76fe16d8
|
make inline page working
|
2012-08-22 14:04:42 -07:00 |
|
Rocky Duan
|
951fb06341
|
Merge branch 'master' of github.com:MITx/mitx into merge
Conflicts:
lms/envs/dev.py
|
2012-08-22 14:04:34 -07:00 |
|
Calen Pennington
|
e206bf2ffc
|
Merge pull request #505 from MITx/feature/tomg/fall-design
Feature/tomg/fall design
|
2012-08-22 13:34:39 -07:00 |
|
David Ormsbee
|
c86ee73bd8
|
Merge pull request #504 from MITx/feature/bridger/new_wiki
Feature/bridger/new wiki
|
2012-08-22 13:13:33 -07:00 |
|
Tom Giannattasio
|
a05cf05462
|
Merge branch 'master' into feature/tomg/fall-design
|
2012-08-22 16:09:30 -04:00 |
|
Tom Giannattasio
|
2c827c46f9
|
fixed firefox outline bugs
|
2012-08-22 16:09:09 -04:00 |
|
Kyle Fiedler
|
f4f8b7bf73
|
Added delete page and padding and hid th on overflow
|
2012-08-22 15:39:24 -04:00 |
|
Kyle Fiedler
|
7464332180
|
added fix for error styles and swapped some the button order
|
2012-08-22 15:09:20 -04:00 |
|
Rocky Duan
|
9b26a20989
|
fixed search highlighting
|
2012-08-22 12:04:32 -07:00 |
|
David Ormsbee
|
8b8ee9f434
|
Merge pull request #500 from MITx/feature/cale/university-branding
Feature/cale/university branding
|
2012-08-22 12:02:19 -07:00 |
|
Calen Pennington
|
55984e31fc
|
Add HarvardX- and MITx- on-edx-logo.png files
|
2012-08-22 14:47:50 -04:00 |
|
Kyle Fiedler
|
d0c92aa159
|
Added styles for the wiki directory
|
2012-08-22 14:43:03 -04:00 |
|
Calen Pennington
|
b841591b0a
|
Remove special styling for courseware header logo
|
2012-08-22 14:08:36 -04:00 |
|
Rocky Duan
|
37c78524a8
|
migrated threads reloading related stuff
|
2012-08-22 11:07:02 -07:00 |
|
Calen Pennington
|
82bab71ccf
|
First pass at branding the header logo on subdomains
|
2012-08-22 14:05:19 -04:00 |
|
Kyle Fiedler
|
02f29c22c9
|
Added stsyles for toc
|
2012-08-22 13:41:20 -04:00 |
|
Bridger Maxwell
|
14382702bc
|
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
Conflicts:
lms/templates/wiki/settings.html
|
2012-08-22 13:09:42 -04:00 |
|
Tom Giannattasio
|
d2808981cb
|
fixed wiki breadcrumb arrow bug
|
2012-08-22 12:09:57 -04:00 |
|
Tom Giannattasio
|
fb1d9ca06c
|
Merge branch 'master' into feature/tomg/fall-design
|
2012-08-22 11:41:19 -04:00 |
|
Tom Giannattasio
|
7d903c4089
|
sidebar hover and firefox bug fixes
|
2012-08-22 11:40:59 -04:00 |
|
Tom Giannattasio
|
b7ce475adb
|
accordion hovers
|
2012-08-22 09:35:17 -04:00 |
|
Tom Giannattasio
|
8344fe88bd
|
removed funky footer logo animation
|
2012-08-22 09:08:42 -04:00 |
|
Tom Giannattasio
|
885efc47c4
|
darker background for increased contrast
|
2012-08-22 09:03:38 -04:00 |
|
Arjun Singh
|
a9126aa276
|
Fixed syllabus to look good with new courseware styling
|
2012-08-22 05:25:48 -07:00 |
|
Tom Giannattasio
|
441d1955f9
|
fixed anonymous header bug
|
2012-08-22 07:34:55 -04:00 |
|
Rocky Duan
|
4a3975c78d
|
adjusted frontend stuff
|
2012-08-21 23:33:13 -07:00 |
|
Rocky Duan
|
a90af0c471
|
render permalink in backend
|
2012-08-21 23:26:06 -07:00 |
|
Rocky Duan
|
654075e03f
|
migrated follow thread
|
2012-08-21 23:08:32 -07:00 |
|