Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

1676 Commits

Author SHA1 Message Date
Galen Frechette
d9e293f9c5 imporves typography and typography implimentation 2012-07-14 03:11:06 -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
Galen Frechette
cd345ae3bb converts modals to use jquery leanModal 2012-07-13 13:57:50 -04:00
Galen Frechette
3fca8a9dd0 cleans up rss feed on home page, still wip 2012-07-13 13:57:34 -04:00
Galen Frechette
296ae34e34 wip news feed on home page 2012-07-13 13:57:25 -04:00
Galen Frechette
35c5de8128 cleans up home page header design, adds social sharing to header, adds tos, privacy policy, honor code, help and copyright pages, add liks to those pages in footer, finished contact page 2012-07-13 13:57:02 -04:00
Galen Frechette
1ea8bd2666 imporves visual design of course info/profile page 2012-07-13 13:56:44 -04:00
Galen Frechette
8a5e3bf4d2 adds pressrelease page, breaks about content into seperate pages, imporvoves some visual elements of about and jobs pages 2012-07-13 13:56:14 -04:00
Victor Shnayder
6e98255cd5 remove reference to course from signup email subject 2012-07-13 11:51:32 -04:00
John Jarvis
1a3549903c updating activation mail, adding Gemfile.lock to gitignore 2012-07-12 13:41:51 -04:00
bridger
28007b280c Merge pull request #168 from MITx/multicourse_wiki 
Multicourse wiki
 2012-07-12 07:35:17 -07:00
Calen Pennington
e7d44a2606 Remove explain attribute in favor of solution stanza as exemplified in edx4edx 2012-07-11 22:18:40 -04:00
Arjun Singh
8fa9f19b65 Oops, committed a bad version. 2012-07-11 17:04:37 -04:00
Arjun Singh
d0630c44be Temporary fix to allow pages that inherited the marketing template to display (though poorly) 2012-07-11 17:00:46 -04:00
Bridger Maxwell
5bf6c73259 Merge with master. 2012-07-11 15:26:26 -04:00
Galen Frechette
7a5d645b9f removes user avatar, imporves dashboard design 2012-07-10 19:59:51 -04:00
Galen Frechette
7f4de5df30 simplifies jobs page 2012-07-10 19:59:51 -04:00
Galen Frechette
597c1db585 updates basic html structure and base color 2012-07-10 19:59:51 -04:00
Galen Frechette
f7a1873aee adds banner images to and refines header on find courses pages, various visual tweeks and imporvements 2012-07-10 19:59:50 -04:00
Galen Frechette
5484cfd08e adds links to university profile page 2012-07-10 19:59:50 -04:00
Galen Frechette
6afb8f7d94 fixes university attributes in course.html 2012-07-10 19:59:50 -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
David Ormsbee
3dd923d9b9 typo fix (it was just really bugging me) 2012-07-10 17:50:42 -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
5406b9bb40 Make /static/ urls work in the courseware 2012-07-10 12:54:47 -04:00
Calen Pennington
fe2f0347b0 Fix typo 2012-07-10 10:15:57 -04:00
Matthew Mongeau
cfa389e357 Change url to use args instead of kwargs. 2012-07-09 18:33:51 -04:00
Bridger Maxwell
631cc8e874 Merge branch 'dormsbee/multicourse' into multicourse_wiki 2012-07-09 14:28:43 -04:00
Matthew Mongeau
43e6bbb29f Added info page content 2012-07-09 14:16:17 -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
ichuang
9b90068e03 Merge branch 'stable-edx4edx' of github.com:MITx/mitx 
Conflicts:
	common/lib/xmodule/seq_module.py
	common/lib/xmodule/xmodule/capa_module.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/multicourse/multicourse_settings.py
 2012-07-08 16:52:36 -04:00
Bridger Maxwell
4d349fbd9d Fixed wiki error page again. 2012-07-06 17:42:01 -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
Bridger Maxwell
6d7b477982 Fixed wiki revision feed. 2012-07-06 12:55:05 -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
Bridger Maxwell
ac0a776818 First pass at getting both independent and in-course wiki viewing. 2012-07-05 21:20:35 -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
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
Galen Frechette
733bb455f0 minor fixes to dashboard and typography, adds layout to jobs page 2012-07-03 18:25:51 -04:00
Matthew Mongeau
38239c73ab Hook enroll back up. 2012-07-03 15:10:26 -04:00
Prem Sichanugrist
28cc64b9b1 Remove unused lms/problem.js 2012-07-03 15:00:41 -04:00
Prem Sichanugrist
8fb06ce194 Update code according to changes in 829e502 2012-07-03 14:33:24 -04:00
Calen Pennington
207777fbe1 Fix up problem display to use the new metadata that's available 2012-07-03 14:20:11 -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
506ee58b61 fixes template paths in course_about.html 2012-07-02 15:45:05 -04:00