thomasxiii
|
258b9eb530
|
Merge pull request #349 from MITx/feature/kfiedler/courseware-style
A bunch of various fixes and de-styling
|
2012-08-07 10:20:10 -07:00 |
|
Kyle Fiedler
|
dd6ec19e80
|
Make the modal window work in the courseware
|
2012-08-07 11:59:49 -04:00 |
|
Bridger Maxwell
|
873f1431ec
|
Put back dynamic grade cutoffs and final grade rounding (from stable-end-of-course)
|
2012-08-06 18:51:11 -04:00 |
|
Kyle Fiedler
|
e90103abdf
|
Reset styles for profile page and some for the info page
|
2012-08-06 16:08:41 -04:00 |
|
Victor Shnayder
|
987b9c11a9
|
Use url_name for chapters and sections in lms views
* got rid of the hackish conversions between ' ' and '_'
* use url_name and display_name where appropriate
* update templates to match.
|
2012-08-02 14:28:44 -04:00 |
|
Bridger Maxwell
|
ae3da772d0
|
Got profile page working again. The grader for each course is now defined in the data dir as grading_policy.json.
|
2012-08-01 11:27:04 -04:00 |
|
Kyle Fiedler
|
18dc689d4d
|
Added fix for where the course.css is being brought in
|
2012-07-25 14:57:44 -04:00 |
|
Calen Pennington
|
d2d29b2cf9
|
Move most javascript loading to below the body, rather than head
|
2012-07-23 11:27:22 -04:00 |
|
Kyle Fiedler
|
c7e43d98dc
|
Rearranged more images, made some smaller, made some slight changes to the design on the homepage and made all edX proper case
|
2012-07-20 11:18:39 -04:00 |
|
Matthew Mongeau
|
73df314159
|
wip
|
2012-07-18 13:40:16 -04:00 |
|
Calen Pennington
|
fdd9663699
|
Merge remote-tracking branch 'origin/master' into dormsbee/multicourse
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/modulestore/xml.py
lms/djangoapps/courseware/views.py
lms/templates/index.html
lms/templates/info.html
lms/templates/main.html
lms/templates/navigation.html
requirements.txt
|
2012-07-10 13:39:19 -04:00 |
|
ichuang
|
9b90068e03
|
Merge branch 'stable-edx4edx' of github.com:MITx/mitx
Conflicts:
common/lib/xmodule/seq_module.py
common/lib/xmodule/xmodule/capa_module.py
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
lms/djangoapps/multicourse/multicourse_settings.py
|
2012-07-08 16:52:36 -04:00 |
|
Calen Pennington
|
9d1dc37b44
|
Merge remote-tracking branch 'origin/master' into dormsbee/multicourse
Conflicts:
cms/djangoapps/contentstore/management/commands/import.py
cms/djangoapps/contentstore/views.py
cms/envs/common.py
cms/envs/dev.py
cms/envs/test.py
cms/static/sass/README.txt
cms/static/sass/_base.scss
cms/static/sass/_calendar.scss
cms/static/sass/base-style.scss
cms/templates/base.html
cms/templates/index.html
cms/templates/widgets/header.html
cms/templates/widgets/module-dropdown.html
cms/templates/widgets/navigation.html
cms/templates/widgets/problem-edit.html
cms/urls.py
common/djangoapps/pipeline_mako/__init__.py
common/djangoapps/util/views.py
common/lib/capa/capa_problem.py
common/lib/capa/templates/textinput_dynamath.html
common/lib/mitxmako/middleware.py
common/lib/mitxmako/shortcuts.py
common/lib/mitxmako/template.py
common/lib/xmodule/capa_module.py
common/lib/xmodule/seq_module.py
common/lib/xmodule/setup.py
common/lib/xmodule/test_files/symbolicresponse.xml
common/lib/xmodule/test_files/test_files/symbolicresponse.xml
common/lib/xmodule/tests/__init__.py
common/lib/xmodule/tests/test_files/symbolicresponse.xml
common/lib/xmodule/vertical_module.py
common/lib/xmodule/video_module.py
common/lib/xmodule/x_module.py
lms/djangoapps/courseware/content_parser.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
lms/static/coffee/spec/helper.coffee
lms/static/coffee/spec/modules/video/video_player_spec.coffee
lms/static/coffee/spec/modules/video/video_volume_control_spec.coffee
lms/static/coffee/src/modules/problem.coffee
lms/static/coffee/src/modules/sequence.coffee
lms/static/coffee/src/modules/video/video_player.coffee
lms/static/coffee/src/modules/video/video_volume_control.coffee
lms/static/js/vendor/jquery-1.6.2.min.js
lms/static/js/vendor/jquery-ui-1.8.16.custom.min.js
lms/static/sass/application.scss
lms/static/sass/courseware/_sequence-nav.scss
lms/static/sass/courseware/_video.scss
lms/templates/main.html
lms/urls.py
rakefile
requirements.txt
|
2012-07-05 16:22:50 -04:00 |
|
Matthew Mongeau
|
3ae48d19b4
|
Passes course around for courseware. Fix static assets.
|
2012-07-03 12:13:15 -04:00 |
|
Calen Pennington
|
f25478b3d4
|
Consolidate access to metadata, and allow some of it to be inherited between modules
|
2012-06-29 12:45:46 -04:00 |
|
ichuang
|
5688e89fab
|
change MITx -> edX in many lms templates
|
2012-06-28 10:26:59 -04:00 |
|
Calen Pennington
|
5ba03130aa
|
Moving LMS code into subdirectory
|
2012-06-06 14:09:01 -04:00 |
|