David Ormsbee
9bcd3cd495
Merge pull request #490 from MITx/feature/rocky/discussion_api_key
...
Feature/rocky/discussion api key
2012-08-21 17:09:26 -07:00
David Ormsbee
f7539e8bce
Merge pull request #488 from MITx/kimth/fix-choiceresponse
...
Protect asciimath2jax in seq_contents, fix choiceresponse on CS169x
2012-08-21 15:46:32 -07:00
Rocky Duan
e3a3f7094a
added shared key authentication
2012-08-21 15:45:41 -07:00
Rocky Duan
fe091b7bc1
Merge branch 'master' of github.com:MITx/mitx into feature/rocky/discussion_api_key
2012-08-21 15:45:24 -07:00
Bridger Maxwell
214fb9185d
Disabling anonymous wiki access until styling supports it.
2012-08-21 18:42:20 -04:00
David Ormsbee
f9d27fd760
Merge pull request #489 from MITx/feature/bridger/disable_wiki_attachments
...
Disabled wiki attachments.
2012-08-21 15:13:29 -07:00
Bridger Maxwell
1e068b6a4a
Disabled wiki attachments.
2012-08-21 18:01:51 -04:00
kimth
f83169f12d
Protect asciimath2jax in seq_contents, fix choiceresponse on CS169x
2012-08-21 17:54:21 -04:00
Victor Shnayder
2c19d01441
Merge pull request #479 from MITx/feature/arjun/syllabus
...
Adding a syllabus page (accessible via course navigation)
2012-08-21 14:33:07 -07:00
kimth
cfa2ba95bc
Merge pull request #485 from MITx/feature/kfiedler/courseware-style
...
Fix for CSM Sass and fix headers in tutorials
2012-08-21 14:17:20 -07:00
Victor Shnayder
8be7d90c85
Address comments on #484 .
2012-08-21 17:01:25 -04:00
Calen Pennington
be94e176ff
Add pytz to requirements
2012-08-21 16:29:47 -04:00
Arjun Singh
02ecfb4730
Adding comments about removing the syllabus tab ASAP.
2012-08-21 13:25:29 -07:00
Arjun Singh
b86fbdbd10
Adding comments about removing the syllabus tab ASAP.
2012-08-21 13:23:00 -07:00
David Ormsbee
38d713cb07
Merge pull request #487 from MITx/feature/cale/sjsu-subdomain
...
Allow puppet to set COURSE_LISTINGS
2012-08-21 13:22:28 -07:00
Calen Pennington
188584c77d
Allow puppet to set COURSE_LISTINGS
2012-08-21 16:21:43 -04:00
Calen Pennington
2a8f5a475c
Merge pull request #486 from MITx/feature/victor/create-test-courses
...
Feature/victor/create test courses
2012-08-21 13:21:05 -07:00
Victor Shnayder
a7a9abab44
add a course to test start dates
2012-08-21 16:21:01 -04:00
Victor Shnayder
d3f1f0f8b6
comment out debug messages
2012-08-21 16:09:48 -04:00
Victor Shnayder
1dc31ceb8b
fix toylab html
2012-08-21 16:09:35 -04:00
Kyle Fiedler
3273de93fe
make tutorial headers normal size
2012-08-21 16:01:48 -04:00
Kyle Fiedler
8a112b0cca
Added fix for cms sass
2012-08-21 16:01:48 -04:00
Rocky Duan
cf28dbea60
Merge branch 'feature/bk_forum_int'
2012-08-21 12:56:56 -07:00
Calen Pennington
dca434ad34
Merge pull request #448 from MITx/feature/ichuang/add-gitreload-to-migrate
...
add gitreload to lms-migration code
2012-08-21 12:52:52 -07:00
Calen Pennington
61192e5280
Merge pull request #484 from MITx/feature/victor/links-to-test-dirs
...
Initial pass at script to create links to test dirs.
2012-08-21 12:46:46 -07:00
Victor Shnayder
2aa154c903
Initial pass at script to create links to test dirs.
2012-08-21 15:42:47 -04:00
Calen Pennington
99f94b0a6b
Merge pull request #472 from MITx/feature/victor/per-course-progress
...
Feature/victor/per course progress
2012-08-21 12:29:03 -07:00
Calen Pennington
2106d621c8
Merge pull request #476 from MITx/arjun/fix_choiceresponse
...
Minor change in extract_choices in choicegroup to allow for html in choice text
2012-08-21 12:11:47 -07:00
Calen Pennington
1a8a3e7a40
Merge pull request #480 from MITx/feature/victor/policy-dirs
...
Feature/victor/policy dirs
2012-08-21 12:08:50 -07:00
Bridger Maxwell
9cc72c4965
Victor's fixes only apply to sqlite. Added a conditional and now they run on mysql.
2012-08-21 15:02:27 -04:00
Victor Shnayder
d13998a135
add docstring comment
2012-08-21 15:02:27 -04:00
Victor Shnayder
ec90200b81
fix migration to remove out of date index
...
* reorder index fields
2012-08-21 15:02:26 -04:00
Victor Shnayder
d9c753e7ef
add test output files to gitignore
2012-08-21 15:02:26 -04:00
Victor Shnayder
f44d794e63
Add course_id to StudentModule
...
* Update all uses.
2012-08-21 15:01:54 -04:00
Victor Shnayder
2f9b2f19fc
s/[]/{}/
2012-08-21 15:01:10 -04:00
Arjun Singh
99703761b0
Merge master
2012-08-21 12:01:09 -07:00
Victor Shnayder
ccf2cff2ba
bugfix: set errored_courses in default case
2012-08-21 15:00:21 -04:00
Victor Shnayder
b97a2af2a2
Show policy, grading policy, and top-level errors
...
* Save errors for courses that failed to load in modulestore
* global staff can see course errors on their dashboard
* put policy loading errors into the error trackers
* add has_access(user, 'global', 'staff'), which is equiv to user.is_staff for now
2012-08-21 15:00:21 -04:00
Victor Shnayder
f866854411
Load grading policy from policy/{url_name}/grading_policy.json
...
* with backcompat location /grading_policy.json
2012-08-21 15:00:21 -04:00
Victor Shnayder
eeadf0ba87
Let policies be stored in policies/{url_name}/policy.json
...
* still backcompat with old mode
2012-08-21 15:00:21 -04:00
Calen Pennington
9f23e4378e
Merge remote-tracking branch 'origin/hotfix/1.0.4'
2012-08-21 14:56:35 -04:00
Calen Pennington
adf2d44d05
Merge pull request #482 from MITx/feature/dave/nav_fixes
...
Remove non-functioning News tab. Enable Instructor tab from Discussion page
2012-08-21 11:47:01 -07:00
Calen Pennington
86f20cc15d
Merge pull request #478 from MITx/kimth/fix-sequence-modx
...
Sequential modx/goto_position hits correct multicourse URL
2012-08-21 11:39:17 -07:00
David Ormsbee
3f0fba71d9
Remove non-functioning News tab. Enable Instructor tab from Discussion page
2012-08-21 14:29:30 -04:00
David Ormsbee
8b01334a05
re-add pystache_custom requirement
2012-08-21 14:09:16 -04:00
kimth
7d1fd538f2
Use data(...) rather than hidden span
2012-08-21 13:36:49 -04:00
kimth
9b3f560c98
Fix MathJax in sequentials
2012-08-21 13:32:55 -04:00
David Ormsbee
32723cabc0
Merge pull request #458 from MITx/feature/bk_forum_int
...
Berkeley Forum Merge
2012-08-21 10:30:03 -07:00
Victor Shnayder
f1d670f9a8
remove no-longer-need < escape. Re #466
2012-08-21 13:29:11 -04:00
David Ormsbee
08e892ce9e
Add command to seed forum permissions to existing users
2012-08-21 13:22:32 -04:00
