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

164 Commits

Author SHA1 Message Date
Calen Pennington
fabe1d41d1 Merge pull request #180 from MITx/kimth/lms-coderesponse 
CodeResponse for external/queued grading of student code
 2012-07-16 07:55:54 -07:00
Calen Pennington
4489a04586 Merge pull request #178 from MITx/victor/cms_auth 
Victor/cms auth
 2012-07-16 07:33:45 -07: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
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
kimth
6d3516a754 CodeResponse for queued code checking 2012-07-13 13:45:38 -04:00
Victor Shnayder
39a1502e1a Move student app from lms to common 2012-07-13 11:51:32 -04:00
Bridger Maxwell
d1f8f4bef0 Forgot to add this file in the last commit. 2012-07-12 17:10:12 -04:00
Bridger Maxwell
d5a5fcec4d Fixed the errors that were breaking tests from unused simplewiki files and a half-migrated certificates module. 2012-07-12 16:43:48 -04:00
bridger
28007b280c Merge pull request #168 from MITx/multicourse_wiki 
Multicourse wiki
 2012-07-12 07:35:17 -07:00
bridger
bc21cdfaa5 Merge pull request #167 from MITx/utf8_migration_merge 
Utf8 migration merge
 2012-07-12 07:34:45 -07:00
Bridger Maxwell
2c2e296034 Forgot to actually add migration file... 2012-07-12 10:32:53 -04:00
Bridger Maxwell
64888f1c1b Re-added the migration to expand the meta field. 2012-07-12 10:29:15 -04:00
Calen Pennington
c468d47aa2 Minor change in comment about module type/category 2012-07-11 22:19:34 -04:00
Calen Pennington
e39e454ff2 Correct comments for get_module 2012-07-11 22:19:34 -04:00
Calen Pennington
920c397292 Be more specific about what the random number generator seed is 2012-07-11 22:19:34 -04:00
Calen Pennington
1263d82d06 Add comments on StudentModuleCache arguments 2012-07-11 22:19:34 -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
Bridger Maxwell
5bf6c73259 Merge with master. 2012-07-11 15:26:26 -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
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
ichuang
84838cf222 add CourseEnrollment and UserTestGroup to django admin view 2012-07-10 22:31:28 -04:00
Galen Frechette
5484cfd08e adds links to university profile page 2012-07-10 19:59:50 -04:00
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
da360b1d56 Allow for a user to enroll in multiple courses 2012-07-10 13:11:57 -04:00
Calen Pennington
5406b9bb40 Make /static/ urls work in the courseware 2012-07-10 12:54:47 -04:00
Calen Pennington
239c5ef172 Require login for enrollment 2012-07-10 10:19:15 -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
c47cdc7f87 Fix some path problems. 2012-07-09 14:06:44 -04:00
Matthew Mongeau
3053caec7e Get course about page working. 2012-07-09 13:48:18 -04:00
ichuang
3a664753b4 minor changes - test this branch with more courses (8.01x, 6.00x) 2012-07-08 22:05:21 -04:00
ichuang
0daf7b0497 merging of stable-edx4edx into master - bugfixes and debugging 2012-07-08 19:03:29 -04:00
ichuang
4356ec5c45 default course to settings.COURSE_DEFAULT 2012-07-08 17:00:08 -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
291ec2cfc6 Allowing dots in wiki namespaces. 2012-07-06 17:49:26 -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
c0bba714a7 Added a migration to unique article slugs. 2012-07-06 16:17:15 -04:00
Bridger Maxwell
5489819fc7 Started writing slug uniquifying data migration. Doesn't work yet. 2012-07-06 16:10:12 -04:00
Bridger Maxwell
6d7b477982 Fixed wiki revision feed. 2012-07-06 12:55:05 -04:00
Calen Pennington
a1f98e76cd WIP: Merging multicourse and xmodule descriptor changes 
The basic form has been fleshed out. Things still to do:
1) Extend get_course interface to the rest of modulestore
2) Make courses actually load
3) Make org/course/maybe others metadata attributes for course_module (see xml_module), so
that they are loaded/saved on import/export to xml
 2012-07-05 21:56:52 -04:00