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

3961 Commits

Author SHA1 Message Date
Brian Mesick
d905899873 Merge pull request #16760 from edx/bmedx/django111_remove_noargscommand 
Update clear_collectstatic_cache management command to Django 1.11 spec
 2017-12-04 14:19:44 -05:00
Albert (AJ) St. Aubin
48c40cf05e Merge pull request #16751 from edx/aj/stafF_entitlement_permissions 
Updates to the API Endpoint to remove the Staff users ability to get all
 2017-12-04 14:08:56 -05:00
bmedx
29514cc2d2 Update clear_collectstatic_cache management command to Django 1.11 spec 2017-12-04 13:05:33 -05:00
Eric Fischer
2e3f871c12 Memoize common lookups during request 
Prevents repeated memcached lookups on functions whose values should
remain static for the lifetime of a request.

EDUCATOR-1731
 2017-12-04 11:54:50 -05:00
Jeremy Bowman
067785dbfd Merge pull request #16710 from edx/jmbowman/PLAT-1419 
PLAT-1419 Make edxmako a proper template backend
 2017-12-04 11:07:30 -05:00
Albert St. Aubin
dfa7b73a61 Updates to the API Endpoint to remove the Staff users ability to get all 
Entitlements
 2017-12-04 08:37:15 -05:00
Farhanah Sheets
d0687e97b1 Merge pull request #16734 from edx/fsheets/EDUCATOR-1825 
Update studiofrontend to pass generic studioContext
 2017-12-01 19:02:33 -05:00
Farhanah Sheets
e395e78521 Update to use generic studioContext configuration 2017-12-01 17:55:55 -05:00
Jeremy Bowman
fdc50c3aa8 PLAT-1419 Make edxmako a proper template backend 2017-12-01 17:01:52 -05:00
Matt Drayer
61bd579810 mattdrayer/ENT-783: Remove city from SuccessFactors OData API requests 2017-12-01 13:27:57 -05:00
Jesse Zoldak
9c49c10b27 Revert "Allow theme template block override" 2017-11-30 17:09:13 -05:00
Brian Mesick
3951b7527c Merge pull request #16658 from edx/bmedx/django111_tag_test_failures_lms_3 
Tag LMS Unit 3 tests that fail in Django 1.11
 2017-11-30 16:14:18 -05:00
Anthony Mangano
f72cf800e1 Consider user entitlements and use entitlement products in bundle one-click purchase 2017-11-30 13:59:46 -05:00
Uman Shahzad
37844fd927 Merge pull request #15947 from open-craft/allow-theme-template-block-override 
Allow theme template block override
 2017-11-29 22:25:27 +05:00
Albert (AJ) St. Aubin
8bd9c14f0b Merge pull request #16660 from edx/aj/entitlement_api_permissions 
Updated the permissions to all non staff users to get their entitlements
 2017-11-29 07:28:33 -05:00
Uman Shahzad
53fea6a4b7 Merge pull request #16624 from open-craft/uman/force-sync-learner-data 
[ENT-759] Add a TPA pipeline step to take forced sync into account.
 2017-11-29 17:11:29 +05:00
Uman Shahzad
ee09c4ccf9 Add a TPA pipeline step to allow force sync of user details. 
The feature is controlled by a switch on the provider.
Emails are sent if the email changes during the sync.
We skip syncing the username/email if there would be a conflict.
 2017-11-29 16:16:55 +05:00
Albert St. Aubin
dbbe52abbd Updated the permissions to all non staff users to get their entitlements 
[LEARNER-3084]
 2017-11-28 11:25:38 -05:00
Sven Marnach
b77bff4d96 Small fixes to support Okta SSO. 2017-11-28 16:50:53 +01:00
bmedx
ace88e7d5a Tag LMS Unit 3 tests that fail in Django 1.11 
Fixed some url reverse errors instead of marking since they were trivial
 2017-11-22 15:48:00 -05:00
bmedx
d3e6836d9e Fixes to common/openedx tests that reference apps CMS doesn't use 2017-11-22 15:46:06 -05:00
Calen Pennington
48abc492ae Fix linting errors from https://github.com/edx/edx-platform/pull/16615 2017-11-22 14:47:49 -05:00
Ned Batchelder
a2e2aace82 Merge pull request #16650 from edx/nedbat/fix-unused-imports 
Fix a number of unused-import pylint violations
 2017-11-22 11:17:07 -05:00
Matt Drayer
8d1053eef8 Merge pull request #16566 from edx/mattdrayer/ENT-686-5 
Better handling of data for OData API exception handling
 2017-11-22 07:39:52 -05:00
