Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,016 Commits 1 Branch 0 Tags
4856ef78d39719834318ea063b64ddf8d2f1e571
Commit Graph

29016 Commits

This Branch
This Branch
All Branches
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
Adam
7abbbb443a Merge pull request #7324 from edx/hotfix/2015-03-12 
update schoolyourself xblock (TNL-1395)
 2015-03-12 15:13:41 -04:00
Adam Palay
bb2f7dedfd update schoolyourself xblock (TNL-1395) 2015-03-12 10:50:32 -04:00
Ali Mohammad
fd312ab13b Merge pull request #7302 from edx/alawibaba/hotfix-cdn-experiment 
hotfix: China CDN cleanup and bugfixes
 2015-03-12 10:46:59 -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
Greg Price
c65c19d21a Merge pull request #7281 from edx/clintonb/task-fix 
Reorganized course_structures app
 2015-03-10 12:07:33 -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
7e7b13b488 Merge pull request #7275 from edx/clee/MA-272_video_analytics 
MA-272 Updated analytics shim for mobile video events
 2015-03-09 15:43:19 -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
christopher lee
bb5fbda873 MA-272 Updated analytics shim for mobile video events 
Shim has been updated to handle currents builds of the android and iOS
apps which are not returning the correct semantics/events. Shim now
includes the seek event.
 2015-03-09 15:01:30 -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
Greg Price
30c3005c40 Merge pull request #7273 from edx/ecom-1178 
ECOM-1178: Embargo rules for continent codes.
 2015-03-09 12:21:35 -04:00
Will Daly
feed7eaada ECOM-1178: Embargo rules for continent codes. 
This commit fixes a bug that could occur when GeoIP
returns a continent code ("EU" or "AN") instead of a
country code.  The previous implementation would
block users in this case since the country code
was not on the whitelist (consisting of all known
country codes).  The new implementation allows user
access by default if we don't recognize the country code.
 2015-03-09 12:17:02 -04:00
Greg Price
b649b27329 Merge pull request #7261 from edx/cgoldberg/video-cdn-experiment 
Added listener and beacon for video cdn eval.
 2015-03-09 11:39:06 -04:00
Greg Price
18648fdf90 Merge pull request #7264 from edx/ahodges/chg_status_label 
Fixes DOC-1731: label change and time frame info
 2015-03-09 11:22:42 -04:00
Alison Hodges
3d7ee895d7 Fixes DOC-1731: label change and time frame info 2015-03-06 17:08:24 -05: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
Christina Roberts
3aaf52d2ee Merge pull request #7249 from edx/chrisitna/flaky-test 
Add flaky decorator.
 2015-03-06 13:57:17 -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
697b487e81 Leave a redirection testing.md file behind 2015-03-06 13:18:05 -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
Sarina Canelake
e1dc0f5cdc Remove unused common image 2015-03-06 13:05:03 -05:00
Sarina Canelake
4133740a2f Add default logo to Studio 2015-03-06 13:05:03 -05:00
cahrens
3e7488f52c Add flaky decorator. 
Related to TNL-1642.
 2015-03-06 13:04:42 -05:00
cahrens
758d2f4e3b Add flaky decorator. 
Related to TNL-1619.
 2015-03-06 13:04:42 -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
Ned Batchelder
4f5b319f17 Merge pull request #7254 from edx/ned/finish-pr-7232 
Ned/finish pr 7232
 2015-03-06 12:04:57 -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
Ned Batchelder
b3dbc7babd Fix another contributor agreement link. 2015-03-06 11:32:11 -05:00
Daniel Friedman
a79bf683b0 Fix failing forums unit test. 2015-03-06 11:09:12 -05:00
Ned Batchelder
0e171be261 Merge pull request #7246 from cguardia/patch-1 
Add empty introspection rule for BlockTypeKeyField.
 2015-03-06 10:21:10 -05:00
Ned Batchelder
f8c9fdf6c8 Merge pull request #7196 from edx/ned/tweaked-pylintrc 
Use 'edx_lint write' to create our pylintrc from pylintrc_tweaks
 2015-03-06 09:50:59 -05:00
David Baumgold
dca05a6095 Merge branch 'release' 2015-03-06 08:54:22 -05:00
David Baumgold
849388398c Merge pull request #7244 from edx/jsa/hotfix-forums 
Revert "Merge pull request #6771 from edx/dan-f/forums-filter-discussion...
 2015-03-06 08:51:03 -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
Xavier Antoviaque
7338cc1286 Merge pull request #7148 from open-craft/library-selector 
Show a select box when editing a library content block (SOL-123)
 2015-03-06 09:16:02 +01:00
zubair-arbi
41f08055a4 Merge pull request #7018 from edx/zub/bugfix/tnl-1331-unique_users_in_cohort_group 
use 'commit_on_success' transaction decorator to avoid registering users...
 2015-03-06 12:23:25 +05:00
Carlos de la Guardia
c04e76e62a Update AUTHORS 2015-03-06 00:45:00 -06:00
Carlos de la Guardia
baa1b05eb7 Add empty introspection rule fro BlockTypeKeyField. 
From 0.7 on, South requires explicit introspection rules. Previously, it used the parser module to introspect.
 2015-03-05 22:34:29 -06:00