Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5589 Commits

Author SHA1 Message Date
Julia Hansbrough
545cfd8406 Merge pull request #4353 from edx/flowerhack/lms-deprecated-urls 
Enables LMS to handle deprecated URLs
 2014-07-09 18:23:00 -04:00
jhelbert
451953752e Merge pull request #4285 from edx/jhelbert/enrollment-mode-change-events 
Jhelbert/enrollment mode change events
 2014-07-09 17:57:39 -04:00
Julia Hansbrough
d9dd45662e Enables LMS to handle deprecated URLs 
LMS-2651
 2014-07-09 21:51:37 +00:00
Justin Helbert
e78a398f45 This emits enrollment mode changes events 2014-07-09 20:27:00 +00:00
Don Mitchell
211f0797fb Merge pull request #4294 from edx/split_mongo_assets_cherry 
Split mongo assets cherry
 2014-07-09 14:22:04 -04:00
Don Mitchell
cc6dfbbc75 Asset support in split 
LMS-2876
 2014-07-07 17:11:43 -04:00
Adam Palay
d63a5abfbc Merge branch 'rc/2014-07-02' into testmergemaster 
Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py
 2014-07-07 13:54:03 -04:00
Adam
ad43c25c78 Merge pull request #4188 from edx/adam/fix-skiptests 
Explicitly skip tests in common unless we know we're running the LMS unittest suite
 2014-07-02 12:43:16 -04:00
Jay Zoldak
3515212196 Merge pull request #4266 from edx/revert-4050-linkedin-email 
Revert "Make LinkedIn auth provider request email by default."
 2014-07-01 14:36:50 -04:00
