Ned Batchelder 78d3d20069 When checking types to convert data, don't forget about longs. 32-bit Pythons make longs from values that are ints on 64-bit Pythons. ...

Conflicts:
	common/djangoapps/util/converters.py

2013-02-12 11:25:14 -05:00

..

cache_toolbox

Pep8 autofixes

2013-02-06 11:13:50 -05:00

contentserver

Pep8 autofixes

2013-02-06 11:13:50 -05:00

course_groups

We no longer need override_settings, Django has a better one.

2013-02-11 17:06:35 -05:00

django_future

…

external_auth

Pep8 autofixes

2013-02-06 11:13:50 -05:00

heartbeat

…

mitxmako

Pep8 autofixes

2013-02-06 11:13:50 -05:00

monitoring

…

pipeline_mako

…

static_replace

Simplify, make it actually work.

2013-02-11 17:50:13 -05:00

status

We no longer need override_settings, Django has a better one.

2013-02-11 17:06:35 -05:00

student

change missingExamSeriesCode to missingPartnerID

2013-02-09 02:24:51 -05:00

track

Pep8 autofixes

2013-02-06 11:13:50 -05:00

util

When checking types to convert data, don't forget about longs. 32-bit Pythons make longs from values that are ints on 64-bit Pythons.

2013-02-12 11:25:14 -05:00

__init__.py

Another checkpoint before pull/merge

2012-11-20 11:37:14 -05:00

xmodule_modifiers.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00