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

7051 Commits

Author SHA1 Message Date
Calen Pennington
1263d82d06 Add comments on StudentModuleCache arguments 2012-07-11 22:19:34 -04: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
d739e61ebd Added check to make sure utf8 migration only runs on mysql. Had to add in certificates module. 2012-07-11 16:33:46 -04:00
John Jarvis
c6bf160002 removing {marketing,marketing-ie,print}.scss from PIPELINE_CSS 2012-07-11 15:53:56 -04: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
Bridger Maxwell
c6f9f3ebe1 Renamed migrations since branch, making dev machine databases un-migratable. 2012-07-11 15:17:44 -04:00
Bridger Maxwell
c31fb7684d Added utf8 conversion from stable branch. 2012-07-11 15:08:10 -04:00
Matthew Mongeau
b96f626425 Update UserProfile demographic fields: 
* Updated student.models.UserProfile
* Added migration to add: gender, date_of_birth, mailing_address, country, telephone_number, occupation
 2012-07-11 14:58:39 -04:00
Calen Pennington
100422a7f3 Make collectstatic run to completion 2012-07-11 10:14:51 -04:00
Calen Pennington
bbe589ddc3 Make dashboard require login 2012-07-11 09:05:39 -04:00
Calen Pennington
5d8fd7d53c Don't error out trying to retrieve remember parameter in login request 2012-07-11 08:53:57 -04:00
Calen Pennington
2d56a21f92 Removing old js files that used to be used by the LMS 2012-07-11 08:53:57 -04:00
Calen Pennington
f0a049a29e Don't depend on the mitx directory being named that, so that tests will run in jenkins where mitx is checked out as workspace 2012-07-11 08:53:56 -04:00
ichuang
84838cf222 add CourseEnrollment and UserTestGroup to django admin view 2012-07-10 22:31:28 -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
d8d3eb144c type tweeks in modals 2012-07-10 19:59:51 -04:00
Galen Frechette
8faa539a1a makes some tweeks to global nav style, home page header and font styles 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
897a89c5ca remove out of repo symlinks from static 2012-07-10 18:39:06 -04:00
David Ormsbee
3dd923d9b9 typo fix (it was just really bugging me) 2012-07-10 17:50:42 -04:00
Matthew Mongeau
347483203a Unscope URLCONF from mitx 2012-07-10 17:37:42 -04:00
Calen Pennington
1ac6e0a083 Add extra_filters_jinja needed for compressed_css filter 2012-07-10 16:22:05 -04:00
Calen Pennington
6dd141247d Fixing github_sync to work with multiple course data directories 2012-07-10 14:58:27 -04:00
David Ormsbee
2f90b27707 Only load DATA_DIR subdirs if DATA_DIR exists (so not during tests) 2012-07-10 13:56:51 -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
da360b1d56 Allow for a user to enroll in multiple courses 2012-07-10 13:11:57 -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
Calen Pennington
5406b9bb40 Make /static/ urls work in the courseware 2012-07-10 12:54:47 -04:00
Calen Pennington
dbfcd78c88 Get custom_tag templates using system.filestore so that they work in multicourse 2012-07-10 10:46:18 -04:00
Calen Pennington
239c5ef172 Require login for enrollment 2012-07-10 10:19:15 -04:00
Calen Pennington
fe2f0347b0 Fix typo 2012-07-10 10:15:57 -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
kimth
024789dabf Made data identifiers consistent with master branch of 'content-mit-6002x' 2012-07-09 19:01:25 -04:00
Matthew Mongeau
cfa389e357 Change url to use args instead of kwargs. 2012-07-09 18:33:51 -04:00
Matthew Mongeau
1fcc02579d Pass a course to get_section 2012-07-09 17:49:49 -04:00
Bridger Maxwell
640a71bb21 Merge branch 'dormsbee/multicourse' into multicourse_wiki 2012-07-09 15:54:50 -04:00
Bridger Maxwell
08f5fe7fc9 Fixed wiki urls for new course ids. 2012-07-09 15:53:50 -04:00
Matthew Mongeau
51c65e214a Get initial courseware page displaying. 2012-07-09 15:01:10 -04:00
Bridger Maxwell
631cc8e874 Merge branch 'dormsbee/multicourse' into multicourse_wiki 2012-07-09 14:28:43 -04:00
Matthew Mongeau
fe5fa7334b Get textbook page rendering. 2012-07-09 14:23:45 -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