Victor Shnayder
ef2bfac32a
Merge branch 'master' of github.com:MITx/mitx
2012-08-20 19:11:58 -04:00
Victor Shnayder
c5aef50701
add test database for new toy course. Trying to fix build
2012-08-20 19:11:47 -04:00
jarv
46c3e8a286
Merge pull request #473 from MITx/feature/pystache_custom
...
Remove pystache in favor of our custom version
2012-08-20 15:05:49 -07:00
David Ormsbee
356fac144b
Remove pystache in favor of our custom version
2012-08-20 18:04:37 -04:00
jarv
e89a7b67c5
Merge pull request #470 from MITx/jarv/dependency-update
...
ensuring pystache>=0.5.2
2012-08-20 13:46:02 -07:00
John Jarvis
bb80c66ed7
ensuring pystache>=0.5.2
2012-08-20 16:41:48 -04:00
David Ormsbee
d7327651eb
Merge pull request #469 from MITx/jarv/dependency-update
...
updating dependencies for pystache, networkx, graphviz and removing redu...
2012-08-20 13:37:57 -07:00
John Jarvis
55251039d9
updating dependencies for pystache, networkx, graphviz and removing redundant dependency for django-staticfiles
2012-08-20 16:35:42 -04:00
Victor Shnayder
cc1dd65eb0
Merge branch 'master' of github.com:MITx/mitx
2012-08-20 16:04:41 -04:00
Victor Shnayder
5f612c7819
Oops. Make modx_dispatch and xqueue callback work again.
...
- use get_instance, not get_item
- finish the id->location rename for modx_dispatch arg
2012-08-20 16:04:16 -04:00
thomasxiii
2f2a4cc6e7
Merge pull request #468 from MITx/feature/kfiedler/courseware-style
...
Made save buttons blue, finished remaining askbot bugs, and removed all instances of $mit-red
2012-08-20 12:53:03 -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
David Ormsbee
9bde5e7a4b
Merge pull request #467 from MITx/bridger/feature/clean_up
...
Bridger/feature/clean up
2012-08-20 12:21:35 -07:00
Bridger Maxwell
9bc5aec01a
Fixed up courseware-error view. Moved it to templates/courseware too.
2012-08-20 15:03:55 -04:00
jarv
bc2164e2be
Merge pull request #465 from MITx/jarv/repo-requirements-update
...
moving all requirements that use a repo to repo-requirements.txt includi...
2012-08-20 11:56:29 -07:00
Bridger Maxwell
0ac5ded095
Moved the course template pages to be templates/courseware/
2012-08-20 14:54:23 -04:00
John Jarvis
1a2cdea966
removing dupe
2012-08-20 14:24:39 -04:00
Bridger Maxwell
ee3f46fd30
Changed titles on course pages.
2012-08-20 14:19:47 -04:00
Bridger Maxwell
5b38f9d4ac
Removed empty sidebar from Progress page.
2012-08-20 14:15:41 -04:00
Bridger Maxwell
1159b14b0d
Merge branch 'master' of github.com:MITx/mitx
2012-08-20 14:08:48 -04:00
Bridger Maxwell
70c7ee42ed
Fixed tests from profile->progress rename.
2012-08-20 14:08:42 -04:00
John Jarvis
5f72e0c7a0
moving all requirements that use a repo to repo-requirements.txt including github requirements
2012-08-20 14:05:51 -04:00
thomasxiii
38f96b72a1
Merge pull request #463 from MITx/feature/kfiedler/courseware-style
...
Feature/kfiedler/courseware style
2012-08-20 10:58:46 -07:00
Bridger Maxwell
92a293f07e
Removed profile info from Profile page and renamed it to Progress.
2012-08-20 13:50:28 -04: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
Kyle Fiedler
ab28e08591
Added new button classes
2012-08-20 13:22:21 -04:00
kimth
987d7bcc29
book_url doesn't come from settings
2012-08-20 12:40:34 -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
f2197227c1
add out-of-date message to check_course
2012-08-20 09:26:16 -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
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
kimth
2f63a9b403
Limit number of files that can be uploaded at once
2012-08-19 20:12:01 -04:00
David Ormsbee
a729e16e88
Merge pull request #459 from MITx/feature/bridger/new_wiki
...
Fix broken dependency updates for wiki
2012-08-19 13:05:59 -07:00
David Ormsbee
e79d56376a
Use -e in django-wiki requirement
2012-08-19 16:03:35 -04:00
Bridger Maxwell
24c0b5145d
Updated django-wiki and plugin imports.
2012-08-19 14:41:49 -04: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
David Ormsbee
9c4b1d7067
Merge pull request #456 from MITx/kimth/multiple-fileupload
...
Kimth/multiple fileupload
2012-08-19 09:24:27 -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
