Commit Graph

15276 Commits

Author SHA1 Message Date
Fred Smith
29f8180763 Merge pull request #16593 from edx/derf/be_able_to_configure_default_video_cdn_url
be able to configure default video cdn url
2017-11-17 15:38:35 -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
Fred Smith
14c7c5086e be able to configure default video cdn url 2017-11-16 14:30:18 -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
Jose Antonio Gonzalez
f38e5ab939 add DEFAULT_MOBILE_AVAILABLE flag 2017-11-16 16:50:37 +02: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
Jeremy Bowman
d6dc209569 Fixes for common/lib tests in Django 1.9+ 2017-11-15 11:00:39 -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
Clinton Blackburn
3a005c492f Disabled anonymous access for tabs that require enrollment 2017-11-14 08:00:16 -05:00
noraiz-anwar
73f9c02d6d optimize libraries iter for studio dashboard 2017-11-14 12:52:36 +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
David Ormsbee
3054ae43fd Merge pull request #16532 from edx/ormsbee/remove_fonts_shortcut
Remove unused OS X shortcut to fonts.
2017-11-13 08:57:45 -05:00
Ayub khan
a1f30644d9 Merge pull request #16541 from edx/LEARNER-2653-minor-code-refactor
Minor Code Refactor
2017-11-13 18:54:15 +05:00
ayub-khan
e0d96abf1c Minor Code Refactor
LEARNER-2653
Jenkins translation job pybabel process
was not able to interpret this line
and causing syntax error.
2017-11-13 18:00:00 +05:00
David Ormsbee
5f866c265b Remove unused OS X shortcut to fonts.
Based on the header, it looks like this was a large OS X Alias file,
checked in accidentally.
2017-11-09 17:34:16 -05:00
Troy Sankey
b07402e751 remove unused optparse imports 2017-11-09 15:38:54 -05:00
Marco Morales
9fc58a25bd Merge pull request #16506 from edx/hrein/responsive-experience/cleanups
Styling changes for responsive behavior on LMS.
2017-11-09 14:47:28 -05:00
Harry Rein
aa853a930e Styling changes for responsive behavior on LMS. 2017-11-09 12:46:48 -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
Matt Drayer
6027e5fc1d mattdrayer/ENT-686: Enhanced logging for SuccessFactors exceptions 2017-11-09 10:00:17 -05:00
John Eskew
80d70f6ecb Run all touched files through isort. 2017-11-09 09:25:19 -05:00
John Eskew
6672f64188 Add commerce AppConfig and use to register signals. Move imports.
Add explicit 'lms.djangoapps' prefix to all commerce imports, as another
commerce Django app exists at openedx.core.djangoapps.commerce
2017-11-09 09:24:37 -05:00
muzaffaryousaf
db07a049bf Clean makemigration test and bump the val version. 2017-11-09 17:48:45 +05:00
Muzaffar yousaf
690ddceb83 Merge pull request #16489 from edx/revert-16479-revert-16201-transcript-secure-credentials
Revert "Revert "Transcript secure credentials""
2017-11-09 15:57:36 +05:00
muzaffaryousaf
7de3871f67 Fix the makemigration test temporary. 2017-11-09 13:20:29 +05:00
Albert (AJ) St. Aubin
43d6cc209b Merge pull request #16359 from edx/aj/LEARNER-2661
Added Entitlement API
2017-11-08 12:25:58 -05:00
Albert St. Aubin
113e0af104 Added Entitlement API
The Entitlement API will allow for GET, POST, DELETE(Revoke), and
variations of these methods of managing and retrieving data about
Learner Entitlements.
[LEARNER-2661]
2017-11-08 10:03:38 -05:00
Matjaz Gregoric
9566b7a5f6 Ability to set HOMEPAGE_COURSE_MAX via SiteConfiguration.
The setting controls the number of courses displayed on the homepage.
2017-11-08 15:57:32 +01:00
Muhammad Ammar
4813929f1d Merge pull request #16458 from edx/ammar/fix-capa-hint-focus
fix capa hint focus
2017-11-08 08:11:46 +05:00
John Eskew
3d884d6cc0 Merge pull request #16428 from edx/jeskew/email_mkting_lti_prov_to_appconfig_ready
Move lti_provider/email_marketing startup to AppConfig ready.
2017-11-07 15:15:56 -05:00
Brian Mesick
333e1ccb96 Merge pull request #16433 from edx/bmedx/django111_urls_common
common urls cleanup for Django 1.11
2017-11-07 14:46:15 -05:00
muhammad-ammar
690542c998 fix capa hint focus
EDUCATOR-1555
2017-11-08 00:18:50 +05:00
bmedx
ffc2a0eb7c common urls cleanup for Django 1.11
- Remove usage of django.urls.patterns
- Change urls tuples to lists
- Make all string view names callables
2017-11-07 11:27:20 -05:00
Jeremy Bowman
1f1ad26137 Merge pull request #16465 from edx/jmbowman/PLAT-1774
PLAT-1774 Move x_module monkey-patching
2017-11-07 10:34:44 -05:00
Michael Youngstrom
4fa386150f Update lettuce and bok choy cached db's 2017-11-06 17:40:12 -05:00
Clinton Blackburn
69eeca61d8 Opening courseware to anonymous users
Anonymous users may now view units in the courseware. This access is limited to units that are not considered problems/graded (e.g. homework, exams).
2017-11-06 16:42:06 -05:00
Eric Fischer
ae0854b09f Merge pull request #16468 from edx/efischer/edu-1635
Log Role Creation
2017-11-06 14:45:52 -05:00
Eric Fischer
93877890fc EDUCATOR-1635 Log Role Creation 2017-11-06 13:56:27 -05:00
Harry Rein
7f61828e12 Cleaning up mobile web. 2017-11-06 12:33:23 -05:00