Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,802 Commits 1 Branch 0 Tags
640a71bb217b3e38e4e981e5d385d85cbd7a9db7
Commit Graph

2802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bridger Maxwell
640a71bb21 Merge branch 'dormsbee/multicourse' into multicourse_wiki 2012-07-09 15:54:50 -04:00
Bridger Maxwell
4aacace056 Fixed exception type when about or info section missing. 2012-07-09 15:54:36 -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
Matthew Mongeau
be3539f1b2 Use CourseDescriptor instead of HiddenDescriptor. 2012-07-08 14:46:05 -04:00
Matthew Mongeau
213d64c159 Append courses 2012-07-06 18:43:30 -04:00
Matthew Mongeau
83fdeea2bc Hookup the CourseDescriptor stuff by fixing a fewt push -f dorm issues. 2012-07-06 18:23:22 -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
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
Calen Pennington
87e612f0f2 Don't swallow messages going to the root logger 2012-07-05 08:48:08 -04:00
Galen Frechette
733bb455f0 minor fixes to dashboard and typography, adds layout to jobs page 2012-07-03 18:25:51 -04:00
Kyle Fiedler
841fb8da0b Added the wip calss back in 2012-07-03 16:26:56 -04:00
Kyle Fiedler
ffea8e3e7d added more style for unit page, hovers, and buttons 2012-07-03 16:19:19 -04:00
Kyle Fiedler
20df117bfc Added style for the calendar view and section view 2012-07-03 16:19:19 -04:00
Kyle Fiedler
3415e48be5 Added bug fix for speed selector 2012-07-03 16:03:29 -04:00
Bridger Maxwell
c6d973bda9 Fixed the markdown extensions to work with wiki namespaces. 2012-07-03 12:40:39 -07:00
Matthew Mongeau
38239c73ab Hook enroll back up. 2012-07-03 15:10:26 -04:00
Prem Sichanugrist
28cc64b9b1 Remove unused lms/problem.js 2012-07-03 15:00:41 -04:00
Prem Sichanugrist
cec1b23d7d Remove mystery guest from the test 2012-07-03 14:53:57 -04:00
Prem Sichanugrist
0815f3498a Cleanup Video Logger, update logging message 2012-07-03 14:35:40 -04:00
Prem Sichanugrist
8fb06ce194 Update code according to changes in 829e502 2012-07-03 14:33:24 -04:00
Prem Sichanugrist
de4d487402 Fix failing tests after jQuery upgrade 2012-07-03 14:33:23 -04:00
Prem Sichanugrist
e7e0fe1f3d Fix element naming convention 2012-07-03 14:33:23 -04:00
Prem Sichanugrist
4e183dd6e1 Clean up events binding in Video Player 
* Video Player now acting as a parent that always knowing the state of
  their children.
* Events on the sub-controls are now triggered on itself, and binded by
  the Video Player instead of triggering everything on the Video Player.
* A new helper class, SubView, has been introduced to cleanup repeat
  logic on scoped jQuery selector, render() and bind()
 2012-07-03 14:33:23 -04:00
Calen Pennington
207777fbe1 Fix up problem display to use the new metadata that's available 2012-07-03 14:20:11 -04:00
Calen Pennington
42cef5b788 Get rid of references to self.filename in capa_module, as it no longer exists 2012-07-03 14:19:51 -04:00
Bridger Maxwell
e122583440 Merge branch 'dormsbee/multicourse' into multicourse_wiki 2012-07-03 09:59:37 -07:00
Bridger Maxwell
064274a756 Most of the wiki pages are now loading without errors. 2012-07-03 09:50:58 -07:00
Matthew Mongeau
3ae48d19b4 Passes course around for courseware. Fix static assets. 2012-07-03 12:13:15 -04:00
Calen Pennington
68c155b268 Don't use __dict__ for namedtuples, because it doesn't work in python 2.7.1 2012-07-03 09:57:51 -04:00