Matt Drayer
9b4be93628 Better handling of data for OData API exception handling 2017-11-21 23:41:06 -05:00
Calen Pennington
7aa1a3460b Merge pull request #16615 from edx/cale/schedules-admin-improvements 
Cale/schedules admin improvements
 2017-11-21 22:06:37 -05:00
Ned Batchelder
e23e3a0486 Fix a number of unused-import pylint violations 2017-11-21 19:57:06 -05:00
Calen Pennington
6756f97d0c Limit schedule resolvers to active schedules 2017-11-21 14:25:57 -05:00
Christopher Lee
0d931107aa Merge pull request #16589 from edx/clee/LEARNER-2891 
Remove uneccessary aria labels in the student dashboard
 2017-11-21 12:52:31 -05:00
christopher lee
4e32bd5abb Fix aria label for course details on the course dashboard 2017-11-20 13:48:17 -05:00
Brian Mesick
d2d764390f Merge pull request #16610 from edx/bmedx/django111_commaseparated_fields 
Move suggested_prices to CharField for Django 1.11 compat
 2017-11-20 10:55:40 -05:00
Albert (AJ) St. Aubin
8b8677a093 Merge pull request #16575 from edx/aj/entitlement_user_filter 
Addition of user filter parameter to the Entitlement API
 2017-11-17 08:22:01 -05:00
bmedx
f93696ca85 Move suggested_prices to CharField for Django 1.11 compat 
CommaSeparatedIntegerField is deprecated, this is the replacement. I
have confirmed there is no SQL generated for this migration since it is
already a CharField behind the scenes.
 2017-11-16 17:35:41 -05:00
Albert St. Aubin
d918cdb81e Addition of user filter parameter to the Entitlement API 
[LEARNER-3274]
 2017-11-16 13:52:54 -05:00
Bill Filler
03c97b5697 Merge pull request #16583 from edx/bfiller/ENT-727 
Disable View Consent button on dashboard
 2017-11-16 09:42:46 -05:00
asadiqbal
e5c55a8945 ENT-729 2017-11-16 16:28:31 +05:00
Bill Filler
2e783042d2 Disable View Consent button on dashboard 
Partial revert to disable calls to Enterprise API for each course in an
Enterprise Learner's dashboard to determine status of consent. Will re-enable once
a batch API is avaiable (WL-1315) to fix performance.

ENT-727
 2017-11-15 17:22:44 -05:00
John Eskew
f790766c26 Merge pull request #16548 from edx/jeskew/more_mgmt_cmd_conv_from_optparse 
Move more mgmt commands from optparse to argparse.
 2017-11-14 12:29:57 -05:00
Brian Mesick
dad73637aa Merge pull request #16495 from edx/bmedx/django111_startup_fixes 
Changes necessary for Django 1.11 tests to start
 2017-11-14 12:19:21 -05:00
Matt Drayer
d9970ef937 Merge pull request #16563 from edx/mattdrayer/ENT-686-4 
Revise SuccessFactors OData exception logging
 2017-11-14 12:12:00 -05:00
John Eskew
27315f442a Move more mgmt commands from optparse to argparse. 2017-11-14 11:26:46 -05:00
Matt Drayer
8ee0366203 Revise OData exception logging 2017-11-14 11:16:17 -05:00
Brian Mesick
7ccc498800 Merge pull request #16561 from edx/bmedx/django111_select_related 
Remove use of non-relational fields in select_related queries
 2017-11-14 11:04:41 -05:00
bmedx
09e5156543 Remove use of non-relational fields in select_related queries 
These changes should not change the actual queries at all, and those
will throw errors in Django 1.11.
 2017-11-14 10:10:08 -05:00
Troy Sankey
73318eccf7 Merge pull request #16526 from edx/pwnage101/teams_mgmt_commands 
teams and student management commands cleanup for django 1.11
 2017-11-13 18:11:56 -05:00
bmedx
d3bbb86fe3 Shims to fix test collection errors 2017-11-13 15:45:34 -05:00
Muzaffar yousaf
c1c8c20b76 Merge pull request #16517 from edx/subtitle-migrations 
Clean makemigration test and bump the val version.
 2017-11-14 01:09:04 +05:00
Troy Sankey
3685b1ada8 More student management commands cleanup for Django 1.11 
Seems like transfer_students.py was missed in the last attempt to
cleanup commands in this app.
 2017-11-13 14:09:39 -05:00
Troy Sankey
b07402e751 remove unused optparse imports 2017-11-09 15:38:54 -05:00
Matt Drayer
5062d49562 Merge pull request #16475 from edx/mattdrayer/ENT-686-3 
mattdrayer/ENT-686: Enhanced logging for SuccessFactors exceptions
 2017-11-09 11:51:01 -05:00