Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,918 Commits 1 Branch 0 Tags
9b63a06bfcd51b86ab20f91c48088046bfb5d68f
Commit Graph

45918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ned Batchelder
9b63a06bfc Properly clean up a wrapped function 2018-04-26 15:50:05 -04:00
Jeremy Bowman
52e72c636d Merge pull request #18067 from edx/jmbowman/TE-2551 
TE-2551 Fix commons.js optimization reliability
 2018-04-26 15:14:31 -04:00
Jeremy Bowman
328da7f73b TE-2551 Fix commons.js optimization reliability 2018-04-26 14:34:38 -04:00
Gabe Mulley
a787c7b75d Merge pull request #18028 from edx/mulby/support-cross-domain-ajax 
support cross domain ajax requests to the experiments APIs
 2018-04-26 13:28:09 -04:00
edx-pipeline-bot
d294c3f729 Merge pull request #18062 from edx/release-mergeback-to-master 
Merge release back to master
 2018-04-26 13:18:20 -04:00
Brittney Exline
51d632531c Merge pull request #18055 from edx/bexline/empty_sso_verification_migration 
ENT-969: Partial revert of "ENT-945 Update IDVerification interfaces to account for SSOVerification"
 2018-04-26 08:54:34 -06:00
Jae Bradley
b9092c80e1 Merge pull request #18059 from edx/cookie-policy-banner-1.1.6 
Upgrade cookie policy banner version to 1.1.6
 2018-04-26 10:19:14 -04:00
jaebradley
9bb383a0c9 upgrade cookie policy banner version 2018-04-26 09:43:54 -04:00
adeel khan
b996a23712 Merge pull request #17973 from edx/adeel/learner_4344_catch_httperror_exception_thrown_psa 
Catch HttpError thrown by Python Social Auth.
 2018-04-26 15:00:14 +05:00
Adeel Khan
cd2f6592c3 Catch HttpError thrown by Python Social Auth. 
This patch enables catching HttpError exception raised
by PSA because of any issue caused at client/server.
Further it redirects user to login page with a
message about the error.

LEARNER-4344
 2018-04-26 13:02:38 +05:00
Feanil Patel
c242babb08 Merge pull request #18056 from edx/feanil/remove_flaky_test 
Remove this flaky test.
 2018-04-25 17:04:57 -04:00
Gabe Mulley
cc5f7d7a32 fix pylint 2018-04-25 16:33:05 -04:00
Feanil Patel
6df0cdf646 Remove this flaky test. 2018-04-25 16:20:11 -04:00
Michael Roytman
a1caa609a4 Merge pull request #18054 from edx/mroytman/bump-studio-frontend-1.8.0 
update studio-frontend version to 1.8.0
 2018-04-25 16:17:34 -04:00
sanfordstudent
6df9f452bf Merge pull request #18053 from edx/sstudent/cache_discussion_context 
request cache some more stuff
 2018-04-25 16:11:17 -04:00
Eric Fischer
23c9bada44 Merge pull request #18050 from edx/efischer/quick_fix 
Optimize dictionary combination
 2018-04-25 16:10:30 -04:00
Brittney Exline
292f9ca831 Partial revert of "ENT-945 Update IDVerification interfaces to accountfor SSOVerification" 
This partially reverts commit ee1c3a4548.
The migration files introduced by the commit have been kept since they have been run
already on several enviornments.
 2018-04-25 16:01:15 -04:00
Sanford Student
2f0e3d35a0 EDUCATOR-2618 request cache some more stuff 2018-04-25 15:33:44 -04:00
Michael LoTurco
8847059021 Merge pull request #18049 from edx/mloturco/learner-4715 
retrap focus for seat unenroll survey a11y

learner-4715
 2018-04-25 15:32:59 -04:00
Eric Fischer
27e309f147 Optimize dictionary combinations 2018-04-25 15:30:17 -04:00
Eric Fischer
c724b1b0a4 Merge pull request #18052 from edx/efischer/cache_stuff 
Cache get_group_id_for_user
 2018-04-25 15:18:09 -04:00
Michael Roytman
c54223e2e6 update studio-frontend version to 1.8.0 2018-04-25 15:10:09 -04:00
Michael LoTurco
62ae6d4555 retrap focus for seat unenroll survey a11y 
learner-4715
 2018-04-25 14:51:35 -04:00
Jeff LaJoie
bb026ff878 Merge pull request #18010 from edx/jlajoie/LEARNER-4700 
LEARNER-4700: Converts credentials to plugin
 2018-04-25 14:43:21 -04:00
