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

58450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Prem Sichanugrist
289599733d Make it more obvious that the function is no-op 2012-07-06 11:33:00 -04:00
Prem Sichanugrist
f71e54cc9b Removed unused Week Model 2012-07-06 11:28:02 -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
ichuang
74e01bb07a fixed two bugs in inputtypes: textline with quotes crashed problems, and 
choice without text caused error
 2012-07-06 09:49:08 -04:00
Prem Sichanugrist
2a36fee493 Prevent default click event on links 2012-07-06 00:38:26 -04:00
Prem Sichanugrist
95cf25c1dc Fix quote convention in tests 2012-07-06 00:35:00 -04:00
Prem Sichanugrist
9ba624683d Update Views.ModuleEdit, also added test 2012-07-06 00:32:50 -04:00
Prem Sichanugrist
dd3ddeb946 CMS.Views.Week is tested 2012-07-06 00:05:08 -04:00
Prem Sichanugrist
b11b916906 CMS.Views.Course fixed and tested 2012-07-05 23:40:40 -04:00
Prem Sichanugrist
a77e7fe57b Update jasmine-jquery for newer features 2012-07-05 23:31:36 -04:00
Prem Sichanugrist
4d4a856c4b CMS.Views.Module tested 2012-07-05 22:51:08 -04:00
Prem Sichanugrist
4d29c311c7 CMS.Views.WeekEdit tested 2012-07-05 22:50:23 -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
Prem Sichanugrist
8979b993ef Add blank spec for CMS.Models.Week 2012-07-05 21:33:19 -04:00
Prem Sichanugrist
fe17c37783 CMS.Models.Module tested 2012-07-05 21:31:32 -04:00
Bridger Maxwell
ac0a776818 First pass at getting both independent and in-course wiki viewing. 2012-07-05 21:20:35 -04:00
Prem Sichanugrist
68bb8d5874 Patch window.it to raise error on pending tests 2012-07-05 21:08:09 -04:00
Prem Sichanugrist
d6c033d675 main.coffee/CMS module tested 2012-07-05 19:42:10 -04:00
Prem Sichanugrist
f60af340ea Add Jasmine suite to CMS 2012-07-05 18:44:56 -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
Prem Sichanugrist
c94d6d1602 No need to append text key on HTML module save 2012-07-05 17:22:18 -04:00
Prem Sichanugrist
a86c84a4c5 Use Backbone's render convention instead 2012-07-05 17:21:27 -04:00
Matthew Mongeau
e729cc321a Fix url confusion for course/info and course/about 2012-07-05 17:10:52 -04:00
Prem Sichanugrist
9cb24ccc77 Remove unneeded trigger 2012-07-05 16:23:04 -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
Prem Sichanugrist
8cef4f4221 Pass in the model into the view when create it 2012-07-05 15:25:37 -04:00
Prem Sichanugrist
a9aa5d9ea0 Update code base on changes in master 2012-07-05 15:25:04 -04:00
Calen Pennington
dbd82c4bc8 Install numpy before trying to install scipy from requirements.txt 2012-07-05 13:07:54 -04:00
Calen Pennington
ce4cea0e3e Don't fail if no NOSE_COVER_HTML_DIR is set 2012-07-05 13:07:29 -04:00
Calen Pennington
e9ee1566d6 Modularize capa and mitxmako so that xmodule can properly depend on them 2012-07-05 12:48:18 -04:00
Calen Pennington
386acbe1ff Add tests of the github_sync service hook view 2012-07-05 12:15:49 -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
Calen Pennington
ab851c0b1a Add tests for the core github_sync functionality 2012-07-05 11:54:43 -04:00
Bridger Maxwell
072de594ff Fixed wiki error pages a bit. 2012-07-05 08:14:41 -07:00
Calen Pennington
83da714a50 Add more docstring to import_from_github 2012-07-05 10:30:04 -04:00
Kyle Fiedler
82c68dd845 Removed table borders and declared inputs as inline instead of inline-block 2012-07-05 10:01:02 -04:00
Prem Sichanugrist
b533ab481a Remove old JavaScript files 2012-07-05 09:38:51 -04:00
Prem Sichanugrist
29e69db0dc Implement HTML module save 2012-07-05 09:38:51 -04:00
Prem Sichanugrist
0f60459709 Add @expect_json to help with parsing JSON request 2012-07-05 09:38:51 -04:00
Prem Sichanugrist
5c85412dfa Nested subview is working 2012-07-05 09:38:51 -04:00
Prem Sichanugrist
8a91616aab Implement viewStack to support nested view 2012-07-05 09:38:51 -04:00
Prem Sichanugrist
a7dc045f36 External module loading 2012-07-05 09:38:50 -04:00
Prem Sichanugrist
7c044aa18a Correctly hide the content when cancel 2012-07-05 09:38:50 -04:00
Prem Sichanugrist
b46f6a6d9c Section editing interface is now working 2012-07-05 09:38:50 -04:00
Prem Sichanugrist
0e87ada0fd Do nested search for CoffeeScript compilation 2012-07-05 09:38:50 -04:00
Prem Sichanugrist
21734eb919 Add Backbone to the project 2012-07-05 09:38:50 -04:00
Calen Pennington
87e612f0f2 Don't swallow messages going to the root logger 2012-07-05 08:48:08 -04:00
ichuang
a5f3d8a900 fix handling of tail in inputtypes.math (needed saxutils.escape) 2012-07-04 16:06:07 -04:00
ichuang
edeb81ce63 change 8.01x default chapter 2012-07-04 15:50:39 -04:00