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
Edward Zarecor
ed7f32ee27 Merge pull request #13678 from edx/e0d/ignore-email-case 
comparison should be case-insensitive
 2016-10-07 16:42:09 -04:00
Nimisha Asthagiri
cf2c48ab8f Merge pull request #13688 from edx/common_cleanup/datadog 
Move datadog from common to openedx/core
 2016-10-07 14:13:34 -04:00
John Eskew
4fb3da23e4 Remove config_models & use external config_models repo instead. 2016-10-07 14:13:10 -04:00
Nimisha Asthagiri
5cb129e222 Merge pull request #13690 from edx/common_cleanup/heartbeat 
Move heartbeat from common to openedx/core
 2016-10-07 13:59:25 -04:00
Nimisha Asthagiri
0df9fb355b Merge pull request #13692 from edx/common_cleanup/monitoring 
Move monitoring from common to openedx/core
 2016-10-07 13:52:00 -04:00
Edward Zarecor
569e6745ef is 2016-10-07 13:46:26 -04:00
Nimisha Asthagiri
3b304029e6 Merge pull request #13679 from edx/common_cleanup/remove_old_one_off_script 
Move sync_user_info management command from common to LMS
 2016-10-07 13:44:43 -04:00
Nimisha Asthagiri
010f7eb5c8 Merge pull request #13684 from edx/student_cleanup/decoupled_dependencies 
Decouple student's dependency on badges with django signals
 2016-10-07 13:44:11 -04:00
Nimisha Asthagiri
2112e7f8c8 Merge pull request #13659 from edx/common_cleanup/external_auth 
Moves external_auth from common to openedx/core
 2016-10-07 13:39:21 -04:00
e0d
1841fe9b92 comparison should be case-insensitive 
test

quality
 2016-10-07 13:38:00 -04:00
Nimisha Asthagiri
2b9e60ad17 Merge pull request #13691 from edx/common_cleanup/performance 
Move performance from common to openedx/core
 2016-10-07 13:25:51 -04:00
Nimisha Asthagiri
6793c8f6ab Move audit_log utility function to openedx/core 2016-10-07 13:25:08 -04:00
Nimisha Asthagiri
fd49f88e08 Moves external_auth from common to openedx/core. 2016-10-07 12:34:22 -04:00
Jesse Shapiro
8533fd9734 Adding change to staff role for new users and draft migration 2016-10-07 11:52:59 -04:00
Nimisha Asthagiri
c703834ebf Move heartbeat from common to openedx/core 2016-10-07 10:42:47 -04:00
Bill DeRusha
9877c6ad6e Add UTM tracking for registrations 
Add UTM cookie tracking for registrations.
Add config model for cookie names.

ECOM-5539
 2016-10-07 10:27:57 -04:00
Nimisha Asthagiri
74912bc50d Merge pull request #13693 from edx/common_cleanup/geoinfo 
Move geoinfo from common to openedx/core
 2016-10-07 10:04:13 -04:00
Andy Armstrong
12ec1fffba Merge pull request #13668 from edx/andya/remove-empty-reverification-app 
Remove empty reverification Django app
 2016-10-07 09:51:28 -04:00
Nimisha Asthagiri
af5f7789d1 Move datadog from common to openedx/core. 2016-10-07 08:57:02 -04:00
Nimisha Asthagiri
c8bca627f0 Move monitoring from common to openedx/core 2016-10-07 08:43:24 -04:00
Nimisha Asthagiri
07801f3b96 Move performance from common to openedx/core 2016-10-07 00:39:39 -04:00
Nimisha Asthagiri
579145f0e1 Move geoinfo from common to openedx/core 2016-10-07 00:26:35 -04:00
Andy Armstrong
9f08457c53 Merge pull request #13675 from edx/andy/move-service-status 
Move service_status from common into openedx
 2016-10-06 20:16:07 -04:00
Nimisha Asthagiri
1717e0c4f6 Decouple student's dependency on badges with django signals. 2016-10-06 18:13:37 -04:00
Nimisha Asthagiri
8ebc4106f2 Merge pull request #13673 from edx/common_cleanup/cache_toolbox 
Move cache_toolbox from common to openedx/core
 2016-10-06 18:07:46 -04:00
