Victor Shnayder
|
d7484c5e10
|
Merge pull request #1423 from MITx/feature/jth/remove_un-enroll_all
removed un-enroll all button for fear of disaster
|
2013-03-05 10:18:30 -08:00 |
|
Will Daly
|
a018b8ac38
|
Merge pull request #1599 from MITx/feature/deena/testing
Feature/deena/testing
|
2013-03-05 09:48:23 -08:00 |
|
Jay Zoldak
|
b0a018195a
|
Pep8 fixes for tests
|
2013-03-05 11:53:00 -05:00 |
|
Jay Zoldak
|
cee24c5cb2
|
Import existing UserFactory
|
2013-03-05 11:18:07 -05:00 |
|
chrisndodge
|
692c423634
|
Merge pull request #1600 from MITx/bug/christina/misc
Don't collapse multiple underscores for asset names.
|
2013-03-05 08:15:54 -08:00 |
|
cahrens
|
cc234d45e7
|
Don't collapse multiple underscores for asset names.
#202
|
2013-03-05 10:55:27 -05:00 |
|
Christina Roberts
|
5b3158444e
|
Merge pull request #1595 from MITx/bug/christina/misc
Selenium tests to go with pull request 1577 (bug #216)
|
2013-03-05 07:50:15 -08:00 |
|
Will Daly
|
2fd9ccece1
|
Fixed whitespace issues; removed a test that made no assertions
|
2013-03-05 09:34:52 -05:00 |
|
Will Daly
|
437aadb28e
|
Cleaned up some tests; deleted skip tests
|
2013-03-05 09:32:20 -05:00 |
|
Will Daly
|
faf5c3f0a2
|
Updated Deena's tests after merge with master to ensure that none
of the tests fail. Deleted some tests.
|
2013-03-05 09:10:02 -05:00 |
|
cahrens
|
d891361b4a
|
Merge branch 'master' into bug/christina/misc
|
2013-03-05 09:09:08 -05:00 |
|
chrisndodge
|
59250225d9
|
Merge pull request #1592 from MITx/fix/cdodge/optimize-instructor-dashboard
additional courseware view optimizations. Do a 'depth' fetch on the sele...
|
2013-03-04 17:19:53 -08:00 |
|
Chris Dodge
|
6ce3493f00
|
add comment
|
2013-03-04 19:59:18 -05:00 |
|
Victor Shnayder
|
a58e7c7a26
|
Merge pull request #1596 from MITx/jth/admindash
Cast cursor responses as lists. MySQL returns them as tuples.
|
2013-03-04 15:39:09 -08:00 |
|
John Hess
|
94db91fcef
|
Cast cursor responses as lists. MySQL returns them as tuples.
Removed print statemetns
Moved import call to top of file
|
2013-03-04 18:19:24 -05:00 |
|
cahrens
|
b0106a41c7
|
make branch
|
2013-03-04 16:42:04 -05:00 |
|
Will Daly
|
2436d59e14
|
Merge branch 'master' into feature/deena/testing
Conflicts:
cms/djangoapps/contentstore/tests/factories.py
lms/djangoapps/courseware/tests/test_access.py
|
2013-03-04 16:30:41 -05:00 |
|
Jay Zoldak
|
22420adc9a
|
Merge pull request #1594 from MITx/bug/dhm/course_update_js
Provide convenience converter of the grading policy but don't save it on
|
2013-03-04 13:29:10 -08:00 |
|
Don Mitchell
|
0c4a52567e
|
Provide convenience converter of the grading policy but don't save it on
the object.
|
2013-03-04 16:13:29 -05:00 |
|
Don Mitchell
|
ecb136e582
|
Merge pull request #1586 from MITx/feature/cdodge/make-update-templates-django-admin-util
move call to update_templates on service startup into a django-admin com...
|
2013-03-04 13:11:46 -08:00 |
|
Christina Roberts
|
d0eefc6a67
|
Merge pull request #1580 from MITx/bug/dhm/course_update_js
Fix for script tags w/in json objects being oddly evaluated on html page
|
2013-03-04 12:42:42 -08:00 |
|
Don Mitchell
|
020e1e94fb
|
Move side effecting of definition for grader to the course_module and
don't make caller responsible.
|
2013-03-04 15:38:47 -05:00 |
|
Victor Shnayder
|
df5ad6ba42
|
Merge pull request #1574 from MITx/fix/will/cs191_matrix_style_bug
Fix/will/cs191 matrix style bug
|
2013-03-04 12:28:12 -08:00 |
|
David Ormsbee
|
42a944bb86
|
Merge pull request #1593 from MITx/hack/dave/submission_history
It's not UTC time, it's whatever the local settings are set to
|
2013-03-04 12:20:41 -08:00 |
|
David Ormsbee
|
01a1bf6b6f
|
It's not UTC time, it's whatever the local settings are set to (New York in prod)
|
2013-03-04 15:19:24 -05:00 |
|
Chris Dodge
|
a81e9a673c
|
additional courseware view optimizations. Do a 'depth' fetch on the selected section so that it does a more efficient set of queries to the database. Also, in the CachingDescriptorSystem, if we have a 'cache miss', when we do the actual fetch (which creates a new 'system'), keep that fetched data around in our own collection, in case it is queried again
|
2013-03-04 14:59:45 -05:00 |
|
David Ormsbee
|
9d2a2cbc2f
|
Merge pull request #1555 from MITx/feature/jkarni/foldit-api
Feature/jkarni/foldit api
|
2013-03-04 11:40:43 -08:00 |
|
David Ormsbee
|
b0afbba58d
|
Merge pull request #1516 from MITx/hack/dave/submission_history
Record and report submission history for a problem
|
2013-03-04 11:39:54 -08:00 |
|
Victor Shnayder
|
c0bb4ee22a
|
Merge pull request #1588 from MITx/bugfix/dave/username_space_msg
Tell user that spaces aren't allowed in usernames (requested by Teppo).
|
2013-03-04 10:25:34 -08:00 |
|
David Ormsbee
|
88a30cb733
|
Fixes in response to Victor's comments.
|
2013-03-04 13:21:19 -05:00 |
|
David Ormsbee
|
f33c00243f
|
Merge pull request #1591 from MITx/fix/cdodge/optimize-instructor-dashboard
add performance optimizations (efficiently get all course content) to instructor dashboard
|
2013-03-04 09:55:00 -08:00 |
|
Don Mitchell
|
de3a75d29d
|
Don't prepopulate models which may have script tags in their payloads
but fetch async via json get.
|
2013-03-04 12:54:58 -05:00 |
|
David Ormsbee
|
e4f1dab409
|
Merge pull request #1590 from MITx/fix/cdodge/optimize-progress-summary-page
add depth parameters when loading course and student-state caches. This ...
|
2013-03-04 09:54:49 -08:00 |
|
Chris Dodge
|
b482e2ac21
|
add performance optimizations (efficiently get all course content)
|
2013-03-04 12:51:21 -05:00 |
|
Don Mitchell
|
4245816e9e
|
Separate bug on virgin grading policy edits not being persisted b/c the
definition not being updated when using defaults. Not sure why this
passed before.
|
2013-03-04 12:15:28 -05:00 |
|
Chris Dodge
|
4892897c0d
|
add depth parameters when loading course and student-state caches. This will make fewer (but fatter) queries to the database
|
2013-03-04 12:03:25 -05:00 |
|
David Ormsbee
|
a00f11c1ff
|
Tell user that spaces aren't allowed in usernames (requested by Teppo).
|
2013-03-04 11:17:29 -05:00 |
|
Carlos Andrés Rocha
|
9b1ae9f99c
|
Merge pull request #1583 from MITx/fix/ned/clean-ups
Fix/ned/clean ups
|
2013-03-04 08:11:29 -08:00 |
|
David Ormsbee
|
3a748b1e79
|
Merge pull request #1587 from MITx/feature/kevin/cohorts_take_3
Feature/kevin/cohorts take 3
|
2013-03-04 07:59:30 -08:00 |
|
Your Name
|
a9804a3349
|
proper tab
|
2013-03-04 10:57:37 -05:00 |
|
Ned Batchelder
|
7c8a90229e
|
Use 'is None' and 'is not None'
|
2013-03-04 10:57:25 -05:00 |
|
Ned Batchelder
|
97f1e04282
|
Fix some 2-space indents
|
2013-03-04 10:57:25 -05:00 |
|
Chris Dodge
|
f21ff7bbfa
|
update comment
|
2013-03-04 09:15:53 -05:00 |
|
Chris Dodge
|
f057ec5a04
|
add new file to commit
|
2013-03-04 08:29:56 -05:00 |
|
Chris Dodge
|
2d44f51cbc
|
Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/make-update-templates-django-admin-util
|
2013-03-04 08:08:51 -05:00 |
|
Chris Dodge
|
6bacbafb6f
|
move call to update_templates on service startup into a django-admin command
|
2013-03-04 08:06:58 -05:00 |
|
chrisndodge
|
999ed17e6d
|
Merge pull request #1585 from MITx/fix/cdodge/fix-broken-test
need to pass commit parameter
|
2013-03-02 18:27:12 -08:00 |
|
Chris Dodge
|
3f9bc86c9e
|
need to pass commit parameter
|
2013-03-02 21:26:24 -05:00 |
|
chrisndodge
|
f543ad4932
|
Merge pull request #1584 from MITx/fix/cdodge/fix-sporadic-test-error-in-metadata-inheritance
do the metadata comparison on the parent not the course as we don't actu...
|
2013-03-02 18:02:34 -08:00 |
|
Kevin Chugh
|
949c95ea00
|
better fix
|
2013-03-02 19:51:59 -05:00 |
|