Victor Shnayder
3cc601b398
Clean up course_info views
...
* catch exceptions and return a 404 if course not found
* add Location.is_valid(), tests
* stub of jumpto/ view.
2012-07-27 16:08:23 -04:00
Victor Shnayder
beda4f95b2
Initial version of import/check/export script.
...
* uses xml modulestore, and new error_handler hook
2012-07-27 16:08:23 -04:00
Rocky Duan
7a53bc52ae
Merge branch 'master' of github.com:MITx/mitx
2012-07-27 12:30:54 -04:00
Piotr Mitros
2df7e02e31
Fixed comment
2012-07-27 10:23:44 -04:00
Piotr Mitros
6db146f6b4
Missing files
2012-07-27 10:19:51 -04:00
Piotr Mitros
c8b2b4d464
Miniture staff dashboard. Not really tested, but should be safe to merge
2012-07-27 10:14:07 -04:00
David Ormsbee
72341569f9
Remove sections from ever getting appended in the first place if hide_from_toc is true
2012-07-27 01:22:07 -04:00
Rocky Duan
b37df4d0a5
removed the dumb debug line
2012-07-26 15:35:06 -04:00
David Ormsbee
2671801f93
Add optional hide_from_toc attribute to XML elements to support Tutorials (which don't show up in the navigation).
2012-07-26 14:55:42 -04:00
Rocky Duan
52c7136493
Merge branch 'lol'
...
Conflicts:
lms/djangoapps/courseware/views.py
lms/djangoapps/django_comment_client/utils.py
lms/lib/comment_client.py
lms/lib/datehelper
lms/static/sass/application.scss
lms/templates/discussion/index.html
lms/templates/news.html
2012-07-25 18:41:24 -04:00
Rocky Duan
9e3271e3cb
fixed eager
2012-07-25 18:25:28 -04:00
Rocky Duan
048deaa87f
show news & options when submit comment
2012-07-25 18:16:57 -04:00
Rocky Duan
aab9f8dc1c
make course id available in xmodule
2012-07-25 18:15:52 -04:00
Rocky Duan
6a816e453f
watch/unwatch, vote status enabled in all views
2012-07-25 18:15:52 -04:00
Rocky Duan
b2da6eef9f
provide user_id for xmodules
2012-07-25 18:15:52 -04:00
Rocky Duan
4b8c3b9b12
watch/unwatch threads; display current vote
2012-07-25 18:15:52 -04:00
Rocky Duan
0ee1b0c5d0
removed unnecessary args
2012-07-25 18:15:52 -04:00
Rocky Duan
28113d8b43
moved django_comment_client into edx
2012-07-25 18:15:51 -04:00
Rocky Duan
54ea3dba22
show news & options when submit comment
2012-07-25 15:30:05 -04:00
Rocky Duan
bedeac3a55
make course id available in xmodule
2012-07-24 18:51:56 -04:00
Rocky Duan
f485167bd4
watch/unwatch, vote status enabled in all views
2012-07-24 16:50:21 -04:00
Rocky Duan
856156a141
provide user_id for xmodules
2012-07-24 16:49:27 -04:00
Calen Pennington
408726e678
Standardize how JS XModules are instantiated
2012-07-24 16:14:04 -04:00
Calen Pennington
0fcaa01484
Allow anonymous users to check problems, but don't save any instance state for them
2012-07-24 16:14:04 -04:00
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
Rocky Duan
a06cc229a0
watch/unwatch threads; display current vote
2012-07-24 15:34:17 -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
Rocky Duan
8c3931ba0a
removed unnecessary args
2012-07-23 19:24:28 -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
Rocky Duan
fdab215eb4
moved django_comment_client into edx
2012-07-23 16:20: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
Rocky Duan
784bd26510
forum view for discussions
2012-07-22 19:05:32 -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
