Commit Graph

10392 Commits

Author SHA1 Message Date
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
alawibaba
cdc81c8894 Fixed ID bug in China CDN experiment, added default, changed graphite metric name, and exposed CDN monitoring ENVs. 2015-03-11 14:28:20 -04:00
Adam Palay
882eab4bc9 cache site status message for 5 minutes (TNL-1614) 2015-03-11 14:28:19 -04:00
Will Daly
a5a303ae57 Cross-domain CSRF cookies
When configured, set an additional cookie with the CSRF
token for use by subdomains.

The cookie can have a different name than the default
CSRF cookie, preventing conflicts between cookies
from different domains (e.g. ".edx.org", "courses.edx.org",
and "edge.edx.org").

The new cookie is included only on the enrollment API
views so that the scope of this change is limited
to the end-points that require cross-domain POST requests.
2015-03-11 14:28:19 -04:00
Clinton Blackburn
6a2b9f4521 Reorganized course_structures app
Celery requires all tasks to be in a tasks module. Also, the task has been updated to use default values if the the course structure generator encounters a block without the graded or format fields.
2015-03-10 11:12:51 -04:00
Calen Pennington
af12b1b8f0 Decrease the number of inserts and updates needed by DjangoKeyValueStore 2015-03-10 11:10:36 -04:00
Greg Price
e7f9b929a5 Merge pull request #7266 from edx/dan-f/forums-filter-discussion-modules-3
Filter inline discussion topics and threads in the forums by access
2015-03-09 15:53:23 -04:00
Greg Price
d5b870e7b2 Merge pull request #7276 from edx/gprice/oauth-exchange
Add an endpoint to exchange OAuth access tokens
2015-03-09 15:30:19 -04:00
Daniel Friedman
934abf3c19 Check access for discussion modules in forums
TNL-650

Conflicts:
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/django_comment_client/tests/test_utils.py
	lms/djangoapps/django_comment_client/tests/utils.py
	lms/djangoapps/django_comment_client/utils.py
2015-03-09 15:02:48 -04:00
Greg Price
e85eb91e06 Add an endpoint to exchange OAuth access tokens
This allows the holder of a third-party access token (e.g. from Google
or Facebook) to get a first-party access token for the edX account
linked to the given access token.
2015-03-09 14:12:18 -04:00
Corey Goldberg
1fc9c83726 Added listener and beacon for video cdn eval. 2015-03-06 16:46:41 -05:00
Calen Pennington
31689659ce Add query count tests to DjangoKeyValueStore/FieldDataCache 2015-03-06 15:12:46 -05:00
Will Daly
3604e2dd97 Merge pull request #7195 from edx/will/certs-instructor-dash
ECOM-1140: Instructor dashboard example certificates
2015-03-06 14:30:08 -05:00
Sarina Canelake
9e8a0b86af Merge pull request #7255 from edx/sarina/studio-default-logo
Match Studio logo logic to LMS
2015-03-06 14:13:29 -05:00
Will Daly
940f892290 ECOM-1140: Instructor dashboard example certificates
Allow global staff to generate example certificates
on the instructor dashboard.

Allow global staff to enable/disable self-generated
certificates for a course.
2015-03-06 13:20:48 -05:00
Ned Batchelder
1e52687fc3 Merge pull request #7253 from edx/ned/md-to-rst
Change .md file to .rst.
2015-03-06 13:18:33 -05:00
Ned Batchelder
4f6881c871 Change .md file to .rst. 2015-03-06 13:18:04 -05:00
Sarina Canelake
1dc75ffdc3 Abstract out platform name in default Wiki string 2015-03-06 13:05:04 -05:00
Daniel Friedman
1cc7178ba3 Merge pull request #7252 from edx/dan-f/fix-failing-forums-test-after-revert
Fix failing forums unit test.
2015-03-06 12:56:27 -05:00
Will Daly
749269a311 Merge pull request #7218 from edx/will/student-cert-xqueue-error
Certificate status when XQueue is unavailable.
2015-03-06 11:36:48 -05:00
Daniel Friedman
a79bf683b0 Fix failing forums unit test. 2015-03-06 11:09:12 -05:00
David Baumgold
dca05a6095 Merge branch 'release' 2015-03-06 08:54:22 -05:00
Awais Qureshi
d1af8f354d Merge pull request #7247 from edx/awais786/ECOM-1158-upgrade-page
Awais786/ecom 1158 upgrade page
2015-03-06 18:50:28 +05:00
Awais
c8ae32e628 ECOM-1158 fixing astrophysique in html. 2015-03-06 15:12:41 +05:00
jsa
13ba2c4a57 Revert "Merge pull request #6771 from edx/dan-f/forums-filter-discussion-modules"
This reverts commit 086a2ba783, reversing
changes made to a44132ec18.  Some minor
code quality issues were addressed as part of this change.

Conflicts:
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/django_comment_client/utils.py
2015-03-05 16:57:46 -05:00
cahrens
5802e17cf3 Disable new user APIs in production. 2015-03-05 16:09:28 -05:00
John Eskew
4cb4557176 Merge pull request #7151 from open-craft/ekolpakov/settings-service
SettingsService for accessing django settings from XBlock
2015-03-05 15:56:11 -05:00
Will Daly
ebb2d031f9 Certificate status when XQueue is unavailable.
If certificates cannot be added to the queue,
mark the certificate status as 'error' so that
it can be re-run by management commands.

