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

814 Commits

Author SHA1 Message Date
Calen Pennington
d8f8d8c656 Merge branch 'release/1.0' 
Conflicts:
	common/djangoapps/student/views.py
	lms/djangoapps/courseware/courses.py
 2012-07-24 08:52:50 -04:00
David Ormsbee
8613555ccf Merge pull request #272 from MITx/release_fixes 
Removed copyright page, until it can be updated for edX.
 2012-07-23 11:52:51 -07:00
Bridger Maxwell
458abbad9f Removed copyright page, until it can be updated for edX. 2012-07-23 14:48:19 -04:00
Calen Pennington
ebe67d2d7d Merge remote-tracking branch 'origin/release/1.0' 
Conflicts:
	common/djangoapps/student/views.py
 2012-07-23 13:55:20 -04:00
Bridger Maxwell
a0990b6bb5 Added redirect from pressrelease to press/uc-berkeley-joins-edx 2012-07-23 13:46:19 -04:00
Bridger Maxwell
863071c9a5 Merge remote-tracking branch 'origin/release/1.0' into uc_berkeley_press 
Conflicts:
	lms/urls.py
 2012-07-23 13:44:04 -04:00
Bridger Maxwell
0cac360225 Added a favicon. 2012-07-22 18:49:10 -04:00
Bridger Maxwell
ed10dc43d9 Added UC Berkeley press release. Moved press releases to their own folder. 2012-07-22 17:35:10 -04:00
Bridger Maxwell
2f4aba8042 If a user is anonymous when they click the enroll button, they will automatically be enrolled in the course if they immediately log in our create an account. 2012-07-21 17:52:28 -04:00
Bridger Maxwell
660d11dc16 Merge remote-tracking branch 'origin/release/1.0' into unenroll 
Conflicts:
	lms/urls.py
 2012-07-21 12:49:27 -04:00
Bridger Maxwell
186e5fc5e1 Cleaned up the urls file a bit, to remove urls that don't work. Also removed some unused stuff from static_template_views. 2012-07-20 15:56:48 -04:00
Bridger Maxwell
36373bb457 Added an unenroll link (and confirmation) to the dashboard. Enrolling is now a POST of a form. 2012-07-20 12:21:35 -04:00
Calen Pennington
49ee12963f Merge pull request #185 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-07-19 06:29:48 -07:00
David Ormsbee
9ec8c9934e Merge pull request #209 from MITx/dormsbee/uni_profile 
Dormsbee/uni profile
 2012-07-18 13:39:43 -07:00
bridger
c5d23b27ee Removed out of date comment. 2012-07-18 17:32:30 -03:00
David Ormsbee
16eeb43a04 Add University Profile page with images and text blurbs 2012-07-18 16:17:12 -04:00
Bridger Maxwell
0fab4cdd93 Added a method to render 404 and 500 pages. Added a reference to these views in urls.py. 2012-07-18 14:55:12 -04:00
Bridger Maxwell
e4a3b261d4 Moved enroll and course_about to courseware, because they depend on lms. 2012-07-17 17:09:20 -04:00
Matthew Mongeau
9c672f7bd0 Hook up forms for forgot password functionality. 2012-07-17 16:27:30 -04:00
Bridger Maxwell
2f4cf23b73 Merge remote-tracking branch 'origin/master' into course_start 
Conflicts:
	common/djangoapps/student/views.py
 2012-07-17 12:53:27 -04:00
Bridger Maxwell
615f11e27b Merge remote-tracking branch 'origin/master' into template_caching 2012-07-17 12:47:53 -04:00
kimth
803b0c4fd0 Callback uses userid rather than username 2012-07-17 10:59:27 -04:00
David Ormsbee
e8516c5a3e Shorten course about link 2012-07-17 08:22:15 -04:00
Bridger Maxwell
70e2f7c0d5 Merged with master. Moved a bunch of static template files to their own urls (without /t/template). 2012-07-16 15:32:22 -04:00
Bridger Maxwell
4f4e751321 Merge 2012-07-16 12:42:49 -04:00
Calen Pennington
fabe1d41d1 Merge pull request #180 from MITx/kimth/lms-coderesponse 
CodeResponse for external/queued grading of student code
 2012-07-16 07:55:54 -07:00
Bridger Maxwell
eb7ae3540c Added a simple, specific cache for the static_template_pages. 2012-07-16 09:12:50 -04:00
Bridger Maxwell
cd2eacc675 Moved static template views to one folder. Removed the stub view functions from student and used static_template_views instead. 2012-07-13 17:42:23 -04:00
kimth
6d3516a754 CodeResponse for queued code checking 2012-07-13 13:45:38 -04:00
Bridger Maxwell
60da23042f Adding a setting to disable the wiki in deployment. 2012-07-13 13:36:38 -04:00
Victor Shnayder
924a911139 formatting fixes and note about bug 
* don't know what the intended fix is
 2012-07-13 11:51:32 -04:00
Bridger Maxwell
ecc50314f7 Added a decorator that prevents access to course pages until the course has started. 2012-07-13 10:31:36 -04:00
Bridger Maxwell
5bf6c73259 Merge with master. 2012-07-11 15:26:26 -04:00
Galen Frechette
5484cfd08e adds links to university profile page 2012-07-10 19:59:50 -04:00
Bridger Maxwell
08f5fe7fc9 Fixed wiki urls for new course ids. 2012-07-09 15:53:50 -04:00
Bridger Maxwell
631cc8e874 Merge branch 'dormsbee/multicourse' into multicourse_wiki 2012-07-09 14:28:43 -04:00
Matthew Mongeau
c47cdc7f87 Fix some path problems. 2012-07-09 14:06:44 -04:00
Matthew Mongeau
949efb62e9 Got courses page working... mostly. 2012-07-09 11:27:45 -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
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
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
072de594ff Fixed wiki error pages a bit. 2012-07-05 08:14:41 -07:00
Bridger Maxwell
064274a756 Most of the wiki pages are now loading without errors. 2012-07-03 09:50:58 -07:00
Bridger Maxwell
baa2c06803 Got history and view revision working on wiki. 2012-06-29 20:53:36 -04:00
Calen Pennington
3fdae56a27 Remove dead code 2012-06-29 12:45:18 -04:00
Calen Pennington
2011861444 Get capa problems to display from a keystore 2012-06-29 12:42:48 -04:00
Bridger Maxwell
0c4b6f3065 Merge branch 'dormsbee/multicourse' into multicourse_wiki 2012-06-29 12:18:30 -04:00