Calen Pennington
cbed66280a
Fix pep8 and pylint errors
2013-03-20 13:20:28 -04:00
Calen Pennington
36443163f6
Force instantiation of the user before querying
...
Without accessing .pk, it's possible for the user object to still be a
SimpleLazyObject, which breaks Django's query engine
http://stackoverflow.com/questions/11875737/django-filtering-drafts-by-user-causes-error
2013-03-20 12:59:34 -04:00
chrisndodge
f7700dfc6a
Merge pull request #1700 from MITx/feature/christina/mongo-debug-toolbar
...
Reduce pep8 warnings.
2013-03-20 08:27:32 -07:00
chrisndodge
ba0b794803
Merge pull request #1704 from MITx/fix/btalbot/studio-updatedelete
...
studio - added in basic JS confirm UI when deleting course updates
2013-03-20 08:26:32 -07:00
Brian Talbot
f181a454e4
studio - added in basic JS confirm UI when deleting course updates
2013-03-20 11:20:16 -04:00
Ned Batchelder
3a77426417
Cale said, 'we should delete prod-requirements.txt'
2013-03-20 11:16:30 -04:00
Diana Huang
2415680efd
Merge pull request #1677 from MITx/victor/fix-auto-cohorting
...
Fix randomness bug in cohort placement
2013-03-20 07:50:43 -07:00
Diana Huang
e0184453a1
Merge pull request #1702 from MITx/victor/remove-legal-council-job
...
Remove associate legal council posting, per request from Tess
2013-03-20 07:49:21 -07:00
Alexander Kryklia
05ba082c8f
Merge pull request #1692 from MITx/fix/valera/polls_firefox_button_not_blue
...
Bug fix for Polls tool.
2013-03-20 01:53:15 -07:00
Victor Shnayder
21e58d009a
Remove associate legal council posting, per request from Tess
2013-03-20 00:05:13 -04:00
cahrens
f5bae8d8e3
Reduce pep8 warnings.
2013-03-19 17:29:06 -04:00
chrisndodge
8cbf24fd73
Merge pull request #1698 from MITx/feature/christina/mongo-debug-toolbar
...
Have to explicitly specify safe option on mongo insert, remove, update b...
2013-03-19 14:24:19 -07:00
cahrens
b5a587d8d0
Have to explicitly specify safe option on mongo insert, remove, update because the debug toolbar specifies a default of safe=False.
2013-03-19 16:57:19 -04:00
Valera Rozuvan
0884051b32
Fixed bug where in firefox a marked poll button was not highlighted in blue.
2013-03-19 19:29:09 +02:00
e0d
39d451d92a
Merge pull request #1687 from MITx/hotfix/edz/pinning
...
Allow backwards compatibility for forums pinning UI.
2013-03-19 09:31:14 -07:00
chrisndodge
a245cae4ef
Merge pull request #1691 from MITx/feature/cale/fix-metadata-inheritance
...
Feature/cale/fix metadata inheritance
2013-03-19 07:56:21 -07:00
Calen Pennington
8fda5af4e4
Comment cleanup
2013-03-19 10:54:46 -04:00
Calen Pennington
0209c883bb
Remove trailing whitespace
2013-03-19 10:41:38 -04:00
Calen Pennington
94d3ccf674
Always compute the metadata inheritance tree, even on a course module, so that when walking down the tree, we always get the right data
2013-03-19 10:41:12 -04:00
Jay Zoldak
a70a23a48e
Merge pull request #1680 from MITx/feature/will/courseware_lettuce_tests
...
Feature/will/courseware lettuce tests
2013-03-18 12:24:19 -07:00
Don Mitchell
c50bf5678e
Merge pull request #1688 from MITx/fix/cdodge/add-500-404-templates-to-Studio
...
Fix/cdodge/add 500 404 templates to studio
2013-03-18 12:11:39 -07:00
Chris Dodge
3e28ffa4f7
remove import and shortened line length
2013-03-18 15:10:17 -04:00
Chris Dodge
dc78a08ce5
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/add-500-404-templates-to-Studio
2013-03-18 15:05:37 -04:00
VikParuchuri
9a59336b5e
Merge pull request #1676 from MITx/fix/vik/xblock-state-overwrite
...
Fix version handling for combined open ended
2013-03-18 11:58:38 -07:00
Jay Zoldak
b6e82afb0e
Merge pull request #1681 from MITx/fix/will/fix_broken_jasmine_lms_tests
...
Fix/will/fix broken jasmine lms tests
2013-03-18 11:53:22 -07:00
Will Daly
568f557dfc
Pep8 fixes
...
Changed constant to uppercase
2013-03-18 13:57:26 -04:00
chrisndodge
eff6f1d182
Merge pull request #1690 from MITx/feature/cale/no-student-state-instructor-dash
...
Skip over fields that are scoped to students when looping through the Co...
2013-03-18 10:21:37 -07:00
Jay Zoldak
2b14960519
Merge pull request #1689 from MITx/fix/cale/pylint-cleanup
...
Small pylint cleanup
2013-03-18 10:14:49 -07:00
Calen Pennington
3fbde821dd
Skip over fields that are scoped to students when looping through the CourseModule fields in the instructor dashboard
2013-03-18 13:09:10 -04:00
Chris Dodge
651465f1ad
add HTML templates for 404/500 errors
2013-03-18 12:56:17 -04:00
Calen Pennington
a4f10bfdaf
Small pylint cleanup
2013-03-18 12:45:46 -04:00
Chris Dodge
2b677544a5
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/add-500-404-templates-to-Studio
2013-03-18 09:39:47 -04:00
chrisndodge
27be7e159a
Merge pull request #1685 from MITx/feature/cale/string_days_early
...
Handle days_early_for_beta possibly being a string
2013-03-16 17:48:43 -07:00
Calen Pennington
9dda977ece
Handle days_early_for_beta possibly being a string
2013-03-16 20:38:32 -04:00
Carlos Andrés Rocha
1b619ac1c6
Merge pull request #1684 from MITx/content/rocha/xblock-announcement-2
...
XBlock SDK announcement
2013-03-16 14:47:50 -07:00
Carlos Andrés Rocha
a4451bdcd2
XBlock SDK announcement
...
LMS Lighthouse [#261 ]
2013-03-16 14:26:14 -07:00
David Ormsbee
8be15d8625
Merge pull request #1683 from MITx/feature/kevin/pinning_patch
...
Feature/kevin/pinning patch
2013-03-15 22:22:28 -07:00
Victor Shnayder
d91008b73a
Prevent random.Random() from running at import time.
2013-03-15 19:40:47 -07:00
brianhw
b5cf9b326e
Merge pull request #1679 from MITx/content/rocha/xblocks-announcement
...
Content/rocha/xblocks announcement
2013-03-15 14:27:01 -07:00
Vik Paruchuri
e4efda9a47
Reformat code
2013-03-15 16:21:36 -04:00
Will Daly
5fd1e7426d
Lettuce tests now import one_time_startup.py to ensure
...
that mongo caches are initialized for the test database.
This avoids a warning from the mongo modulestore.
2013-03-15 16:17:45 -04:00
Vik Paruchuri
cd3e88fdd5
Fix version tuples to be a dictionary
2013-03-15 16:05:38 -04:00
Vik Paruchuri
500c4ab86e
Convert versions to tuples
2013-03-15 15:40:04 -04:00
Vik Paruchuri
01b1974f50
Address review comment
2013-03-15 15:15:23 -04:00
Will Daly
3a13cd7b34
Merged changes in factories.py with version in master
2013-03-15 15:09:39 -04:00
Vik Paruchuri
b609ab0e6a
Convert to using versioninteger class
2013-03-15 15:05:47 -04:00
Vik Paruchuri
405ea8d675
Remove copy.copy
2013-03-15 14:57:48 -04:00
Vik Paruchuri
97839d9de5
Fix default version string integer issues
2013-03-15 14:52:55 -04:00
Victor Shnayder
64e1eb9903
Fix randomness bug in cohort placement
...
capa re-seeds the global RNG all the time, resulting in non-random
cohort placement. Switch to using a local random module.
(Thanks Cale for helping me figure this out!)
2013-03-15 11:35:27 -07:00
Vik Paruchuri
c34666af80
Fix version handling
2013-03-15 14:20:55 -04:00
