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
ichuang
660c35f63e
additional changes to make inline textinput work properly
2012-08-20 00:19:28 -04:00
ichuang
b23bfc75bc
additional minor change: allow "inline" attrib on textline
2012-08-19 23:18:06 -04:00
kimth
891797a3bb
Submission of files through requests.POST depletes the file pointer. Need to rewind for replay
2012-08-19 20:38:10 -04:00
Rocky Duan
6164c87074
Merge branch 'master' of github.com:MITx/mitx into merge
2012-08-19 10:08:00 -07:00
kimth
20adaa81ba
Use list comprehension
2012-08-19 12:22:14 -04:00
kimth
9b94bb17e4
Default param is None rather than []
2012-08-19 12:19:10 -04:00
kimth
e2bca44ca3
Simplify is_list_of_files
2012-08-19 12:09:38 -04:00
kimth
52d243208e
Adjust tests to reflect list of file objects, not just file
2012-08-19 11:14:32 -04:00
kimth
f5e60412ee
Send multiple files to xqueue
2012-08-19 11:02:03 -04:00
kimth
b2599f075f
Send multiple files to xqueue
2012-08-19 11:00:51 -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
kimth
588444c46b
Filesubmission template allows multiple file selection
2012-08-19 07:54:10 -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
ichuang
4dbcfe927e
hotfix: eecs1 is inaccessible due to dead router; switch to qisx for pyxserver
...
This needs a more permanent solution.
2012-08-17 09:36:43 -04:00
kimth
0a9065f2be
Fix CustomResponse for 6.002x
2012-08-16 22:00:10 -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
kimth
fa3e46880d
Merge pull request #439 from MITx/feature/victor/fix-html-rendering
...
fix html rendering bug
2012-08-16 14:02:10 -07:00
Victor Shnayder
1ae71313bc
fix html rendering bug
2012-08-16 16:53:29 -04:00
ichuang
6e3eff304e
{} -> {0} etc in .format statements
2012-08-16 16:22:26 -04:00
Kyle Fiedler
b17cbcdccd
Added fixes for speed dropdown
2012-08-16 15:27:23 -04:00
ichuang
73d9d10aa8
html needs < in backcompat_module
2012-08-16 15:17:55 -04:00
ichuang
0cac6c9512
minor change to backcompat_module for py26 compat
2012-08-16 15:16:42 -04:00
Sarina Canelake
725e9a2a7b
Add facility for fixed number of problem attempts
2012-08-16 14:27:28 -04:00
Calen Pennington
56fc4e2fe8
Merge pull request #433 from MITx/feature/kfiedler/courseware-style
...
Made video go to the center of the screen in full screen
2012-08-16 10:52:27 -07:00
Calen Pennington
4e9e65e0e1
Merge pull request #432 from MITx/feature/cale/fix-tests
...
Move mitxmako out of common lib, and pass template rendering function in...
2012-08-16 10:52:12 -07:00
Kyle Fiedler
c2ee844704
Made video go to the center of the screen in full screen
2012-08-16 13:47:15 -04:00
Calen Pennington
4798a46948
Add docstring for load_function
2012-08-16 13:08:10 -04:00
