Rocky Duan
a905ac9e1d
updated backbone & single thread retrieval now working
2012-08-20 22:03:46 -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
Rocky Duan
0b3e9909a4
Merge branch 'master' into refactor
...
Conflicts:
lms/djangoapps/django_comment_client/tests.py
lms/static/coffee/src/discussion/content.coffee
requirements.txt
2012-08-20 15:35:31 -07:00
Rocky Duan
8684ae29b2
Merge branch 'master' of github.com:MITx/mitx into refactor
...
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/courseware/courseware.html
requirements.txt
2012-08-20 15:31:51 -07:00
Rocky Duan
1c161a769e
removed unnecessary dependency
2012-08-20 15:16:40 -07: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
David Ormsbee
6a05a812c3
Merge pull request #460 from MITx/kimth/multiple-fileupload
...
Kimth/multiple fileupload
2012-08-19 18:08:40 -07: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
David Ormsbee
6c3b28b526
Merge pull request #452 from MITx/feature/bridger/new_wiki
...
Feature/bridger/new wiki
2012-08-19 09:46:15 -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
Bridger Maxwell
1e08164db5
Added MathJax to wiki pages.
2012-08-18 13:12:04 -04: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
Bridger Maxwell
55f3a971cf
Wiki circuit editors zoom to fit contents.
2012-08-18 00:10:42 -04:00
Bridger Maxwell
1470045b74
Fixed wiki circuit editor modal to be a little better styled.
2012-08-17 21:44:56 -04:00
Bridger Maxwell
a4b97c5f10
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
2012-08-17 21:44:05 -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
Bridger Maxwell
2a84d147f0
Fixed a sizing bug in circuit editor.
2012-08-17 20:22:28 -04:00
Bridger Maxwell
d3962ecd92
Updated CodeMirror modes for better syntax highlighting.
2012-08-17 20:16:08 -04:00
Bridger Maxwell
0fbfaf612f
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
2012-08-17 17:52:22 -04: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
b6e41dc05c
fix view_tracking_log to show proper timezone
2012-08-17 15:46:09 -04:00
Bridger Maxwell
6b716c2883
Put in CodeMirror editor with inline circuits.
2012-08-17 14:32:29 -04:00
ichuang
39e2d64207
Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/add-gitreload-to-migrate
2012-08-17 16:22:40 +00:00
ichuang
4365b4a092
more flexible event logs retrieval
2012-08-17 16:17:00 +00: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
Calen Pennington
427c400f9e
Merge pull request #444 from MITx/feature/fix_user_repl_to_3_plus
...
Fix user replication to Courses you're already enrolled in
2012-08-17 05:55:31 -07:00
