Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,893 Commits 1 Branch 0 Tags
01ac251c2bc55a92a4e01c74c8fee69c459eac9d
Commit Graph

87 Commits

Author SHA1 Message Date
Kyle Fiedler
b777d2c057 Added some more style for cal view and nav bar 2012-07-30 09:51:50 -04:00
Kyle Fiedler
d53e4bd38f Added more styles includeing the index page more color changes and header styles 2012-07-30 09:51:49 -04:00
Kyle Fiedler
9d638d2ac0 Added some more style for cal view and nav bar 2012-07-30 09:50:25 -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
61446b0544 Make javascript for video previews work correctly 2012-07-24 16:14:01 -04:00
Calen Pennington
5a9ba65571 Add youtube api to CMS for video module 2012-07-24 16:14:00 -04:00
Calen Pennington
230dd88afd Add global methods used by video module to CMS 2012-07-24 16:14:00 -04:00
Calen Pennington
2d570f7c54 Load preview modules when a cms edit page is opened 2012-07-24 16:14:00 -04:00
Calen Pennington
3cdceab16c Uniquify js fragments pulled from XModules, and load both XModuleDescriptor and XModule js into the cms 2012-07-24 16:13:59 -04:00
Calen Pennington
15ac476781 Display preview html on the module edit page. Javascript for previews doesn't yet function 2012-07-24 15:05:07 -04:00
Calen Pennington
57d8361acb Escape characters from raw xml data going into the text box so that the round-trip doesn't get rid of neccessary xml escaping 2012-07-24 15:05:06 -04:00
Calen Pennington
7a34a8c342 Fix failing tests 2012-07-23 13:49:11 -04:00
Calen Pennington
5915532a57 Consolidate code used for disabling USE_DJANGO_PIPELINE feature 2012-07-23 11:27:22 -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
Victor Shnayder
5609ca6e2b remove empty marketing template 2012-07-16 13:34:05 -04:00
Victor Shnayder
d10f49d74b add reg_complete template 2012-07-16 13:34:05 -04:00
Victor Shnayder
ddf84d807d add login and logout links to cms header 2012-07-16 13:34:04 -04:00
Victor Shnayder
5a766c085d Fix signup form link 2012-07-16 13:34:04 -04:00
Victor Shnayder
c176a7fe92 Add account creation and login to CMS 
* connect up views from student app
* Add initial @login_required decorators on the protected views
* Add tests for some of the basic functionality
 2012-07-16 13:34:04 -04:00
Victor Shnayder
339e9a68f4 Make end-to-end tests work again 
* NOTE: successfully running the tests depends on an updated version of
  django-pipeline, which fixes a unicode bug (efaba4ac63)

Config changes:
* Use separate db for the cms
* Run collectstatic before running tests--needed to get everything in the right place for loading pages
* fix some paths related to this
* Turn off JS compressor for CMS
* add empty test_root/uploads dir

Code changes:
* Add cms tests to check that home page and signup pages load
* Add cms account creation test
* Make github sync tests clean out repo dirs before running.
 2012-07-13 11:51:33 -04:00
Victor Shnayder
ff59c9bfa9 Initial connection of student module with cms. 
* Enable account creation
* Some code cleanups
* Fix access to nonexistent fields in the account creation view
* Formatting fixes
 2012-07-13 11:51:32 -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
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
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
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
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
f60af340ea Add Jasmine suite to CMS 2012-07-05 18:44:56 -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
a9aa5d9ea0 Update code base on changes in master 2012-07-05 15:25:04 -04:00
Prem Sichanugrist
5c85412dfa Nested subview is working 2012-07-05 09:38:51 -04:00
Prem Sichanugrist
a7dc045f36 External module loading 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
21734eb919 Add Backbone to the project 2012-07-05 09:38:50 -04:00
Calen Pennington
b8aff5131f Merge branch 'master' into cpennington/cms-github 2012-07-03 21:31:31 -04:00
Kyle Fiedler
ffea8e3e7d added more style for unit page, hovers, and buttons 2012-07-03 16:19:19 -04:00
Calen Pennington
5a2b2e0126 Add an index page that lists all courses 2012-07-03 14:44:41 -04:00
Calen Pennington
a5d861d298 Make course index page read from url for org, course, name 2012-07-03 14:29:50 -04:00
Calen Pennington
5b8c3dc1e4 Make html a RawDescriptor with a slightly different UI 2012-07-02 10:44:50 -04:00
Calen Pennington
e0e42ae8ac Fix up cms after changing html and sequence descriptors to use metadata 2012-07-02 10:18:24 -04:00
Calen Pennington
3cf29af8fe Make location into a named tuple, and use it more as a first class entity, rather than URL for identifying content 2012-07-02 10:17:59 -04:00
Calen Pennington
7ac8fecb38 Rename XModule[Descriptor].type to .category to be parallel to Location 2012-07-02 09:01:08 -04:00
Calen Pennington
e9a00ffc5a Parse XModuleDescriptors on import using from_xml 
Also:
Render all XModuleDescriptors in the cms the same way
Default them to editing raw xml, if there is no specific module for them
 2012-06-26 11:56:21 -04:00