Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

4005 Commits

Author SHA1 Message Date
Calen Pennington
6dd141247d Fixing github_sync to work with multiple course data directories 2012-07-10 14:58:27 -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
6d246f0685 Merge remote-tracking branch 'origin/master' into ps-cms-backbone 
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/coffee/unit.coffee
	cms/templates/index.html
	cms/templates/widgets/sequence-edit.html
 2012-07-10 08:55:45 -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
Kyle Fiedler
6f40b46415 Fixed overflow and fixed hover on new module 2012-07-09 12:02:38 -04:00
Kyle Fiedler
8a4d860a1e put normalize in vendor folder 2012-07-09 11:26:46 -04:00
Kyle Fiedler
389fd7111a Get rid of comments 2012-07-09 11:08:07 -04:00
Kyle Fiedler
93f8f7685a Added more wip and fixed issue with after 2012-07-09 10:37:37 -04:00
Kyle Fiedler
19bd613f6d Readd the wip class 2012-07-09 10:25:52 -04:00
Kyle Fiedler
dbcad03ddd Added some fixes for some small things adn reset the js 2012-07-09 10:22:55 -04:00
Kyle Fiedler
c8da987436 Added new icons for all of the content 2012-07-09 10:04:20 -04:00
Kyle Fiedler
0cb4781e43 Rearranged the filter and sort bar and made it consistant 2012-07-09 10:04:20 -04:00
Kyle Fiedler
cb2a6f9d02 Played with the layout a bit and some other small changes 2012-07-09 10:04:20 -04:00
Kyle Fiedler
7aad8f04bb Added better styles for draggable 2012-07-09 10:04:20 -04:00
Kyle Fiedler
4b43e3474f More tweeks for visual style for the filter bar and settings 2012-07-09 10:04:20 -04:00
Kyle Fiedler
f1623ec605 Added more tweeks to the calendar and unit pages 2012-07-09 10:04:20 -04:00
Kyle Fiedler
94fccb0017 Added fixes for the sidebar, made better base style for inputs and brightened colors a bit 2012-07-09 10:04:19 -04:00
Kyle Fiedler
985a5323f4 Added some hovers fo the caledar 2012-07-09 10:04:19 -04:00
Prem Sichanugrist
58fc2000c7 Use static.url for static assets 2012-07-06 12:13:32 -04:00
Prem Sichanugrist
9dc5cddeb7 Move vendored js files into js/vendor/ 2012-07-06 12:07:21 -04:00
Prem Sichanugrist
07aae06d30 Remove unnecessary fat arrow 2012-07-06 11:52:10 -04:00
Prem Sichanugrist
b8fd728e06 Pass in element in CMS.start() instead 2012-07-06 11:33:37 -04:00
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
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
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
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
Prem Sichanugrist
a86c84a4c5 Use Backbone's render convention instead 2012-07-05 17:21:27 -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
386acbe1ff Add tests of the github_sync service hook view 2012-07-05 12:15:49 -04:00
Calen Pennington
ab851c0b1a Add tests for the core github_sync functionality 2012-07-05 11:54:43 -04:00
Calen Pennington
83da714a50 Add more docstring to import_from_github 2012-07-05 10:30:04 -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
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