Nimisha Asthagiri
8b0a26a419 Move sync_user_info management command from common to LMS. 2016-10-06 17:04:49 -04:00
Nimisha Asthagiri
2c7975f804 Move cache_toolbox from common to openedx/core. 2016-10-06 16:57:00 -04:00
John Eskew
b27f8a29b5 Merge pull request #13671 from edx/jeskew/move_xmodule_django_to_openedx_core 
Move xmodule_django app to openedx.core.djangoapps
 2016-10-06 16:53:25 -04:00
Eric Fischer
aae9f9ccaa Merge pull request #13676 from edx/release-10-06-conflict 
Merge release to master
 2016-10-06 16:10:20 -04:00
Nimisha Asthagiri
6073ea2e2e Merge pull request #13658 from edx/common_cleanup/auth_exchange 
Move auth_exchange from common to openedx/core
 2016-10-06 15:16:33 -04:00
John Eskew
3614eb2800 Move xmodule_django app to openedx.core.djangoapps 2016-10-06 14:50:40 -04:00
John Eskew
24d29be3f3 Merge pull request #13667 from edx/jeskew/move_monkey_patch 
Move monkey_patch to openedx.core.djangoapps.
 2016-10-06 14:32:35 -04:00
Eric Fischer
50d55bbad6 Merge branch 'release' into release-10-06-conflict 2016-10-06 14:25:47 -04:00
Andy Armstrong
a63bb0e50f Merge pull request #13664 from edx/andya/common-refactoring 
Move pipeline_js Django app into CMS
 2016-10-06 14:24:45 -04:00
Andy Armstrong
a75f64b6c0 Move service_status from common into openedx 2016-10-06 13:37:35 -04:00
Nimisha Asthagiri
4c0f85b4d9 Move auth_exchange from common to openedx/core. 
Move oauth_dispatch from lms to openedx/core.
 2016-10-06 12:54:39 -04:00
Andy Armstrong
0f18b740c8 Move pipeline_js Django app into CMS 
Note: this used to be in common, but it was only used in Studio.
 2016-10-06 12:08:04 -04:00
Andy Armstrong
96a572dded Remove empty reverification Django app 2016-10-06 10:35:08 -04:00
Nimisha Asthagiri
406daa513b Move get_grades management command from student to grades app. 2016-10-06 10:34:24 -04:00
John Eskew
fab11b90d7 Move monkey_patch to openedx.core.djangoapps. 2016-10-06 10:16:14 -04:00
Brandon DeRosier
ec6c924b7c Fixed site keying for SAMLConfigurationsfor SAML management command 2016-10-03 10:26:25 -04:00
Ahsan
c5d975577a Invalidate access token 
ECOM-4641
 2016-10-03 13:02:52 +05:00
cahrens
e77b5eb3c3 Merge with release. 2016-09-28 09:58:14 -04:00
attiyaishaque
e8f109a328 Revert "ECOM-5281 Add retires for email sending while registering." 
This reverts commit 4bbeaf32ae.
 2016-09-27 17:21:24 +05:00
attiyaishaque
648bc7efb4 Revert "Adding celery task for sending activation email." 
This reverts commit fe136122db.
 2016-09-27 17:20:57 +05:00
Awais Jibran
b74e964d7c Revert "Fix user registration " 2016-09-27 16:19:34 +05:00
Douglas Hall
f806f3a165 Merge pull request #13474 from open-craft/bdero/site-sso 
ENT-16 Make SSO configurable per Site
 2016-09-26 14:54:40 -04:00
Douglas Hall
d1a3af9460 Merge pull request #13526 from edx/douglashall/JER-157/allow_for_site_override_of_mktg_urls_setting 
JER-157 Allow for per-Site override of MKTG_URLS setting
 2016-09-26 14:01:36 -04:00
Brandon DeRosier
3dcf689ee2 Implement Site settings for Third Party Auth providers 2016-09-26 12:43:00 -04:00
Jesse Shapiro
6b9b34886c Merge pull request #13537 from open-craft/haikuginger/adjust-saml-expiration-type 
[ENT-23] Convert SAML cache expiration to timezone-aware datetime.datetime
 2016-09-26 12:33:23 -04:00