Clinton Blackburn
783fb23fe2
Fixed CourseMode Filtering Bug
...
Commerce code has now been updated to exclude CourseMode objects with SKU set to empty string (in addition to null).
2015-03-18 11:14:36 -04:00
Calen Pennington
40ae5d2e1c
Merge pull request #7365 from cpennington/lms-field-data-query-counts
...
Reduce queries from FieldDataCache
2015-03-17 11:55:46 -04:00
Calen Pennington
88b9187476
Decrease the number of inserts and updates needed by DjangoKeyValueStore
2015-03-17 10:57:13 -04:00
Ned Batchelder
59ad3ccb73
Merge pull request #7357 from edx/ned/remove-unused-imports
...
Remove unused imports
2015-03-17 09:34:26 -04:00
Ned Batchelder
7d799e34f3
Remove unused imports
2015-03-17 07:10:31 -04:00
Ned Batchelder
3acf503e2b
Merge pull request #7376 from edx/ned/fix-test-instructor-dashboard
...
Fix test_instructor_dashboard.py tests
2015-03-17 06:50:06 -04:00
Andy Armstrong
37dd0ec840
Merge pull request #7327 from edx/andya/preferences-api
...
Implement full preferences API
2015-03-17 00:57:01 -04:00
Andy Armstrong
6976a33a85
Add the preferences endpoint to the User API
...
TNL-1493
See https://openedx.atlassian.net/wiki/display/TNL/User+API for details
2015-03-16 23:34:35 -04:00
Ned Batchelder
85d0a45b14
Fix test_instructor_dashboard.py tests
...
This file was never run, because of a missing __init__.py. It needs a
super() call to make the ModuleStoreTestCase work properly.
Then one test failed, because of a missed change from dollar to
configurable currency.
2015-03-16 15:34:22 -04:00
Jesse Zoldak
ba85f82edc
Merge pull request #7370 from edx/zoldak/TE-783
...
Update the bok-choy version being used. TE-783
2015-03-16 15:00:47 -04:00
Calen Pennington
2d51f6435e
Add query count tests to DjangoKeyValueStore/FieldDataCache
2015-03-16 14:57:30 -04:00
Ned Batchelder
6e8d075dd7
Merge pull request #7355 from edx/ned/fix-capitalization
...
Simple capitalization fix
2015-03-16 14:45:36 -04:00
Sarina Canelake
d2786a6423
Merge pull request #7181 from stvstnfrd/debt/envs
...
Remove old env settings files
2015-03-16 13:25:47 -04:00
Christine Lytwynec
a35264aff2
Merge pull request #7368 from edx/clytwynec/fix_test_python_opts
...
pass opts From PythonTestSuite to NoseTestSuite
2015-03-16 12:41:54 -04:00
stv
261629d7dd
Copy over context from settings file
...
Instead of referencing the example externally, we now explain the
setting inline.
2015-03-16 09:34:44 -07:00
stv
aae9e821ed
Remove dev_int LMS env settings
...
This contains hard-coded reference to out-dated courses.
2015-03-16 09:34:44 -07:00
stv
88d9b87150
Remove dev_ike LMS env settings
...
This looks to have been a personal configuration file.
2015-03-16 09:34:44 -07:00
stv
1dad4c8f9f
Remove edx4edx LMS env settings
...
Is this used? It contains MITx references.
2015-03-16 09:34:44 -07:00
stv
015053cb9b
Remove antiquated LMS envs files
...
These all date back to 2012 and are hard-coded for specific course runs.
2015-03-16 09:34:43 -07:00
Jesse Zoldak
e4a08fb868
Update the bok-choy version being used. TE-783
2015-03-16 11:57:06 -04:00
Christine Lytwynec
659e90ea95
pass opts From PythonTestSuite to NoseTestSuite
2015-03-16 11:13:31 -04:00
David Baumgold
c6992688ac
Merge pull request #7314 from edx/load-tender-js-from-tenderapp-subdomain
...
Define TENDER_SUBDOMAIN so that we can still use vanity URLs
2015-03-16 10:44:00 -04:00
Sarina Canelake
0a385c04f1
Merge pull request #7366 from edx/sarina/20150316-update-translations
...
Update translations (autogenerated message)
2015-03-16 10:35:34 -04:00
Sarina Canelake
3569e7fef5
Update translations (autogenerated message)
2015-03-16 10:32:27 -04:00
Jesse Zoldak
90211a137a
Merge pull request #7367 from edx/revert-6167-patch-5
...
Revert "To support UNICODE xblock.location"
2015-03-16 10:27:40 -04:00
Jesse Zoldak
26afdf768c
Revert "To support UNICODE xblock.location"
2015-03-16 10:15:41 -04:00
Waqas Khalid
1b44f1e237
Merge pull request #7044 from edx/waqas/make-lms-mathjax-independent
...
Lms should be independent of mathjax
2015-03-16 18:47:32 +05:00
Waqas Khalid
a8457c4fb4
Merge pull request #6871 from edx/waqas/studio-mathjax-unit-problem
...
Unit page doesn't load when mathjax is down
2015-03-16 18:47:06 +05:00
Mark Hoeber
5efabb1c4b
Merge pull request #7307 from edx/markhoeber-enrollment-api-doc-fix
...
Add Mocks to Enrollment API Doc Config
2015-03-16 09:28:29 -04:00
Sarina Canelake
dadc47c22a
Merge pull request #6167 from fmyzjs/patch-5
...
To support UNICODE xblock.location
2015-03-16 09:05:10 -04:00
Waqas Khalid
729dd24c82
Unit page doesn't load when mathjax is down
...
When mathjax is down studio page doesn't work as
it wait for mathjax to load. I replaced the hard
dependency with soft dependency now unit page can
load with mathjax.
2015-03-16 15:12:01 +05:00
Waqas Khalid
4a086f54d5
Lms should be independent of mathjax
...
When cdn is down specially in the country like china
and others user face problem as application doesn't
work as intended. Instead of making mathjax hard
dependecy I have converted it into soft dependey
so that it won't cause user problem to use application
smothly if mathjax is not present.
TNL-1498
2015-03-16 15:10:25 +05:00
Sarina Canelake
fd0e389c3f
Merge pull request #7063 from stvstnfrd/pylint/medium
...
Fix Pylint violations (medium)
2015-03-14 21:51:29 -04:00
Ned Batchelder
a8da7946b3
Simple capitalization fix
2015-03-14 19:43:43 -04:00
stv
4e2927f146
Lower Pylint threshold to 5800 violations
2015-03-14 13:35:21 -07:00
stv
181eed241f
Silence unrelated warnings
2015-03-14 13:35:18 -07:00
stv
f03b943b95
Fix Pylint: W0612(unused-variable)
2015-03-13 20:20:05 -07:00
stv
79f9d1a70f
Fix Pylint: E1121(too-many-function-args)
2015-03-13 20:20:04 -07:00
stv
e7e9a16379
Fix Pylint: W0403(relative-import)
2015-03-13 20:20:04 -07:00
stv
268cb46d97
Fix Pylint: E0211(no-method-argument)
...
I can find no other record of this class.
2015-03-13 20:20:04 -07:00
stv
b9ed4b6561
Fix Pylint: E1305(too-many-format-args)
2015-03-13 20:20:04 -07:00
stv
83fec5d092
Fix Pylint: W0109(duplicate-key)
2015-03-13 20:20:04 -07:00
stv
0248660214
Fix Pylint: W0631(undefined-loop-variable)
2015-03-13 20:20:04 -07:00
stv
6c06f8ce5d
Fix Pylint: C1001(old-style-class)
2015-03-13 20:20:04 -07:00
stv
90b3318d01
Fix Pylint: I0010(bad-inline-option)
2015-03-13 20:20:03 -07:00
Andy Armstrong
63341287ca
Merge pull request #7343 from edx/andya/openedx-dir-coverage
...
Add coverage to openedx directory
2015-03-13 16:09:17 -04:00
Christina Roberts
96528be65b
Merge pull request #7348 from edx/christina/account-empty-email
...
Don't allow empty string or None for email.
2015-03-13 15:50:53 -04:00
Clinton Blackburn
5b2dd87a07
Merge pull request #7333 from edx/clintonb/commerce-json-fix
...
Corrected data sent to E-Commerce API
2015-03-13 15:42:28 -04:00
Jesse Zoldak
63bf151074
Merge pull request #7339 from edx/zoldak/TNL-1679
...
Disable flaky lettuce test TNL-1679
2015-03-13 15:22:49 -04:00
Sarina Canelake
257462aa9c
Merge pull request #7344 from edx/sarina/fix-sarina
...
Remove old comment from file
2015-03-13 15:19:51 -04:00
