Victor Shnayder
a8c70d3531
add todo
2012-07-24 16:14:02 -04:00
Calen Pennington
19a3c14ab9
Split out code to replace /static urls in get_html into a separate module so that it can be used in CMS previews
2012-07-24 16:14:01 -04:00
Calen Pennington
a81015a91b
Move I4xSystem into xmodule so that the definition is available to the CMS
2012-07-24 15:05:07 -04:00
Calen Pennington
98910a2d49
Address review comments
2012-07-24 14:46:46 -04:00
Calen Pennington
66f79251dc
Add feature flag for disabling course start dates
2012-07-24 13:22:50 -04:00
Calen Pennington
d8f8d8c656
Merge branch 'release/1.0'
...
Conflicts:
common/djangoapps/student/views.py
lms/djangoapps/courseware/courses.py
2012-07-24 08:52:50 -04:00
Calen Pennington
b8b133d30c
Replace /static urls in all course snippets
2012-07-23 16:31:52 -04:00
Calen Pennington
4984f9d804
Use django-pipeline to read course static files.
...
Requires the replacement of {COURSE_STATIC_URL} with just /static/
in about/overview.html files.
2012-07-23 16:22:45 -04:00
Calen Pennington
1d1a9173a4
Cleaning up pep8 violations
2012-07-23 14:44:40 -04:00
Calen Pennington
7ef8b6ac1e
Merge remote-tracking branch 'origin/release/1.0'
2012-07-23 14:27:29 -04:00
David Ormsbee
80c04e1414
Use JPGs instead of PNG for course images
2012-07-23 14:16:54 -04:00
Calen Pennington
ebe67d2d7d
Merge remote-tracking branch 'origin/release/1.0'
...
Conflicts:
common/djangoapps/student/views.py
2012-07-23 13:55:20 -04:00
Matthew Mongeau
ee72a725bb
Sort by course number. Simplify university grouping.
2012-07-23 11:38:01 -04:00
David Ormsbee
942183d765
Merge branch 'release/1.0' into dormsbee/change_reg_fields
2012-07-22 17:50:46 -04:00
David Ormsbee
9bb8537976
Remove student migrations that were in LMS after the move to common.
...
Fortunately, the migrations that were lost won't mess things up. One
is a modification of country, which we're dropping anyway. Another
affects location, which is fine to leave as it was.
2012-07-22 10:02: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
Bridger Maxwell
660d11dc16
Merge remote-tracking branch 'origin/release/1.0' into unenroll
...
Conflicts:
lms/urls.py
2012-07-21 12:49:27 -04:00
Bridger Maxwell
186e5fc5e1
Cleaned up the urls file a bit, to remove urls that don't work. Also removed some unused stuff from static_template_views.
2012-07-20 15:56:48 -04:00
Bridger Maxwell
36373bb457
Added an unenroll link (and confirmation) to the dashboard. Enrolling is now a POST of a form.
2012-07-20 12:21:35 -04:00
bridger
e247239b69
Merge pull request #231 from MITx/dormsbee/no_org_fix
...
Keep courses and front page from erroring when we're missing an org in data
2012-07-19 13:27:39 -07:00
David Ormsbee
17263dcd1b
Keep courses and front page from erroring when we're missing an org in the data.
2012-07-19 16:19:16 -04:00
Bridger Maxwell
287cfd7dcc
university_profile didn't have the ensure_csrf_cookie decorator. course_about and university_profile didn't have the cache_if_anonymous decorator.
2012-07-19 15:47:19 -04:00
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
