Vik Paruchuri
|
012d8107fa
|
Get image upload, check for issues, upload to S3
|
2013-01-30 10:04:14 -05:00 |
|
Vik Paruchuri
|
0c0a897127
|
Work on uploading image submission to S3
|
2013-01-30 09:36:01 -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
|
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
|
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 |
|
Vik Paruchuri
|
fde370bd92
|
Fix notification issue, sanitize input html
|
2013-01-29 21:24:04 -05:00 |
|
Vik Paruchuri
|
a5daf1f34d
|
Perhaps properly sanitize js
|
2013-01-29 21:24:04 -05:00 |
|
Vik Paruchuri
|
2f2b5fa753
|
Fix unicode problem
|
2013-01-29 21:24:04 -05:00 |
|
Vik Paruchuri
|
4140b74e47
|
Fix progress return
|
2013-01-29 21:24:03 -05:00 |
|
Vik Paruchuri
|
cee69bb765
|
Fix return of score to progress tab
|
2013-01-29 21:24:03 -05:00 |
|
Vik Paruchuri
|
252e54fef5
|
Add in is_scored boolean, remove some noisy debug statements
|
2013-01-29 21:24:03 -05:00 |
|
Vik Paruchuri
|
3531bce7d3
|
Fix score checking, latest post assessment scraping
|
2013-01-29 21:24:02 -05:00 |
|
Vik Paruchuri
|
29f738f7ce
|
Minor count fix
|
2013-01-29 21:24:02 -05:00 |
|
Vik Paruchuri
|
5291271591
|
Add in some minimal checking to make sure that the max score and scores for each rubric point are 3
|
2013-01-29 19:56:13 -05:00 |
|
David Ormsbee
|
40d59faa68
|
Merge pull request #1330 from MITx/diana/open-ended-ui-updates
Rubric Integration and other UI improvements
|
2013-01-29 14:10:18 -08:00 |
|
Diana Huang
|
cb77209d3c
|
Add missing requirejs for xmodule jasmine tests
|
2013-01-29 16:09:27 -05:00 |
|
Chris Dodge
|
5a4c0fb907
|
imports should have a marketing video. Treat it as a warning as every course might not have one.
|
2013-01-29 09:38:59 -05:00 |
|
Diana Huang
|
1d4b674c79
|
Address code review feedback
|
2013-01-28 10:57:06 -05:00 |
|
Victor Shnayder
|
6847779f22
|
Merge remote-tracking branch 'origin/master' into feature/victor/cohorts
Conflicts:
common/djangoapps/student/models.py
|
2013-01-26 12:37:26 -05:00 |
|
ichuang
|
c56982e6f0
|
fix bug in video player:if from=xx:xx:xx is used then bkgrnd flashes
|
2013-01-25 16:45:16 -05:00 |
|
Victor Shnayder
|
87e92644b6
|
Make all tests pass
caveat: with a bit of hackery. Need to do better testing once things are live.
|
2013-01-25 16:13:55 -05:00 |
|
Diana Huang
|
5e34f38ca9
|
Better error handling.
|
2013-01-25 13:46:57 -05:00 |
|
Diana Huang
|
47c24d8e7e
|
Raise smarter exceptions when parsing rubrics.
|
2013-01-25 13:33:35 -05:00 |
|
Victor Shnayder
|
22ccf9c500
|
Some test cleanups
|
2013-01-24 17:33:25 -05:00 |
|
Jay Zoldak
|
896933a3c4
|
Fix broken IE
|
2013-01-24 17:02:18 -05:00 |
|
Victor Shnayder
|
69711a91ff
|
Fix inline discussion cohorting, debug logging
|
2013-01-24 16:58:19 -05:00 |
|
Victor Shnayder
|
3bfe9decf4
|
Change config keys to use underscores for consistency with other policy keys
|
2013-01-24 15:14:34 -05:00 |
|
Victor Shnayder
|
9e84ae14d4
|
Started integration work with Kevin's cohort changes
- Create new cohorts.py file
- moved code there from models.py
- implemented necessary functions.
Next: testing :)
|
2013-01-24 15:14:33 -05:00 |
|
Victor Shnayder
|
0d41a04490
|
fix line length
|
2013-01-24 15:12:52 -05:00 |
|
Victor Shnayder
|
90a5703419
|
Test for cohort config
|
2013-01-24 15:12:52 -05:00 |
|
Victor Shnayder
|
f005b70f3b
|
Minor test cleanups
|
2013-01-24 15:12:52 -05:00 |
|
Victor Shnayder
|
fa17913a91
|
is_cohorted course descriptor property, docs
|
2013-01-24 15:12:52 -05:00 |
|
David Ormsbee
|
e074c629fc
|
Merge pull request #1344 from MITx/bugfix/brian/pearson-reg-end-date
add UTC time to registration end date
|
2013-01-24 09:27:11 -08:00 |
|
Don Mitchell
|
f2b43ec459
|
Merge pull request #1343 from MITx/feature/christina/tiny-mce
Make code inline instead of block.
|
2013-01-24 05:34:36 -08:00 |
|
Brian Wilson
|
0cb5f101ae
|
add UTC time to registration end date
|
2013-01-24 01:18:10 -05:00 |
|
cahrens
|
711cc9a041
|
Tell tinyMCE to not change image paths.
#143
|
2013-01-23 20:18:28 -05:00 |
|
Diana Huang
|
cc67017d4c
|
Merge branch 'master' into diana/open-ended-ui-updates
|
2013-01-23 16:45:40 -05:00 |
|
cahrens
|
4a79643fde
|
Make code inline instead of block.
|
2013-01-23 16:43:49 -05:00 |
|
Victor Shnayder
|
abcc5c0204
|
Merge pull request #1342 from MITx/feature/cdodge/add-standard-problem-metadata
update templates to include attemps and weight values. Also update capa_...
|
2013-01-23 13:40:46 -08:00 |
|
Chris Dodge
|
2856971b45
|
update templates to include attemps and weight values. Also update capa_module.py to accept empty strings ('') to mean 'default value'
|
2013-01-23 16:36:16 -05:00 |
|
chrisndodge
|
fe8e25e72d
|
Merge pull request #1341 from MITx/feature/christina/tiny-mce
Toggling of code should mark editor as dirty.
|
2013-01-23 13:25:01 -08:00 |
|
cahrens
|
2969a9e48d
|
Toggling of code should mark editor as dirty.
|
2013-01-23 16:19:17 -05:00 |
|