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

45905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Mahyar Damavand
11d0e298ad Prepend unicode signature (BOM) to csv reports 
for MS Excel 2013 compatibility
 2018-04-24 14:50:30 +04:30
hamzamunir7300
2c3ff72bf1 Merge pull request #17922 from edx/LEARNER-4873/fix-contact-us-link 
Changing the contact-us link
 2018-04-24 14:59:14 +05:00
Waheed Ahmed
2c09ebb208 Update support form to make course required. 
Update support form to auto select course and make course
selection required to submit form.

LEARNER-4254
 2018-04-24 14:29:49 +05:00
Hamza Munir
0fc0f82256 Changing the contact-us link 
Redirection to the newly created support form. If the server is production
it will take to production support form otherwise it will be forwarded to
Stage server support form.

LEARNER-4873
 2018-04-24 14:13:23 +05:00
Uman Shahzad
db5042f084 Merge pull request #18018 from edx/revert-17967-gbabey/revert-ENT-924 
[ENT-924] Revert "Revert "Show Enterprise display name if we should hide sensit…
 2018-04-24 05:43:49 +05:00
Ned Batchelder
a8e0d81f0f Merge pull request #18001 from edx/nedbat/release-line-meta-tag 
Report the RELEASE_LINE in a meta tag
 2018-04-23 17:43:06 -04:00
bmedx
98742c1c50 Update retirement APIs to match spec 2018-04-23 16:03:29 -04:00
Gregory Martin
93c211a0b6 Add Notes Delete User API endpoint 2018-04-23 15:45:26 -04:00
Jeremy Bowman
086e98449e TE-2546 Remove obsolete requirements files 2018-04-23 13:40:19 -04:00
Michael Youngstrom
c46a62ead9 Merge pull request #18022 from edx/testeng/bokchoy_auto_cache_update_d9252d990137c43d4aba1ea98d513f728cc1b735 
Bokchoy db cache update
 2018-04-23 13:08:38 -04:00
edx-cache-uploader-bot
bdc690af58 Updating migrations 2018-04-23 12:32:43 -04:00
Noraiz Anwar
8515cdf463 Merge pull request #18017 from edx/noraiz/EDUCATOR-2759 
fix outline progress
 2018-04-23 20:38:47 +05:00
irfanuddinahmad
3c40cd39f5 Merge pull request #18021 from edx/iahmad/migrate_video_transcripts 
added admin site settings
 2018-04-23 20:37:46 +05:00