Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

12296 Commits

Author SHA1 Message Date
Bridger Maxwell
9fd99016a9 Removed duplicate index on simplewiki_namespace. Re-added migration that was exposing South 0.7.4 bug. 2012-07-19 11:12:10 -04:00
Bridger Maxwell
58348a98da Revert "Kill simplewiki migration (there was already a unique index, adding another causes errors)" 
This reverts commit 7273868eb2.
 2012-07-19 11:00:39 -04:00
Matthew Mongeau
1f595ef401 Order courses according to univesity on courses page. 2012-07-19 10:26:39 -04:00
Calen Pennington
49ee12963f Merge pull request #185 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-07-19 06:29:48 -07:00
David Ormsbee
7273868eb2 Kill simplewiki migration (there was already a unique index, adding another causes errors) 2012-07-18 17:15:51 -04:00
David Ormsbee
9ec8c9934e Merge pull request #209 from MITx/dormsbee/uni_profile 
Dormsbee/uni profile
 2012-07-18 13:39:43 -07:00
David Ormsbee
16eeb43a04 Add University Profile page with images and text blurbs 2012-07-18 16:17:12 -04:00
Bridger Maxwell
a9078ac0b0 check_course didn't have the right exception being caught. 2012-07-18 16:00:03 -04:00
Bridger Maxwell
0fab4cdd93 Added a method to render 404 and 500 pages. Added a reference to these views in urls.py. 2012-07-18 14:55:12 -04:00
David Ormsbee
753181642e Merge pull request #205 from MITx/course_images 
Course images
 2012-07-18 11:08:20 -07:00
Bridger Maxwell
f25dbc0854 Added {COURSE_STATIC_URL} format key for about section html. Changed get_about_section to be get_course_about_section in courseware.courses. 2012-07-18 13:48:20 -04:00
Bridger Maxwell
14dc52f66d Merge remote-tracking branch 'origin/dormsbee/at_a_glance' into release/1.0 2012-07-18 13:25:59 -04:00
Matthew Mongeau
67221b0725 Added countries and other demographics to be stored in db. 2012-07-18 13:02:07 -04:00
Matthew Mongeau
44e8d7474c Move logic into view.py for whether user is enrolled. 2012-07-18 11:54:36 -04:00
Bridger Maxwell
f007a8ff92 The about image is now pulled from the course data directory and shown on the homepage, about course, and dashboard. Working on a way to show other, arbitrary course images. 2012-07-18 11:44:19 -04:00
Bridger Maxwell
e4a3b261d4 Moved enroll and course_about to courseware, because they depend on lms. 2012-07-17 17:09:20 -04:00
kimth
8c327eb07f Moved imports to top of file 2012-07-17 14:44:20 -04:00
Bridger Maxwell
2f4cf23b73 Merge remote-tracking branch 'origin/master' into course_start 
Conflicts:
	common/djangoapps/student/views.py
 2012-07-17 12:53:27 -04:00
Bridger Maxwell
938f0d1995 Changed check_course from a decorator to a regular function that throws exceptions. Much easier to understand now. 2012-07-17 11:12:42 -04:00
kimth
803b0c4fd0 Callback uses userid rather than username 2012-07-17 10:59:27 -04:00
kimth
093ac9d101 CorrectMap in LMS keeps track of problems as being queued 2012-07-16 16:19:35 -04:00
Bridger Maxwell
70e2f7c0d5 Merged with master. Moved a bunch of static template files to their own urls (without /t/template). 2012-07-16 15:32:22 -04:00
Bridger Maxwell
960c8619e5 Added a cache_if_anonymous decorator. 2012-07-16 13:40:17 -04:00
Bridger Maxwell
ed624d0b72 Cleaned up check_course decorator a bit. 2012-07-16 12:54:24 -04:00
Bridger Maxwell
4f4e751321 Merge 2012-07-16 12:42:49 -04:00
Bridger Maxwell
0c41576e1e Some changes from code review. 2012-07-16 12:06:17 -04:00
Bridger Maxwell
264e324c50 Changed format of start date parsing to ISO 8601 2012-07-16 11:27:13 -04:00
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
Bridger Maxwell
eb7ae3540c Added a simple, specific cache for the static_template_pages. 2012-07-16 09:12:50 -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
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
Bridger Maxwell
f9de962365 Merge remote-tracking branch 'origin/master' into course_start 2012-07-13 13:40:01 -04:00
Victor Shnayder
39a1502e1a Move student app from lms to common 2012-07-13 11:51:32 -04:00
Bridger Maxwell
ecc50314f7 Added a decorator that prevents access to course pages until the course has started. 2012-07-13 10:31:36 -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 Maxwell
8d7c4ad8de Added a start date to courses. Created a decorator to retrieve the course and check that it is open. 2012-07-12 16:27:20 -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