Chris Dodge
b17836f232
swallow exceptions when generating thumbnails
2012-10-12 12:27:21 -04:00
chrisndodge
ff25d13256
Merge pull request #868 from MITx/fix/cdodge/cas-delete-regression
...
DraftMongoContentStore needs to both delete the draft *and* the non-draf...
2012-10-12 08:17:35 -07:00
chrisndodge
750e70e842
Merge pull request #878 from MITx/feature/cale/edge-landing-page
...
Feature/cale/edge landing page
2012-10-12 08:01:46 -07:00
Chris Dodge
281f194b2a
per feedback, change back 'draft-aware' modulestore to not delete the published copy. In delete_item in views.py do the logic to determine whether we should be using a 'draft-aware' modulestore or not, based on the category type
2012-10-12 11:00:34 -04:00
Chris Dodge
1015b3a974
DraftMongoContentStore needs to both delete the draft *and* the non-draft entities
2012-10-12 11:00:34 -04:00
Chris Dodge
14a1a7da31
allow importing of .tar.gz packages of courseware
2012-10-12 10:33:31 -04:00
Calen Pennington
4814f8c38e
Cleaning up logos for edge landing page
2012-10-12 10:31:46 -04:00
Calen Pennington
c814758715
Merge pull request #866 from MITx/feature/cdodge/cms-import
...
Feature/cdodge/cms import
2012-10-11 19:22:19 -07:00
Victor Shnayder
c420c67b82
Actually implement exact vs factors-don't-matter comparisons in chemcalc
2012-10-11 17:40:26 -04:00
Chris Dodge
82abdd07dc
respond to some of Cale's comments
2012-10-11 16:23:28 -04:00
Tom Giannattasio
c3e2a544da
tweaks to datepicker and calendar
2012-10-11 14:53:45 -04:00
Chris Dodge
bf392e360a
on import set course metadata to hide the progress tab since we don't yet support grading policies
2012-10-11 13:52:15 -04:00
Chris Dodge
a521ea239f
baseline working for importing courseware and static assets
2012-10-11 13:41:16 -04:00
David Ormsbee
9c0e554992
Merge pull request #855 from MITx/bug/tomg/nested-hints
...
tweaked collapsible selector to target the proper section
2012-10-11 10:25:21 -07:00
Chris Dodge
bb46c5f909
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-import
2012-10-11 12:51:37 -04:00
Chris Dodge
ab1decd97b
import static assets. Also consolidate asset import/thumbnail generation into a single code base
2012-10-11 12:51:33 -04:00
Calen Pennington
9239da678a
Mark is_draft as system metadata, so that users don't edit it
2012-10-11 12:32:23 -04:00
Calen Pennington
5ae34aa4ed
Add heartbeat to cms
2012-10-11 12:32:23 -04:00
Calen Pennington
bc69ed8c9e
Move logsettings to common, so that it's shared between cms and lms
2012-10-11 12:31:52 -04:00
Calen Pennington
8eb4390def
Enable authentication in mongo modulestore and contentstore
2012-10-11 12:31:51 -04:00
Lyla Fischer
0cdbd170c2
fixed documentation
2012-10-11 12:23:06 -04:00
Lyla Fischer
1bd2cb4f85
quick bug fix
2012-10-11 12:12:34 -04:00
Chris Dodge
6b5b6342d2
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-import
...
Conflicts:
common/lib/xmodule/xmodule/contentstore/content.py
2012-10-11 12:11:48 -04:00
Chris Dodge
a84ef1b243
wip: static asset import
2012-10-11 12:10:28 -04:00
Lyla Fischer
331f35145f
fixed default tolerance on numericalresponse
2012-10-11 11:59:27 -04:00
Chris Dodge
2153aae62c
schema change to better normalize asset->thumbnail relationships
2012-10-11 11:57:56 -04:00
Lyla Fischer
f26a4af75c
thinks work, they just don't display prettily, and it is hard to actually use the assets due to links
2012-10-11 11:57:14 -04:00
Lyla Fischer
deca6e66b0
cleaned filenames
2012-10-11 11:56:53 -04:00
Александр
64565692ab
removed obsolete crystalresponse
2012-10-11 18:41:25 +03:00
Александр
2b200b6e20
changed cryst inputtype to be similar to textline
2012-10-11 18:40:05 +03:00
Александр
dfb9b49c4d
added new inputtypes to list, due to that check button appears
2012-10-11 18:37:10 +03:00
Александр
c7654b4d1e
cryst inputtypes template - same as textline + js files
2012-10-11 18:33:49 +03:00
Victor Shnayder
2b6e935985
Initial refactor of inputtypes into classes.
...
- for now, wraps existing render functions as separate classes
- a bit of cleanup in how it's called from capa_problem
- initial tests to make sure things are testable.
2012-10-11 11:26:49 -04:00
Victor Shnayder
cb291871b1
Better error checking when content authors mess up answers to numerical response problems.
...
- give different errors when student or author stuff is messed up (I was seeing "No way to interpret '3' as a number" :P)
- preserve traceback in exception
2012-10-11 11:25:40 -04:00
Victor Shnayder
8cdd5b35c0
add note about randomization, based on discussion with Piotr
2012-10-11 11:15:58 -04:00
David Ormsbee
05c5ac3482
Allow people who haven't activated to reset their password.
2012-10-11 11:04:18 -04:00
Tom Giannattasio
00e2f093b9
removed extra padding on nested sections
2012-10-10 16:19:03 -04:00
Tom Giannattasio
6f60af71fd
tweaked collapsible selector to target the proper section; functionality like this should have its own class to avoid selector conflicts, but it may be too late to fix this now
2012-10-10 16:14:32 -04:00
Victor Shnayder
db17580710
Chemcalc refactor, improvement
...
* Move tests into a separate file
* add a chemical_equations_equal function to compare equations, not expressions
* rename some internal functions with a leading _
2012-10-10 15:49:09 -04:00
Victor Shnayder
d10b568c13
Add chemcalc to capa package, to context for customresponse
2012-10-10 15:49:09 -04:00
Victor Shnayder
c30f57022b
Move more tests around, start prep for inputtype refactor
2012-10-10 15:48:33 -04:00
Александр
f374a33606
added not hidden field
2012-10-10 20:54:17 +03:00
Calen Pennington
bfb49133d1
Merge pull request #843 from MITx/feature/cdodge/subsection-edit-page
...
Feature/cdodge/subsection edit page
2012-10-10 10:26:27 -07:00
Calen Pennington
7c3d5d58b7
Fix up how parent locations interact w/ draft mode when creating new units
2012-10-10 12:49:53 -04:00
Calen Pennington
5f0e237ab0
Store the id of the publishing user on publish
2012-10-10 12:49:53 -04:00
Calen Pennington
0aa79ed479
Remove extraneous TODO comment
2012-10-10 12:49:52 -04:00
Calen Pennington
5dcf388b1c
Add line numbers and wrapping to xml, json, and html editors
2012-10-10 12:49:52 -04:00
Calen Pennington
b079b336db
Make updating children and data of a draft make the correct checks for whether the document is already a draft or not
2012-10-10 12:49:51 -04:00
Calen Pennington
310f26a6de
Basic implementation of draft, public and private modes
2012-10-10 12:49:51 -04:00
Calen Pennington
05c02f0d5f
Fixing tests from changes around draft mode
2012-10-10 12:49:51 -04:00
