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
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
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
d3f1f0f8b6
comment out debug messages
2012-08-21 16:09:48 -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
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
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
ichuang
e1c9e52fc5
move textinput display:inline into capa display.scss file as class
2012-08-20 19:18:00 -04:00
David Ormsbee
eb96497cff
Merge branch 'master' into feature/bk_forum_int
...
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/courseware/courseware.html
requirements.txt
2012-08-20 18:57:46 -04:00
David Ormsbee
47bf516001
Remove unnecessary import that was failing a test
2012-08-20 16:48:31 -04:00
Rocky Duan
af17ba7a79
removed dependency on datehelper
2012-08-20 12:57:23 -07:00
Kyle Fiedler
20d9e6e86d
Made save buttons blue, finished remaining askbot bugs, and removed all instances of -red
2012-08-20 15:45:05 -04:00
Kyle Fiedler
7c824f774f
Added styles for save button
2012-08-20 15:45:05 -04:00
Calen Pennington
de4abe300b
Merge pull request #464 from MITx/kimth/textbook
...
Kimth/textbook
2012-08-20 12:38:14 -07:00
Calen Pennington
259e21364f
Merge pull request #461 from MITx/feature/victor/multi-run-policy
...
Keep each course's descriptors separate
2012-08-20 12:35:55 -07:00
kimth
9852a581f0
Adjust comments
2012-08-20 13:43:55 -04:00
kimth
c084745290
Textbook TOC from S3
2012-08-20 13:32:13 -04:00
Victor Shnayder
55b1a59c40
hack item errors for now
2012-08-20 11:41:56 -04:00
Kyle Fiedler
e61b6842ec
removed h2 column
2012-08-20 11:32:29 -04:00
Victor Shnayder
c6c95c63ac
Keep each course's descriptors separate
...
* apply policy per-course, even if multiple courses share course and org fields
* keep descriptors separate in xml store, so that if two such courses
change the same module in different ways, it works. Such edits will need to
merged on CMS import...
* add get_instance(course_id, location) method to replace get_item(location).
Update all the call sites
* tests, including a 2nd toy course with same course and org.
2012-08-20 09:26:16 -04:00
Rocky Duan
6164c87074
Merge branch 'master' of github.com:MITx/mitx into merge
2012-08-19 10:08:00 -07:00
kimth
52d243208e
Adjust tests to reflect list of file objects, not just file
2012-08-19 11:14:32 -04:00
kimth
d2cb645834
Multiple file submissions
2012-08-19 09:26:03 -04:00
kimth
d920e718d0
AJAX permits multiple file upload
2012-08-19 08:26:12 -04:00
Rocky Duan
028bd23c1c
Merge branch 'master' of github.com:MITx/mitx into profile
...
Conflicts:
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
lms/templates/course_navigation.html
2012-08-18 16:57:00 -07:00
kimth
78b3ca050e
More info in comment
2012-08-18 10:08:49 -04:00
kimth
25d3890595
Remove outdated hardcoded url from circuit simulator
2012-08-18 09:51:27 -04:00
kimth
40b49224a2
Merge pull request #451 from MITx/feature/kfiedler/courseware-style
...
Added new styles for sequence nav and reset some of the styles for inputs
2012-08-17 17:54:03 -07:00
Kyle Fiedler
8473188fea
Added new styles for sequence nav and reset some of the styles for inputs
2012-08-17 17:41:45 -04:00
kimth
bea9aec6ea
Merge pull request #443 from MITx/feature/victor/fix-html-rendering
...
fix another backcompat html bug
2012-08-16 15:00:37 -07:00
Victor Shnayder
7e69c35735
fix another backcompat html bug
2012-08-16 17:58:10 -04:00
kimth
9686868a32
Merge pull request #442 from MITx/feature/kfiedler/courseware-style
...
Added fix for answer status and show answer to stay in the same place
2012-08-16 14:51:43 -07:00
Kyle Fiedler
f343bc28f3
Added fix for answer status and show answer to stay in the same place
2012-08-16 17:49:50 -04:00
kimth
c56fb6f326
Merge pull request #440 from MITx/feature/kfiedler/courseware-style
...
BUG SMASH
2012-08-16 14:12:45 -07:00
David Ormsbee
b5c6053000
Merge pull request #438 from MITx/feature/ichuang/minor-py26-compat-fix-part2
...
{} -> {0} etc in .format statements
2012-08-16 14:11:25 -07:00
Kyle Fiedler
09973bd815
Added fix for circut simulator
2012-08-16 17:08:12 -04:00
