Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

34 Commits

Author SHA1 Message Date
e0d
313eab90c3 add 2013-01-27 17:18:55 -05:00
David Ormsbee
eff5093cbf Force charset for application.sass to be UTF-8 2013-01-26 14:38:49 -05:00
Chris Dodge
22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4 
Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt
 2013-01-17 09:15:37 -05:00
Brian Wilson
32b2d1b97f Perform merge from master, including renumbering of migrations in common/djangoapps/student/migrations 2013-01-15 15:42:09 -05:00
Chris Dodge
3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2 
Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt
 2013-01-07 12:34:48 -05:00
Carlos Andrés Rocha
bd0a2f6630 Add content and assets for media kit 
[# 41872203]
 2013-01-03 13:28:45 -05:00
Brian Talbot
5119257f3e test center - fixed dashboard link font issue and started cleaning up markup in reg form - wip 2012-12-20 12:24:31 -05:00
Tom Giannattasio
51a19b3d7e transferred edge styles from cms to lms 2012-10-11 14:02:13 -04:00
Brittany Cheng
ae89aac6ce Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-08-01 18:07:52 -04:00
Kyle Fiedler
6c3ec99f9e Start to change to ems and remove all of cream 2012-08-01 17:36:10 -04:00
Rocky Duan
9f1353b027 removed nonexisted scss links 2012-07-25 20:42:27 -04:00
Rocky Duan
52c7136493 Merge branch 'lol' 
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/djangoapps/django_comment_client/utils.py
	lms/lib/comment_client.py
	lms/lib/datehelper
	lms/static/sass/application.scss
	lms/templates/discussion/index.html
	lms/templates/news.html
 2012-07-25 18:41:24 -04:00
Rocky Duan
048deaa87f show news & options when submit comment 2012-07-25 18:16:57 -04:00
Rocky Duan
d393481b21 some basic functionalities of discussion 2012-07-25 18:11:00 -04:00
Rocky Duan
54ea3dba22 show news & options when submit comment 2012-07-25 15:30:05 -04:00
Kyle Fiedler
6aac776a33 Added styles for help page 2012-07-23 18:40:58 -04:00
Kyle Fiedler
e6465e420a Changed around the css 2012-07-23 12:38:21 -04:00
Rocky Duan
3d43ba81ce some basic functionalities of discussion 2012-07-20 12:19:20 -04:00
Kyle Fiedler
2eba466d62 Added style for 404 and other error pages 2012-07-19 12:12:06 -04:00
Galen Frechette
72f772d6ff adds styles to reset password page 2012-07-18 10:56:59 -04:00
Galen Frechette
767469381b renames some scss files for better orginization, sets fixed widths on main containers to avoid akward scaling issues untill media queries can be added for more responsive scaling 2012-07-16 22:23:43 -04:00
Galen Frechette
600aff59a6 imporves course object header typography 2012-07-16 19:29:02 -04:00
Galen Frechette
96361c3fd5 adds icons to course about page, user nav and dashboard, adds styles to activation pages 2012-07-16 17:29:28 -04:00
Calen Pennington
8ef8162963 Fix courseware problem display 2012-07-16 11:41:51 -04:00
Galen Frechette
15b544c50b makes logo bigger, imporves footer layout with additin of new links 2012-07-15 23:11:16 -04:00
Galen Frechette
8a5e3bf4d2 adds pressrelease page, breaks about content into seperate pages, imporvoves some visual elements of about and jobs pages 2012-07-13 13:56:14 -04:00
Galen Frechette
d8d3eb144c type tweeks in modals 2012-07-10 19:59:51 -04:00
Galen Frechette
733bb455f0 minor fixes to dashboard and typography, adds layout to jobs page 2012-07-03 18:25:51 -04:00
Galen Frechette
38425e9b9c adds styles back to courseware 2012-06-27 15:55:22 -04:00
Galen Frechette
1d7b30159b adds signup modal 2012-06-25 13:53:10 -04:00
Galen Frechette
ec1510ca52 adds login modal 2012-06-20 16:20:31 -04:00
Galen Frechette
94886643b0 gets app completly uptodate with prototype 2012-06-20 14:37:37 -04:00
Matthew Mongeau
47126dc686 wip 2012-06-13 14:50:25 -04:00
Calen Pennington
5ba03130aa Moving LMS code into subdirectory 2012-06-06 14:09:01 -04:00