Adam
653d6f21dd Merge pull request #4171 from edx/adam/fix-lms-2773 
Prevents students from accidentally changing their enrollment on login (...
 2014-07-01 10:38:50 -04:00
David Baumgold
ca7d895350 Revert "Make LinkedIn auth provider request email by default." 2014-07-01 10:05:01 -04:00
Usman Khalid
6a3d5eb079 Do not refund student if a certificate entry already exists for them. 
LMS-2920
 2014-07-01 16:29:07 +05:00
Adam Palay
536b9dbe31 in some cases we do want that redirect url 2014-06-30 17:05:48 -04:00
Adam Palay
92f53236cf fix 400s from change_enrollment causing 404s (LMS-6625) 2014-06-30 16:22:14 -04:00
David Baumgold
b817e02602 Merge pull request #4050 from mtyaka/linkedin-email 
Make LinkedIn auth provider request email by default.
 2014-06-30 14:31:53 -04:00
Nimisha Asthagiri
91f102c778 Merge pull request #4232 from edx/nimisha/modulestore-enum-constants 
ModulestoreEnum class.
 2014-06-30 08:58:03 -04:00
Felipe Montoya
8fd3ab07ba If microsites are enabled and it is a microsite request, then take the microsite path for theming 2014-06-27 23:01:29 -05:00
Nimisha Asthagiri
4c717ee35d Merge pull request #4236 from edx/nimisha/fix_ms_merge_conflict_heartbeat 
Fix modulestore merge conflict with heartbeat.
 2014-06-27 22:26:30 -04:00
Adam
13f41aea07 Merge pull request #4239 from edx/release 
Release
 2014-06-27 17:04:30 -04:00
Nimisha Asthagiri
eecff6e0aa ModulestoreEnum class. 2014-06-27 14:37:35 -04:00
Nimisha Asthagiri
8de4bcaf28 Fix modulestore merge conflict with heartbeat. 2014-06-27 13:57:33 -04:00
Adam Palay
b584c1a848 skip failing test 2014-06-27 13:24:23 -04:00
Oleg Marshev
39f2aabdd3 Do not look for country if no new ip. 2014-06-27 18:45:19 +03:00
Nimisha Asthagiri
a9213509c3 Enable Mixed Modulestore STUD-1540 
Refactor get_parent_locations STUD-1663
 2014-06-26 18:00:11 -04:00
David Baumgold
0c0859f17b Merge pull request #4026 from edx/db/requests-2 
Upgrade `requests` module
 2014-06-25 19:34:05 -04:00
Oleg Marshev
715fde27c4 Redirect Chinese students to a Chinese CDN for video. 2014-06-24 18:39:52 +03:00
Adam Palay
6b1a7dc259 Prevents students from accidentally changing their enrollment on login (LMS-2773) 
skip tests if not run in lms
 2014-06-23 16:49:04 -04:00
Adam Palay
bd2f3c75f5 Explicitly skip tests in common unless we know we're running the LMS unittest suite 2014-06-23 16:28:53 -04:00
cahrens
73e7ced6f9 Introduce constants for studio_view, student_view, and author_view. 2014-06-20 11:41:23 -04:00
Andy Armstrong
11c25e8c1a Add Studio handling for changes to group configurations 
STUD-1658
 2014-06-20 11:41:22 -04:00
Sarina Canelake
30c8da1596 Fix variable names to give context for translators 
fix other various i18n issues
 2014-06-18 23:28:39 -04:00
Christina Roberts
b7eea135d4 Merge pull request #4119 from edx/christina/requirejs-promise 
Wait for scripts defined in common xmodule code to execute.
 2014-06-18 14:56:10 -04:00
cahrens
3acf394d05 Wait for scripts defined in common xmodule code to execute. 
STUD-1792
 2014-06-18 13:11:37 -04:00
Waqas Khalid
9e6333f689 Remember the user last thread sort preference 
FOR-545
 2014-06-18 14:26:30 +05:00
Sarina Canelake
b70bd2be78 Use ngettext rather than "word(s)" for plural phrases 2014-06-17 13:25:46 -04:00
Don Mitchell
17210d18ad Merge pull request #4078 from edx/dhm/heartbeat 
Refactor heartbeat to delegate to the modulestores and sql
 2014-06-17 08:44:37 -04:00
Dave St.Germain
f2fb57e196 Added manual refund page for support. 
PR-615
 2014-06-17 08:24:02 -04:00
Don Mitchell
3c9b10112f Refactor heartbeat to delegate to the modulestores and sql 
LMS-2801
 2014-06-16 13:16:32 -04:00
Jim Abramson
c74b34c1a8 Merge pull request #4041 from edx/jsa/forums-search-users 
implement forums endpoint for searching users.
 2014-06-16 10:15:01 -04:00
Matjaz Gregoric
5aabd3a48e Add scope/field selector settings for LinkedIn provider. 
This change adds three new configuration variables to third_party_auth's LinkedIn provider:

* SOCIAL_AUTH_LINKEDIN_OAUTH2_SCOPE,
* SOCIAL_AUTH_LINKEDIN_OAUTH2_FIELD_SELECTORS,
* SOCIAL_AUTH_LINKEDIN_OAUTH2_EXTRA_DATA

Being able to configure these additional settings is useful if you want
the LinkedIn provider to pre-populate the email field when a new user
registers via the linkedin provider.

The Google provider prepoulates the email field by default, but if you
want LinkedIn to do the same, these two settings should be set to:

SOCIAL_AUTH_LINKEDIN_OAUTH2_SCOPE = ['r_basicprofile', 'r_emailaddress']
SOCIAL_AUTH_LINKEDIN_OAUTH2_FIELD_SELECTORS = ['email-address']

For more info see:
http://psa.matiasaguirre.net/docs/backends/linkedin.html
 2014-06-16 10:27:38 +02:00
David Baumgold
bafdb8ecb1 make our HTTP stub services respond to HEAD requests 2014-06-13 14:42:23 -04:00
Sarina Canelake
3adc2f0a2e Fix opaque_keys imports from hotfixes 2014-06-11 21:32:41 -04:00
Sarina Canelake
7e36c35043 Merge branch 'release' 2014-06-11 21:30:05 -04:00
louyihua
6d7839007a Do not merge zh-hk into zh-tw in darklang 2014-06-12 01:19:49 +08:00
Calen Pennington
f6ea16223b Allow users that have unregistered from a verified course to re-register. 
Fixes LMS-2830
 2014-06-11 12:37:53 -04:00
Oleg Marshev
cfec580a63 Add argument. 2014-06-11 11:41:03 +03:00
Sarina Canelake
2aea261d48 Merge branch 'release' 
Conflicts:
	common/djangoapps/course_modes/views.py
	common/djangoapps/student/tests/test_roles.py
	common/djangoapps/student/views.py
	common/lib/opaque_keys/opaque_keys/__init__.py
	common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/notes/views.py
 2014-06-10 16:59:23 -04:00
jsa
526d4b1d49 forums: fix assign_default_role to use the correct constant. 2014-06-10 12:26:21 -04:00
Sarina Canelake
bf6c342dcf Fix location.url [LMS-2786] 2014-06-09 15:17:20 -04:00
Calen Pennington
87557a1af8 Add tests of RoleCache 2014-06-09 15:15:03 -04:00