kimth
3968e117e1
Simplify dict load in xqueue_callback
2012-07-31 10:42:32 -04:00
kimth
22af531b0b
Hardcoded URL moved to LMS for now
2012-07-31 10:09:47 -04:00
kimth
e2f4995bc9
LMS provides fully qualified callback URL
2012-07-31 08:57:28 -04:00
Rocky Duan
e705bbb764
Merge branch 'discussion2' of github.com:dementrock/mitx
...
Conflicts:
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
lms/envs/common.py
2012-07-30 17:45:29 -04:00
Rocky Duan
8228bebc2a
Merge branch 'master' of github.com:MITx/mitx
...
Conflicts:
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
lms/envs/common.py
2012-07-30 17:41:19 -04:00
Brittany Cheng
91cb814ee0
merging with origin master
2012-07-30 16:28:49 -04:00
Victor Shnayder
59defd33b6
Formatting and little bugfixes
...
* add course and org to full/course.xml
* fix error path in clean_xml script
* commit rakefile change needed by c5334f150c
2012-07-27 16:09:25 -04:00
Victor Shnayder
cb30850759
Config for integration tests
...
* move askbot repo into mitx as a submodule
* set settings as in 85865f7221
* remove test_mongo env.
* Refactor tests to use new config structure.
* Add real integration tests--not working due to bugs in course xml. Turned off.
2012-07-27 16:09:25 -04:00
Victor Shnayder
73b3826820
Initial integration tests!
...
* new env file to run integration tests with mongo backend
- needs askbot to get db in the right state
- needs wiki to load pages successfully
- not using migrations to make it run faster
* import test courses, check that each page loads without erroring.
* fix NonePointerException in index view to make tests pass
* misc formatting cleanups
2012-07-27 16:09:25 -04:00
Victor Shnayder
da29d88d04
Add import-export round-trip check.
...
* add fix for the file export code--remove tag tail and text,
not just the children.
2012-07-27 16:08:24 -04:00
Victor Shnayder
168f76ce5a
Add jump_to functionality to lms on mongo
...
* More tests for mongo modulestore, including tweaks to test files
* add location_to_id method to CourseDescriptors
* Implement path_to_location method in mongo.py
- TODO: does not handle position in sequences yet.
* fix bug in jump_to view.
2012-07-27 16:08:24 -04:00
Victor Shnayder
eb5989aa99
Ready to implement path_to_location
...
* Clean up test data for simple, toy courses
* clean up test_mongo.py
* write initial test for path_to_location
* hook up view to use path_to_location
Next: actually implement it :)
2012-07-27 16:08:24 -04:00
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
Brittany Cheng
c5aa22ed65
Merge branch 'master' of github.com:MITx/mitx into discussion
2012-07-27 14:42:39 -04:00
Rocky Duan
7a53bc52ae
Merge branch 'master' of github.com:MITx/mitx
2012-07-27 12:30:54 -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
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
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
b2da6eef9f
provide user_id for xmodules
2012-07-25 18:15:52 -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
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
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
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
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
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
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