Clean up logging and return values.
2015-03-05 14:18:33 -05:00
Will Daly
d1b9bbf211 Fix callback URL for certificate generation tasks 2015-03-05 13:52:23 -05:00
David Baumgold
a37a50cf3b Merge branch 'release' 2015-03-05 12:10:27 -05:00
E. Kolpakov
c225d86e83 SettingsService for accessing server-wide settings from XBlock 2015-03-05 18:24:47 +03:00
ahsan-ul-haq
00899dd908 Merge pull request #7118 from edx/ahsan/tnl-1554-missing-accessible-label-with-lms-nav-elements
Missing accessible label in lms <nav> elements.
2015-03-05 16:59:52 +05:00
Ahsan Ulhaq
d116f84c12 Removed aria label from section tag 2015-03-05 15:13:21 +05:00
David Baumgold
a70cabc10f Merge pull request #7224 from edx/i18n-mixin-strings
i18n some strings in LmsBlockMixin
2015-03-04 16:20:11 -05:00
David Baumgold
6b90763d6b i18n some strings in LmsBlockMixin 2015-03-04 14:58:05 -05:00
Will Daly
616f2bb0df Merge pull request #7210 from edx/will/cert-error-management-command
ECOM-1142: Management command for error certs.
2015-03-04 14:44:21 -05:00
Ned Batchelder
7641fbf5d9 Merge pull request #6505 from mitocw/cg/add_sga
Add Staff Graded Assignments XBlock to edx-platform
2015-03-04 13:15:02 -05:00
ahsan-ul-haq
edb3055207 Merge pull request #7185 from edx/ahsan/tnl-1567-no-main-region-landmark-student-dashboard
No "Main" region landmark on Student Dashboard
2015-03-04 21:00:24 +05:00
Carson Gee
da9154d10e Add Staff Graded Assignments XBlock to edx-platform 2015-03-04 10:35:54 -05:00
Will Daly
13cb2c2834 ECOM-1142: Management command for error certs.
Add a management comand to regenerate certificates with
status 'error', optionally restricted to a subset
of courses.
2015-03-04 07:51:38 -05:00
Zia Fazal
e21ff20375 backend changes based on feedback
Conflicts:
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/instructor_task/api.py

refined entrance exam student attempts reset

Quality improvements 1/16

added rescore, delete state and task history functionality

added unit tests for entrance exam reset attempts

added unit tests for re scoring of entrance exam and task history

improved test coverage

Got rid of pep violation

feedback changes and added jasmine test

added more jasmine tests for Javascript changes

added bok-choy tests for UI changes

replaced input containing <p> tags with <label>

Removed ee element assertions to avoid js error

Added call to super.setUp()

changes based on feedback on 2/18

Writing tests in JS instead of coffee script

commit related to skip entrance exam 2/13

fixed bad-continuation quality error

fixed broken bok-choy test

changes based on feedback on 2/18

added js tests and removed coffee script tests

fixed broken bok-choy and unit tests

changes left while rebasing

rephrase test titles

do not need these libs

changes based on feedback on 2/24

changes text which was left

Changes based on feedback on 3/3
2015-03-04 15:32:56 +05:00
Andy Armstrong
6f118a3d8f Default profile visibility to off for now 2015-03-03 17:52:24 -05:00
Will Daly
7bad603978 Merge pull request #7076 from edx/will/deprecate-embargo
Deprecate old embargo implementation.
2015-03-03 15:54:41 -05:00
Jim Abramson
c351eaf18e Merge pull request #7081 from open-craft/nonunique-discussion-targets
Fix issues with non-unique discussion targets
2015-03-03 12:07:26 -05:00
Nimisha Asthagiri
818d59e820 Merge pull request #7197 from edx/bnotions/social-features
Bnotions/social features
2015-03-03 11:03:44 -05:00
Matjaz Gregoric
639ab0dc70 Fix issues with duplicate discussion targets.
When two or more instances of Discussion XBlock were configured
with the same discussion target (Category/Subcategory),
only one of the blocks would be shown on the Course Discussion page.
This was the source of several bugs when trying to edit discussion threads.

This patch adds incrementing numbers to the title of each duplicate
subcategory when rendering the Course Discussion to make sure that
all of the threads are visible in Course Discussion.
2015-03-03 23:55:15 +08:00
chrisndodge
006b06dd21 Merge pull request #7198 from edx/release
Merge Release back to Master
2015-03-03 08:49:10 -05:00
Lee Newton
c375f666d2 bnotions contributions to mobile api 2015-03-02 22:27:27 -05:00
Adam
ee0ae6eef9 Merge pull request #7194 from edx/adam/add-purchasing-logging
add extra logging for postpay callbacks from cybersource (ECOM-1034) (EC...
2015-03-02 17:28:08 -05:00
Andy Armstrong
dfe0057b79 Implement profile API
TNL-1491

See the API design here:

https://openedx.atlassian.net/wiki/display/TNL/User+API
2015-03-02 16:28:52 -05:00