Christine Lytwynec
06b3110ea0
onload performance beacon for LMS pages
2015-03-27 11:08:25 -04:00
Adam
7abcfddf51
Merge pull request #7421 from edx/hotfix/2015-03-19
...
Hotfix/2015 03 19
2015-03-19 14:54:00 -04:00
alawibaba
9b79797b28
Created performance logging endpoint, changed CDN experiment to point to it.
2015-03-19 07:53:01 -04:00
zubair-arbi
ae2480e038
update instructor grade task state and increase logging
2015-03-19 07:52:22 -04:00
Jonathan Piacenti
40bb70e9d1
Remove use of to_deprecated_string in sandbox regex check.
2015-03-17 16:16:11 -04:00
Brian Wilson
5f6ee428f8
Merge remote-tracking branch 'origin/release' into rc/2015-03-17
2015-03-17 15:59:54 -04:00
brianhw
bafc7c53d3
Merge pull request #7392 from open-craft/library-capa-problems
...
Remove use of to_deprecated_string in sandbox regex check.
2015-03-17 14:17:19 -04:00
brianhw
15cc1446e5
Merge pull request #7393 from edx/revert-7387-library-capa-problems
...
Revert "Remove use of to_deprecated_string in sandbox regex check."
2015-03-17 14:15:41 -04:00
brianhw
7f5c54dd31
Revert "Remove use of to_deprecated_string in sandbox regex check."
2015-03-17 14:09:55 -04:00
Kelketek
8b190da956
Merge pull request #7387 from open-craft/library-capa-problems
...
Remove use of to_deprecated_string in sandbox regex check.
2015-03-17 12:43:19 -05:00
Jonathan Piacenti
85c81e4579
Remove use of to_deprecated_string in sandbox regex check.
2015-03-17 16:43:53 +00:00
brianhw
498e62ef63
Merge pull request #7386 from edx/adam/revert-mathjax-change
...
Revert "Lms should be independent of mathjax"
2015-03-17 11:27:54 -04:00
Adam Palay
71ab971c72
Revert "Lms should be independent of mathjax"
...
This reverts commit 4a086f54d5
2015-03-17 10:44:48 -04:00
Stephen Sanchez
b50e004b2d
Merge pull request #7375 from edx/sanchez/update_aws_settings_for_ecommerce
...
Add E-Commerce settings to AWS settings.
2015-03-16 17:00:20 -04:00
Stephen Sanchez
f552df3363
Modify commerce view to work without ecommerce configuration.
2015-03-16 20:21:12 +00:00
Clinton Blackburn
b3354dda31
Merge pull request #7372 from edx/clintonb/no-honor-mode-fix
...
Fixed bug for courses without an honor mode
2015-03-16 15:50:30 -04:00
Usman Khalid
c40ab513ff
Merge pull request #7373 from edx/usman/ora-release-2015-03-16
...
Update ora2 to release-2015-03-16T17.59.
2015-03-17 00:45:28 +05:00
Stephen Sanchez
081f5b4e53
Add E-Commerce settings to AWS settings.
2015-03-16 19:31:15 +00:00
Clinton Blackburn
d6046d786d
Fixed bug for courses without an honor mode
2015-03-16 14:56:08 -04:00
Usman Khalid
5fdc8d666d
Update ora2 to release-2015-03-16T17.59.
2015-03-16 23:00:51 +05:00
Will Daly
2cbe6fdecb
Merge pull request #7371 from edx/will/django-rest-framework-cors-csrf
...
Skip CSRF referer check for cross-domain requests.
2015-03-16 12:30:30 -04:00
Will Daly
b625e8e37e
Skip CSRF referer check for cross-domain requests.
...
This commit extends the workaround in `cors_csrf` middleware
to Django Rest Framework's SessionAuthentication, which
calls Django's CSRF middleware directly.
The workaround checks the cross domain whitelist and
skips the CSRF referer check for domains on the whitelist.
2015-03-16 11:48:09 -04:00
Brian Wilson
8324fd0209
Merge remote-tracking branch 'origin/release' into rc/2015-03-17
2015-03-16 11:43:26 -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
Calen Pennington
8247ace595
Revert "Merge pull request #7258 from cpennington/lms-field-data-query-counts"
...
This reverts commit 4856ef78d37abbbb443a
2015-03-16 09:41:40 -04: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
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
Calen Pennington
4856ef78d3
Merge pull request #7258 from cpennington/lms-field-data-query-counts
...
Reduce query counts in FieldDataCache/DjangoKeyValueStore
2015-03-13 15:55:57 -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
