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 |
|
Bridger Maxwell
|
e655b4a3b3
|
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
Conflicts:
cms/static/sass/_base.scss
repo-requirements.txt
|
2012-08-21 22:25:21 -04:00 |
|
Rocky Duan
|
11e3276e80
|
update comment count based on operations
|
2012-08-21 17:43:20 -07:00 |
|
Rocky Duan
|
273af4a5ba
|
make delete work
|
2012-08-21 17:15:52 -07:00 |
|
Rocky Duan
|
fd0eff46e7
|
Merge branch 'feature/rocky/discussion_api_key' into refactor
Conflicts:
lms/djangoapps/django_comment_client/tests.py
lms/lib/comment_client/utils.py
lms/templates/courseware/courseware.html
|
2012-08-21 17:14:25 -07:00 |
|
Rocky Duan
|
de4b477649
|
make edit working
|
2012-08-21 17:02:17 -07:00 |
|
Tom Giannattasio
|
bbc95cb589
|
fixed accordion nav glitch
|
2012-08-21 19:25:32 -04:00 |
|
Tom Giannattasio
|
88505b3948
|
fixed discussion sidebar
|
2012-08-21 18:41:06 -04:00 |
|
Rocky Duan
|
fdf92d68f6
|
more refactoring; enabled partial re-rendering for votes, endorse, and closed
|
2012-08-21 15:26:50 -07:00 |
|
Tom Giannattasio
|
bd536f8aec
|
Merge branch 'master' into feature/tomg/fall-design
|
2012-08-21 18:13:40 -04:00 |
|
Tom Giannattasio
|
e762844c35
|
new sequence nav functionality - accommodates an infinite number of items
|
2012-08-21 18:12:59 -04:00 |
|
Victor Shnayder
|
2c19d01441
|
Merge pull request #479 from MITx/feature/arjun/syllabus
Adding a syllabus page (accessible via course navigation)
|
2012-08-21 14:33:07 -07:00 |
|
Arjun Singh
|
02ecfb4730
|
Adding comments about removing the syllabus tab ASAP.
|
2012-08-21 13:25:29 -07:00 |
|
Kyle Fiedler
|
3273de93fe
|
make tutorial headers normal size
|
2012-08-21 16:01:48 -04:00 |
|
Arjun Singh
|
99703761b0
|
Merge master
|
2012-08-21 12:01:09 -07:00 |
|
Calen Pennington
|
9f23e4378e
|
Merge remote-tracking branch 'origin/hotfix/1.0.4'
|
2012-08-21 14:56:35 -04:00 |
|
Tom Giannattasio
|
557975458c
|
Merge branch 'master' into feature/tomg/fall-design
|
2012-08-21 14:50:15 -04:00 |
|
Tom Giannattasio
|
ad5fcbe784
|
new header styles
|
2012-08-21 14:46:35 -04:00 |
|
Kyle Fiedler
|
f68a97a63f
|
Added changes to wiki 404 and fixed CMS Sass
|
2012-08-21 13:54:58 -04:00 |
|
Tom Giannattasio
|
4e6d7babcc
|
fixed wiki bugs; started sequence nav bugs
|
2012-08-21 12:51:33 -04:00 |
|
Tom Giannattasio
|
fafb443484
|
fixed wiki styles
|
2012-08-21 09:24:55 -04:00 |
|
Arjun Singh
|
1cfed46d06
|
Adding a syllabus page (accessible via course navigation)
|
2012-08-21 05:47:26 -07:00 |
|
Tom Giannattasio
|
ed1bac7629
|
fixed container padding and sidebar fades
|
2012-08-21 08:28:24 -04:00 |
|
Rocky Duan
|
07f818da5a
|
got reply working under backbone framework
|
2012-08-21 02:12:21 -07:00 |
|
Rocky Duan
|
9dedd532c4
|
some progress
|
2012-08-20 23:43:47 -07:00 |
|
Rocky Duan
|
17683c43d4
|
attempt to migrate more code
|
2012-08-20 22:24:58 -07:00 |
|
Rocky Duan
|
a905ac9e1d
|
updated backbone & single thread retrieval now working
|
2012-08-20 22:03:46 -07:00 |
|
Rocky Duan
|
d189a49ee5
|
continue working on backbone & got vote migrated and working
|
2012-08-20 17:32:36 -07:00 |
|
David Ormsbee
|
eb96497cff
|
Merge branch 'master' into feature/bk_forum_int
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/courseware/courseware.html
requirements.txt
|
2012-08-20 18:57:46 -04:00 |
|
Rocky Duan
|
0b3e9909a4
|
Merge branch 'master' into refactor
Conflicts:
lms/djangoapps/django_comment_client/tests.py
lms/static/coffee/src/discussion/content.coffee
requirements.txt
|
2012-08-20 15:35:31 -07:00 |
|
Rocky Duan
|
8684ae29b2
|
Merge branch 'master' of github.com:MITx/mitx into refactor
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/courseware/courseware.html
requirements.txt
|
2012-08-20 15:31:51 -07:00 |
|
Rocky Duan
|
dc599c469f
|
fixed test
|
2012-08-20 15:26:07 -07:00 |
|
Tom Giannattasio
|
88d514e28d
|
fixed merge conflict in extends
|
2012-08-20 18:15:09 -04:00 |
|
Tom Giannattasio
|
3ffcb2615f
|
fix merge conflicts
|
2012-08-20 18:07:32 -04:00 |
|
Tom Giannattasio
|
a1ff34571e
|
sequence nav changes were lost?! temporary fix
|
2012-08-20 18:01:57 -04:00 |
|
Tom Giannattasio
|
ee92ba0752
|
new sequence nav; new courseware sidebar; new textbook styling; fixed gradebook glitch
|
2012-08-20 17:56:51 -04:00 |
|
Tom Giannattasio
|
0f6c31b4bd
|
started courseware sidebar styling
|
2012-08-20 15:51:10 -04:00 |
|
Kyle Fiedler
|
20d9e6e86d
|
Made save buttons blue, finished remaining askbot bugs, and removed all instances of -red
|
2012-08-20 15:45:05 -04:00 |
|
Rocky Duan
|
348a7b6eb7
|
render time ago in front end
|
2012-08-20 12:04:25 -07:00 |
|
Rocky Duan
|
b4039fe89d
|
Merge branch 'feature/bk_forum_int' of github.com:MITx/mitx into feature/bk_forum_int
Conflicts:
requirements.txt
|
2012-08-20 11:41:19 -07:00 |
|
Tom Giannattasio
|
16190843e7
|
started reworking sidebar styles
|
2012-08-20 13:56:51 -04:00 |
|