Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

2939 Commits

Author SHA1 Message Date
Kyle Fiedler
773055cf54 fix wiki falsh message 2012-08-23 10:28:31 -04:00
Tom Giannattasio
2c1571d66c applied line height to course content wrapper to avoid strange line heights with improper markup 2012-08-23 10:04:00 -04:00
Tom Giannattasio
cf2f5d2af2 Merge branch 'master' into feature/tomg/fall-design 2012-08-23 08:24:58 -04:00
Tom Giannattasio
163eb9d49f fixed bottom sequence nav buttons and firefox outling bug 2012-08-23 08:24:54 -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
Tom Giannattasio
bc005e5f46 adjusted dashboard sidebar to accommodate long emails 2012-08-23 07:29:35 -04:00
Rocky Duan
2b6a0928ca fixed loading for discussion module 2012-08-23 01:55:31 -07:00
Rocky Duan
abe12ddd7c display loading status 2012-08-23 01:47:47 -07:00
Arjun Singh
1c9029c163 cs188 styling 2012-08-22 22:57:14 -07: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
908a5c5d59 Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-22 14:11:44 -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
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
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
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
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
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
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