Eric Fischer
30476a338f Stop hitting mongo so much, cache this result 2018-04-25 14:18:17 -04:00
Gabe Mulley
aa261ba9d9 add tests 2018-04-25 13:04:09 -04:00
Albert (AJ) St. Aubin
ee1eaaf243 Merge pull request #18024 from edx/aj/LEARNER-4913_is_anon 
Updates to use the is_anonymous flag of basket calculate
 2018-04-25 12:22:53 -04:00
Albert St. Aubin
213673db61 Updates to use the is_anonymous flag of basket calculate 
[LEARNER-4913]
 2018-04-25 11:42:53 -04:00
Jeff LaJoie
29748877de LEARNER-4700: Converts credentials to plugin 2018-04-25 11:32:33 -04:00
Brian Mesick
1828bf7d6b Merge pull request #17920 from edx/bmedx/fix_retirement_apis 
Update retirement APIs to match spec
 2018-04-25 10:39:26 -04:00
AlasdairSwan
321a1acb04 Merge pull request #17945 from edx/alasdair/LEARNER-4880-gdpr-modal-display 
LEARNER-4880 added confirmation modal for account deletion
 2018-04-24 16:40:07 -04:00
Gregory Martin
d8a005359e Merge pull request #17998 from edx/yro/EDUCATOR-2700 
Yro/EDUCATOR 2700
 2018-04-24 16:38:44 -04:00
Gregory Martin
9b6a15619e Unlink SoftwareSecure PII for GDPR 2018-04-24 15:58:59 -04:00
sanfordstudent
03a3147634 Merge pull request #18011 from edx/sstudent/EDUCATOR-2731 
make userorgtag deletable
 2018-04-24 15:26:14 -04:00
AlasdairSwan
bfda33da5d LEARNER-4880 added confirmation modal for account deletion 2018-04-24 15:22:00 -04:00
Sanford Student
e5a0efbe7b make userorgtag deletable 2018-04-24 14:51:53 -04:00
Alessandro Roux
cce522c7f9 Merge pull request #18009 from edx/roux/unregisteredlearnercohortassignments-retire 
UnregisteredLearnerCohortAssignments can retire users.
 2018-04-24 14:41:22 -04:00
Eric Fischer
42b2e54ad6 Merge pull request #17415 from mahyard/master 
Prepend unicode signature (BOM) to csv reports
 2018-04-24 14:19:03 -04:00
sandroroux
05a5631869 Allows UnregisteredLearnerCohortAssignments to delete_by_user_value. 2018-04-24 14:00:33 -04:00
Alessandro Roux
e8201c60f4 Merge pull request #18034 from edx/roux/fix-deletable-by-user-value 
Changes the DeletableByUserValue delete algorithm.
 2018-04-24 13:57:33 -04:00
Waheed Ahmed
d82ecad681 Merge pull request #17985 from edx/waheed/LEARNER-4254-update-support-form 
Update support form.
 2018-04-24 22:02:26 +05:00
sandroroux
75e522f222 Changes the mixin's delete algorithm. 2018-04-24 12:00:25 -04:00
Jeremy Bowman
42fef9d38d Merge pull request #18025 from edx/jmbowman/TE-2546 
TE-2546 Remove obsolete requirements files
 2018-04-24 11:54:48 -04:00
Gregory Martin
809921f417 Merge pull request #17953 from edx/yro/EDUCATOR-2644 
Yro/EDUCATOR 2644
 2018-04-24 10:27:49 -04:00
Brittney Exline
60f46d5a92 Merge pull request #17930 from edx/bexline/sso_id_verification2 
ENT-945 Apply logic for taking into account SSOVerifications
 2018-04-24 07:40:52 -06:00
Alex Dusenbery
64f1592772 EDUCATOR-2632 | Management command for creating new DOT application model. 2018-04-24 09:17:37 -04:00
Asad Iqbal
8978b21042 Merge pull request #18031 from edx/asadiqbal08/version-bump 
asadiqbal08- ENT-645 - Enterprise version bump
 2018-04-24 17:49:44 +05:00
Gabe Mulley
5b89c2f5b8 support cross domain ajax requests to the experiments APIs 2018-04-24 08:30:58 -04:00
asadiqbal
720ae822a5 version bump 2018-04-24 16:42:39 +05:00
Asad Iqbal
6cc13f7f2e Merge pull request #17935 from edx/asadiqbal08/ENT-645 
[ENT-645]- Updated the messages when a learner leave an organization.
 2018-04-24 15:59:55 +05:00