Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,998 Commits 1 Branch 0 Tags
feed7eaadaf95b22cfe38c76c0d6860372ad0d8d
Commit Graph

28998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
ahsan-ul-haq
c430eaed55 Merge pull request #7086 from edx/ahsan/tnl-1520-studio-nav-label-accessibility-issue 
Studio header nav label accessibility issue
 2015-03-06 00:27:06 +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
1a6b474dd3 Merge pull request #7239 from edx/hotfix/ecom-1169 
Fix callback URL for certificate generation tasks
 2015-03-05 14:03:39 -05:00
Will Daly
d1b9bbf211 Fix callback URL for certificate generation tasks 2015-03-05 13:52:23 -05:00
David Baumgold
6fd4d2fdc3 Merge pull request #7229 from edx/hotfix/2015-03-05 
Fix 500 errors on video upload page
 2015-03-05 13:08:15 -05:00
David Baumgold
a37a50cf3b Merge branch 'release' 2015-03-05 12:10:27 -05:00
Matt Drayer
f85d2451ef Merge pull request #7231 from edx/mattdrayer/rename-migration-file 
Renamed conflicting migration file
 2015-03-05 12:09:25 -05:00
Mark Hoeber
461f37d7a9 Updated Readme for Portal and Contributors link 2015-03-05 10:38:40 -05:00
E. Kolpakov
c225d86e83 SettingsService for accessing server-wide settings from XBlock 2015-03-05 18:24:47 +03:00
Matt Drayer
df937f1feb Renamed conflicting migration file 2015-03-05 10:21:03 -05:00
Matt Drayer
be77f8bf8c Revert "Renamed conflicting migration file" 
This reverts commit 04429e77f0.
 2015-03-05 10:16:43 -05:00
Matt Drayer
04429e77f0 Renamed conflicting migration file 2015-03-05 10:09:36 -05:00
David Baumgold
9dbadd716d Merge pull request #7227 from edx/flask-test-videotimestest 
Mark VideoTimesTest.test_video_end_time_wo_default_start_time as flaky
 2015-03-05 09:08:26 -05: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
Ben Patterson
1d00508671 Merge pull request #7147 from edx/benp/static-code-analysis-radon 
Benp/static code analysis radon
 2015-03-05 06:48:25 -05:00