Chris Dodge
|
c676046341
|
adding exporting of tabs and custom_tags. Also added unit tests
|
2013-01-30 13:25:17 -05:00 |
|
David Ormsbee
|
f295dae34e
|
Merge pull request #1383 from MITx/feature/jarv/certificate-restriction
Updating FAQ text
|
2013-01-30 10:06:43 -08:00 |
|
John Jarvis
|
d52a619d74
|
Updating FAQ text
|
2013-01-30 13:02:42 -05:00 |
|
Vik Paruchuri
|
4840205554
|
Make CSS nicer
|
2013-01-30 13:00:03 -05:00 |
|
David Ormsbee
|
fecad2a3e1
|
Merge pull request #1382 from MITx/feature/brian/pearson-status
pearson_dump: prettify, add missing error, provide default filename
|
2013-01-30 09:55:45 -08:00 |
|
Vik Paruchuri
|
eb5d14a2a9
|
Fix string interpolation in JS
|
2013-01-30 12:31:02 -05:00 |
|
Brian Wilson
|
a6a58d0e2a
|
pearson_dump: prettify, add missing error, provide default filename
|
2013-01-30 12:15:12 -05:00 |
|
Christina Roberts
|
91b3a220b8
|
Merge pull request #1367 from MITx/fix/cdodge/static-tab-reordering
support reordering of static tabs in studio
|
2013-01-30 08:51:36 -08:00 |
|
Chris Dodge
|
7f32aae47d
|
rename method to something that actually better reflects what it is doing. Also rename a variable to help with readability
|
2013-01-30 11:50:11 -05:00 |
|
Chris Dodge
|
e5115953ad
|
rework redorder tabs so that we account for the fact that static tabs can be in any arbitrary order (with respect to non-static tabs) when working with an imported course
|
2013-01-30 11:36:28 -05:00 |
|
Christina Roberts
|
8720d1ac3a
|
Merge pull request #1379 from MITx/bug/dhm/grading
Catch save error and throw it in the user's face (bug 147).
|
2013-01-30 08:34:32 -08:00 |
|
Don Mitchell
|
19927a83a5
|
Ensure settings and course info CRUD operations tell the user if there's
a server error and pull the server error handler into a common function.
|
2013-01-30 11:24:55 -05:00 |
|
chrisndodge
|
67775fbfa9
|
Merge pull request #1377 from MITx/feature/christina/misc
Bug fixes for problem progress not updating.
|
2013-01-30 08:24:38 -08:00 |
|
Vik Paruchuri
|
3a2d851132
|
Images pass through fine
|
2013-01-30 11:17:38 -05:00 |
|
Vik Paruchuri
|
6c21469bed
|
Fix some image upload issues
|
2013-01-30 11:11:23 -05:00 |
|
Vik Paruchuri
|
d6947f1da7
|
Proper image submission, error handling
|
2013-01-30 11:02:31 -05:00 |
|
Diana Huang
|
b38595f115
|
Fix the fixtures, add new tests, remove useless code
from the original JS
|
2013-01-30 10:50:47 -05:00 |
|
David Ormsbee
|
d0ea29358a
|
Merge pull request #1381 from MITx/press/bostonX
fix copy+paste bug.
|
2013-01-30 07:48:22 -08:00 |
|
Vik Paruchuri
|
bae898edb0
|
Auto convert image to link, display inside student answer
|
2013-01-30 10:47:50 -05:00 |
|
Victor Shnayder
|
99dd9636ce
|
fix copy+paste bug.
|
2013-01-30 10:43:36 -05:00 |
|
Your Name
|
043d962329
|
Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes
|
2013-01-30 10:26:23 -05:00 |
|
Vik Paruchuri
|
012d8107fa
|
Get image upload, check for issues, upload to S3
|
2013-01-30 10:04:14 -05:00 |
|
Christina Roberts
|
fd4b3f9489
|
Merge pull request #1332 from MITx/fix/cdodge/unit-test-of-draft-store
add unit test to test DraftModuleStore.get_items() fix
|
2013-01-30 06:49:53 -08:00 |
|
Chris Dodge
|
dbf15fc2ac
|
add comment on draft store test which explains test success is just for get_items() not to throw an exception when passed in a course_id
|
2013-01-30 09:46:38 -05:00 |
|
Chris Dodge
|
74fcf96611
|
don't hard code the ordering of the tabs in the test. Take the current ordering defintion (in the test data) and reverse it
|
2013-01-30 09:43:57 -05:00 |
|
Don Mitchell
|
ab4fd03dd8
|
Catch any and all save errors
|
2013-01-30 09:43:27 -05:00 |
|
Vik Paruchuri
|
0c0a897127
|
Work on uploading image submission to S3
|
2013-01-30 09:36:01 -05:00 |
|
Diana Huang
|
4df62d968d
|
Fix up new jasmine tests
|
2013-01-30 09:31:42 -05:00 |
|
Diana Huang
|
ce8a48405b
|
Clean up some JS errors showing up in the xmodule jasmine tests
|
2013-01-30 09:31:20 -05:00 |
|
cahrens
|
3c1c61fb19
|
Fixes for https://edx.lighthouseapp.com/projects/102637/tickets/144 (progress tab not updating).
|
2013-01-30 09:23:07 -05:00 |
|
Calen Pennington
|
2854d7d066
|
Point course_image.jpg at the correct place in the /static url space
|
2013-01-30 09:12:50 -05:00 |
|
Calen Pennington
|
07487a8d8f
|
Use descriptor when setting up replace_urls, as it's been created at that point
|
2013-01-30 09:12:50 -05:00 |
|
Calen Pennington
|
e773b8e7b1
|
Fix import error
|
2013-01-30 09:12:50 -05:00 |
|
Calen Pennington
|
9ae83338c6
|
Whitespace cleanup
|
2013-01-30 09:12:50 -05:00 |
|
Calen Pennington
|
95f2c9e275
|
Standardize how static urls are replaced by modules in their own html
|
2013-01-30 09:12:50 -05:00 |
|
Calen Pennington
|
89f984c08b
|
Prefix courseware urls with /static, since they are no longer served through collectstatic
|
2013-01-30 09:12:50 -05:00 |
|
Calen Pennington
|
d132f2e18a
|
Only put data repos in STATICFILES_DIRS if we're serving them from django (which is only in dev)
|
2013-01-30 09:12:50 -05:00 |
|
Vik Paruchuri
|
d06f5f7791
|
Fix file upload stuff, debug some image check routines
|
2013-01-30 09:02:04 -05:00 |
|
Vik Paruchuri
|
0622dc995d
|
Javascript to handle file uploads
|
2013-01-29 22:42:08 -05:00 |
|
Vik Paruchuri
|
fbdc190a58
|
Add in file upload ability
|
2013-01-29 22:16:48 -05:00 |
|
Vik Paruchuri
|
f367b7ace2
|
Change ruby version
|
2013-01-29 21:53:36 -05:00 |
|
Vik Paruchuri
|
b730c25056
|
Fix rubric rendering
|
2013-01-29 21:51:48 -05:00 |
|
Vik Paruchuri
|
08e06f8719
|
Fix some tab problems
|
2013-01-29 21:39:54 -05:00 |
|
Vik Paruchuri
|
01f218b7f8
|
Fix some tab issues from the rebase
|
2013-01-29 21:36:55 -05:00 |
|
Vik Paruchuri
|
9c5fe05689
|
Update reqs for pillow, work on file uploads
|
2013-01-29 21:29:10 -05:00 |
|
Vik Paruchuri
|
4d1f9d2edf
|
Function to upload stuff to S3
|
2013-01-29 21:24:05 -05:00 |
|
Vik Paruchuri
|
929160e180
|
Add in ability to validate images and image paths (urls)
|
2013-01-29 21:24:04 -05:00 |
|
Vik Paruchuri
|
5d4ad4b8ca
|
Simple method to count colors in an image
|
2013-01-29 21:24:04 -05:00 |
|
Vik Paruchuri
|
255405d0bf
|
Automatically show results at certain points (when need to reset, when finished with a problem, etc)
|
2013-01-29 21:24:04 -05:00 |
|
Vik Paruchuri
|
9e673e8aa7
|
Remove wrapper p tags
|
2013-01-29 21:24:04 -05:00 |
|