Calen Pennington
6dd141247d
Fixing github_sync to work with multiple course data directories
2012-07-10 14:58:27 -04:00
David Ormsbee
2f90b27707
Only load DATA_DIR subdirs if DATA_DIR exists (so not during tests)
2012-07-10 13:56:51 -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
Calen Pennington
da360b1d56
Allow for a user to enroll in multiple courses
2012-07-10 13:11:57 -04:00
Calen Pennington
c4ebfe1bd4
Actually add the schematic.js file used in the main.html template
2012-07-10 12:58:25 -04:00
Calen Pennington
5406b9bb40
Make /static/ urls work in the courseware
2012-07-10 12:54:47 -04:00
Calen Pennington
dbfcd78c88
Get custom_tag templates using system.filestore so that they work in multicourse
2012-07-10 10:46:18 -04:00
Calen Pennington
239c5ef172
Require login for enrollment
2012-07-10 10:19:15 -04:00
Calen Pennington
fe2f0347b0
Fix typo
2012-07-10 10:15:57 -04:00
Calen Pennington
cfd6890d68
Merge remote-tracking branch 'origin/master' into cpennington/cms-github
...
Conflicts:
common/lib/xmodule/xmodule/xml_module.py
2012-07-10 08:50:54 -04:00
kimth
024789dabf
Made data identifiers consistent with master branch of 'content-mit-6002x'
2012-07-09 19:01:25 -04:00
Matthew Mongeau
cfa389e357
Change url to use args instead of kwargs.
2012-07-09 18:33:51 -04:00
Matthew Mongeau
1fcc02579d
Pass a course to get_section
2012-07-09 17:49:49 -04:00
Bridger Maxwell
640a71bb21
Merge branch 'dormsbee/multicourse' into multicourse_wiki
2012-07-09 15:54:50 -04:00
Bridger Maxwell
08f5fe7fc9
Fixed wiki urls for new course ids.
2012-07-09 15:53:50 -04:00
Matthew Mongeau
51c65e214a
Get initial courseware page displaying.
2012-07-09 15:01:10 -04:00
Bridger Maxwell
631cc8e874
Merge branch 'dormsbee/multicourse' into multicourse_wiki
2012-07-09 14:28:43 -04:00
Matthew Mongeau
fe5fa7334b
Get textbook page rendering.
2012-07-09 14:23:45 -04:00
Matthew Mongeau
43e6bbb29f
Added info page content
2012-07-09 14:16:17 -04:00
Matthew Mongeau
c47cdc7f87
Fix some path problems.
2012-07-09 14:06:44 -04:00
Matthew Mongeau
3053caec7e
Get course about page working.
2012-07-09 13:48:18 -04:00
Matthew Mongeau
949efb62e9
Got courses page working... mostly.
2012-07-09 11:27:45 -04:00
ichuang
5ee2980708
Merge branch 'kf-inline-inputs' of github.com:MITx/mitx into ichuang/stable_edx4edx_merge
2012-07-08 22:26:58 -04:00
ichuang
3a664753b4
minor changes - test this branch with more courses (8.01x, 6.00x)
2012-07-08 22:05:21 -04:00
ichuang
0daf7b0497
merging of stable-edx4edx into master - bugfixes and debugging
2012-07-08 19:03:29 -04:00
ichuang
4356ec5c45
default course to settings.COURSE_DEFAULT
2012-07-08 17:00:08 -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
Bridger Maxwell
291ec2cfc6
Allowing dots in wiki namespaces.
2012-07-06 17:49:26 -04:00
Bridger Maxwell
4d349fbd9d
Fixed wiki error page again.
2012-07-06 17:42:01 -04:00
Matthew Mongeau
5109253378
Revert "workarounds for get_about_section"
...
This reverts commit 05e1bcf4f1
2012-07-06 17:23:56 -04:00
Matthew Mongeau
05e1bcf4f1
workarounds for get_about_section
2012-07-06 17:13:53 -04:00
Bridger Maxwell
c0bba714a7
Added a migration to unique article slugs.
2012-07-06 16:17:15 -04:00
Bridger Maxwell
5489819fc7
Started writing slug uniquifying data migration. Doesn't work yet.
2012-07-06 16:10:12 -04:00
Bridger Maxwell
6d7b477982
Fixed wiki revision feed.
2012-07-06 12:55:05 -04:00
Matthew Mongeau
7979248b4a
Courses on homepage and courses page should iterate over the context courses.
2012-07-06 10:57:30 -04:00
Calen Pennington
a1f98e76cd
WIP: Merging multicourse and xmodule descriptor changes
...
The basic form has been fleshed out. Things still to do:
1) Extend get_course interface to the rest of modulestore
2) Make courses actually load
3) Make org/course/maybe others metadata attributes for course_module (see xml_module), so
that they are loaded/saved on import/export to xml
2012-07-05 21:56:52 -04:00
Bridger Maxwell
ac0a776818
First pass at getting both independent and in-course wiki viewing.
2012-07-05 21:20:35 -04:00
Galen Frechette
42c1695382
refines some visual design to course objects, changes university logos on homepage, starts adding about pages and layout
2012-07-05 17:59:22 -04:00
Matthew Mongeau
e729cc321a
Fix url confusion for course/info and course/about
2012-07-05 17:10:52 -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
Calen Pennington
ce4cea0e3e
Don't fail if no NOSE_COVER_HTML_DIR is set
2012-07-05 13:07:29 -04:00
Bridger Maxwell
953cab047a
Added check that namespace for a new course is created.
2012-07-05 08:55:35 -07:00
Bridger Maxwell
6f250fc0d3
Added unique and index on namespace model.
2012-07-05 08:55:03 -07:00
Bridger Maxwell
072de594ff
Fixed wiki error pages a bit.
2012-07-05 08:14:41 -07:00
Kyle Fiedler
82c68dd845
Removed table borders and declared inputs as inline instead of inline-block
2012-07-05 10:01:02 -04:00
Calen Pennington
87e612f0f2
Don't swallow messages going to the root logger
2012-07-05 08:48:08 -04:00
ichuang
edeb81ce63
change 8.01x default chapter
2012-07-04 15:50:39 -04:00
Galen Frechette
733bb455f0
minor fixes to dashboard and typography, adds layout to jobs page
2012-07-03 18:25:51 -04:00
ichuang
1f29403ace
typo in loncapa_check
2012-07-03 17:06:39 -04:00
ichuang
105f429d61
fix bug in loncapa_check
2012-07-03 16:42:08 -04:00
