Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

355 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Tom Giannattasio
16190843e7 started reworking sidebar styles 2012-08-20 13:56:51 -04:00
Kyle Fiedler
ab28e08591 Added new button classes 2012-08-20 13:22:21 -04:00
Tom Giannattasio
e9e6b1828e new header styles 2012-08-20 10:41:34 -04:00
Tom Giannattasio
8b4b1fddb5 added new wrapper styles 2012-08-20 10:15:28 -04:00
Tom Giannattasio
3b02e6a1ee started new nav styles 2012-08-20 09:02:18 -04:00
Rocky Duan
6164c87074 Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-19 10:08:00 -07:00
Rocky Duan
028bd23c1c Merge branch 'master' of github.com:MITx/mitx into profile 
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-18 16:57:00 -07:00
Bridger Maxwell
1470045b74 Fixed wiki circuit editor modal to be a little better styled. 2012-08-17 21:44:56 -04:00
Bridger Maxwell
a4b97c5f10 Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 2012-08-17 21:44:05 -04:00
Kyle Fiedler
8473188fea Added new styles for sequence nav and reset some of the styles for inputs 2012-08-17 17:41:45 -04:00
Tom Giannattasio
a2d0ada82c styled settings page 2012-08-17 17:01:45 -04:00
Tom Giannattasio
1bd790fabb finished attachment styles 2012-08-17 16:46:40 -04:00
Tom Giannattasio
c253474297 added modal functionality for attachments page 2012-08-17 15:59:31 -04:00
Tom Giannattasio
e47f3ccf35 added CodeMirror styles for the circuit editor 2012-08-17 15:26:25 -04:00
Tom Giannattasio
63ba133fbb added Code Mirror styles 2012-08-17 15:10:24 -04:00
Tom Giannattasio
b5b5978130 started styling attachments page 2012-08-17 13:32:40 -04:00
Tom Giannattasio
ad45a44a7c added bootstrap js and other dependencies; tweaked settings template 2012-08-17 09:37:42 -04:00
Tom Giannattasio
b0b10aa598 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-16 17:35:56 -04:00
Bridger Maxwell
2de55d074b Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-16 17:34:38 -04:00
Tom Giannattasio
490eb7a32b styled changes, new article and delete pages 2012-08-16 17:31:05 -04:00