Tom Giannattasio
c1befd5fd4
Merge branch 'master' into feature/tomg/fall-design
2012-08-22 17:06:03 -04:00
Tom Giannattasio
1a7b5b8564
fixed tutorial sequence nav bug
2012-08-22 17:05:42 -04:00
Rocky Duan
951fb06341
Merge branch 'master' of github.com:MITx/mitx into merge
...
Conflicts:
lms/envs/dev.py
2012-08-22 14:04:34 -07:00
Calen Pennington
e206bf2ffc
Merge pull request #505 from MITx/feature/tomg/fall-design
...
Feature/tomg/fall design
2012-08-22 13:34:39 -07:00
David Ormsbee
3b24ae1068
Merge pull request #501 from MITx/kimth/autodisable-syllabus
...
Dynamically disable syllabus per-course
2012-08-22 13:15:24 -07:00
Tom Giannattasio
a05cf05462
Merge branch 'master' into feature/tomg/fall-design
2012-08-22 16:09:30 -04:00
Tom Giannattasio
2c827c46f9
fixed firefox outline bugs
2012-08-22 16:09:09 -04:00
ike
7c242939f2
fix staff debug view, and also add new source_link
2012-08-22 15:51:08 -04:00
kimth
f46607710f
Merge master
2012-08-22 15:25:07 -04:00
kimth
960cf5792b
Dynamically disable syllabus per-course
2012-08-22 15:12:49 -04:00
David Ormsbee
8b8ee9f434
Merge pull request #500 from MITx/feature/cale/university-branding
...
Feature/cale/university branding
2012-08-22 12:02:19 -07:00
Calen Pennington
2eb0de99eb
Merge pull request #494 from MITx/feature/arjun/course_specific_css
...
Feature/arjun/course specific css
2012-08-22 11:55:20 -07:00
Calen Pennington
d735190570
Merge pull request #499 from MITx/feature/bridger/new_wiki
...
Added optional <wiki> tag to course to specify an alternative wiki page.
2012-08-22 11:54:39 -07:00
Arjun Singh
23e3d371ef
adding more details about the state of course.css_class
2012-08-22 11:49:26 -07:00
Calen Pennington
5ca636e606
Use the university profile page for courses and index if we are in a branded subdomain. N.B. THIS DOESN'T WORK WITH MIT_SSL_AUTH
2012-08-22 14:43:49 -04:00
Bridger Maxwell
788c74e07a
Added optional <wiki> tag to course to specify an alternative wiki page.
2012-08-22 14:25:05 -04:00
Calen Pennington
2eb3f37681
Merge pull request #498 from MITx/feature/victor/domain-specific-caching
...
Separate caches per-domain-name
2012-08-22 10:25:25 -07:00
Victor Shnayder
ce0bc1f782
Separate caches per-domain-name
2012-08-22 13:18:33 -04:00
Calen Pennington
f580bafdfe
Merge pull request #496 from MITx/kimth/fix-choiceresponse
...
Fix for 500 on showanswer for choiceresponse
2012-08-22 10:07:42 -07:00
Calen Pennington
aa933cb38f
Merge pull request #497 from MITx/feature/victor/catch-module-errors
...
Catch errors in module load
2012-08-22 10:05:08 -07:00
Victor Shnayder
365495521e
Catch errors in module load
...
* if error is in xmodule_constructor(), catch and return an ErrorModule
* if error is somewhere else in get_module(), return None
2012-08-22 12:58:46 -04:00
kimth
edefa04de1
Workaround for 500 on showanswer for choiceresponse
2012-08-22 12:41:30 -04:00
Arjun Singh
9a21c5d4a8
Adding reasoning for adding a new metadata field
2012-08-22 05:00:39 -07:00
Arjun Singh
0b6bf77373
Adding a course-specific css class to body so that we can have course-targeted styles as a last resort
2012-08-22 05:00:39 -07:00
Rocky Duan
fd0eff46e7
Merge branch 'feature/rocky/discussion_api_key' into refactor
...
Conflicts:
lms/djangoapps/django_comment_client/tests.py
lms/lib/comment_client/utils.py
lms/templates/courseware/courseware.html
2012-08-21 17:14:25 -07:00
Tom Giannattasio
bbc95cb589
fixed accordion nav glitch
2012-08-21 19:25:32 -04:00
Tom Giannattasio
bd536f8aec
Merge branch 'master' into feature/tomg/fall-design
2012-08-21 18:13:40 -04:00
Tom Giannattasio
e762844c35
new sequence nav functionality - accommodates an infinite number of items
2012-08-21 18:12:59 -04: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
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
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
Victor Shnayder
2f9b2f19fc
s/[]/{}/
2012-08-21 15:01:10 -04: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
Tom Giannattasio
557975458c
Merge branch 'master' into feature/tomg/fall-design
2012-08-21 14:50:15 -04: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
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
Tom Giannattasio
0475f4cc44
new sequence nav; tweaked video box
2012-08-21 13:31:15 -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
Tom Giannattasio
4e6d7babcc
fixed wiki bugs; started sequence nav bugs
2012-08-21 12:51:33 -04:00
David Ormsbee
783a3905a4
disable user replication and associated tests
2012-08-21 11:39:36 -04:00
kimth
231aa4674c
Sequential modx/goto_position hits correct multicourse URL
2012-08-21 08:39:08 -04:00
Arjun Singh
11ffc6bb88
Allowing filesubmissions to specify which files are allowed and require that certain files are present.
2012-08-21 02:40:21 -07:00
Arjun Singh
0874369dc3
Minor change in extract_choices in choicegroup to allow for html in choice text
2012-08-21 01:59:01 -07:00
