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

57 Commits

Author SHA1 Message Date
Tom Giannattasio
e762844c35 new sequence nav functionality - accommodates an infinite number of items 2012-08-21 18:12:59 -04:00
Rocky Duan
348a7b6eb7 render time ago in front end 2012-08-20 12:04:25 -07:00
Rocky Duan
6164c87074 Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-19 10:08:00 -07:00
Rocky Duan
028bd23c1c Merge branch 'master' of github.com:MITx/mitx into profile 
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-18 16:57:00 -07:00
Bridger Maxwell
b05bace12a Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 
Conflicts:
	lms/templates/wiki/base.html
 2012-08-17 14:48:06 -04:00
Bridger Maxwell
8595cb24b2 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 
Conflicts:
	lms/templates/wiki/base.html
 2012-08-17 14:44:25 -04:00
Bridger Maxwell
6b716c2883 Put in CodeMirror editor with inline circuits. 2012-08-17 14:32:29 -04:00
Tom Giannattasio
f67a356466 added additional bootstrap js files 2012-08-17 14:14:07 -04:00
Tom Giannattasio
ad45a44a7c added bootstrap js and other dependencies; tweaked settings template 2012-08-17 09:37:42 -04:00
Bridger Maxwell
48e9dc8031 Added bootstrap-modal for the wiki preview modals. 2012-08-15 20:07:05 -04:00
Rocky Duan
449d665b00 Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-14 17:48:08 -07:00
Tom Giannattasio
dd92f51f02 added fluid widths 2012-08-14 16:09:32 -04:00
Tom Giannattasio
d673895eaa added drag functionality 2012-08-14 16:09:32 -04:00
Tom Giannattasio
defa5b3159 basic gradebook template built; basic scroll functionality built 2012-08-14 16:09:32 -04:00
Rocky Duan
49e840d62b adjust new post button in forum view 2012-08-14 12:43:15 -07:00
Rocky Duan
79497287d7 moved some stuff & ajax link to page 2012-08-03 15:55:21 -04:00
Kyle Fiedler
2bbb19790d Fixed jquery ui image problem and added a base style sheet for lms to override fonts 2012-07-31 11:06:39 -04:00
Kyle Fiedler
c611bd9228 added treeview 2012-07-30 17:39:44 -04:00
Calen Pennington
87ce82570d Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware 2012-07-24 16:14:03 -04:00
Calen Pennington
1924609b10 Move schematic.js into capa_module js includes 2012-07-24 16:14:02 -04:00
Calen Pennington
6ea5f6a493 Move imageinput.js to capa_module js includes 2012-07-24 16:14:02 -04:00
Calen Pennington
3fa636e060 Move module javascript into common/lib/xmodule. Still TODO: run jasmine tests in that directory 2012-07-24 16:13:59 -04:00
Calen Pennington
6bcc78f767 Make lms jasmine tests mostly pass 2012-07-24 16:13:59 -04:00
Bridger Maxwell
1e1e777e04 Fixed bugs caused by modal cloning. Now, only video modals are cloned. 2012-07-23 19:19:27 -04:00
Matthew Mongeau
6962735b19 Clone and remove modal 2012-07-23 16:35:19 -04:00
Matthew Mongeau
315063ffed Add rel=0 to all lightbox videos. 2012-07-23 12:09:09 -04:00
Bridger Maxwell
61105134aa Cleaned up activation pages. Added "Log In" link to notice when anonymous user tries to enroll in course. 2012-07-22 14:52:49 -04:00
Matthew Mongeau
0cfd915161 Link faq to be able to sign up from corresponding question. 2012-07-19 16:41:24 -04:00
Matthew Mongeau
7d3c778268 Force dataType to 'text json' 2012-07-18 11:36:20 -04:00
Matthew Mongeau
9bf4b11ae9 Style notice. 2012-07-18 10:11:06 -04:00
Matthew Mongeau
c5d3efdf60 Show sign up form if not signed in. 2012-07-18 10:10:37 -04:00
Matthew Mongeau
9c672f7bd0 Hook up forms for forgot password functionality. 2012-07-17 16:27:30 -04:00
Galen Frechette
1c027c43d2 hooks up links from login modal to signup modal and signup modal to login modal 2012-07-16 10:27:55 -04:00
Galen Frechette
b833f52d9c adds autoplaying to modal videos when opened, stops video playback when modal closes 2012-07-13 13:57:50 -04:00
Galen Frechette
cd345ae3bb converts modals to use jquery leanModal 2012-07-13 13:57:50 -04:00
bridger
28007b280c Merge pull request #168 from MITx/multicourse_wiki 
Multicourse wiki
 2012-07-12 07:35:17 -07:00
Bridger Maxwell
5bf6c73259 Merge with master. 2012-07-11 15:26:26 -04:00
John Jarvis
a21d37e23b adding html5shiv.js to static/js 2012-07-11 15:26:18 -04:00
Galen Frechette
1be9196d3c wip header, wip header refactoring, improves course object visual design, improves footer 2012-07-10 19:59:50 -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
Bridger Maxwell
631cc8e874 Merge branch 'dormsbee/multicourse' into multicourse_wiki 2012-07-09 14:28:43 -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
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
Galen Frechette
4359a2544e wip course info/profile page 2012-07-02 14:23:14 -04:00
Galen Frechette
e0f01aa828 cleans up course info/profile page 2012-07-02 14:11:25 -04:00
Matthew Mongeau
cddf4cf6cf Wip on sign up form. 2012-06-28 15:38:39 -04:00
Galen Frechette
1d7b30159b adds signup modal 2012-06-25 13:53:10 -04:00
Prem Sichanugrist
3e2031cd43 Update jQuery and jQuery-UI to latest version 2012-06-21 11:05:30 -04:00