Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,069 Commits 1 Branch 0 Tags
08dcbace0f9fbeecb4da46fb5d2b4d006ff93e4e
Commit Graph

2444 Commits

Author SHA1 Message Date
Ned Batchelder
6be4337c7d Merge pull request #14898 from edx/nedbat/help-tokens-app 
Use a new external app for help tokens
 2017-05-03 18:08:27 -04:00
Ben Patterson
6e5769f279 Fix webpack service location for testing. 2017-05-01 17:09:32 -04:00
Brian Jacobel
a2323797f5 Work on sandbox bundling for webpack 2017-05-01 17:09:32 -04:00
Brian Jacobel
57e8250619 Webpack in LMS 2017-05-01 17:09:32 -04:00
Ned Batchelder
2f1936ce73 Replace context processor with new help-tokens app 
This makes it possible to refer to multiple book from a single app.

This also means that Open edX branches will be able to pass bok-choy
tests (at least if the books have already been built.)
 2017-04-27 10:34:09 -04:00
Calen Pennington
33fee20c3a Reapply "Merge pull request #14868 from cpennington/learner-542" 
This reverts commit 65f13ddec4.
 2017-04-27 09:25:02 -04:00
edx-pipeline-bot
38c0fbd638 Merge pull request #14975 from edx/release-mergeback-to-master 
Merge release back to master
 2017-04-26 15:29:32 -04:00
Calen Pennington
65f13ddec4 Revert "Merge pull request #14868 from cpennington/learner-542" 
This reverts commit 88dd85caec, reversing
changes made to bf8aef33fc.
 2017-04-26 11:29:56 -04:00
Clinton Blackburn
2b4817b102 Added OpenID Connect discovery endpoint 
Although we are phasing out our support of OIDC, this particular feature will allow us to eliminate many of the settings we
share across services. Instead of reading various endpoints and secret keys from settings or hardcoded values, services
with the proper authentication backend can simply read (and cache) the information from this endpoint.

ECOM-3629
 2017-04-26 10:02:27 -04:00
Brittney Exline
2b48a5e7c5 Merge pull request #14920 from edx/bexline/registration_email 
ENT-304 Add confirm email field to registration
 2017-04-26 07:59:29 -04:00
Brittney Exline
c2df64c3f8 ENT-304 Add confirm email field to registration 2017-04-25 18:35:29 +00:00
Calen Pennington
88dd85caec Merge pull request #14868 from cpennington/learner-542 
Store Learner language preferences into a cookie rather than the session
 2017-04-25 14:08:13 -04:00
Calen Pennington
f8b050a5d8 Put LANGUAGE_COOKIE into settings 2017-04-24 13:03:17 -04:00
Calen Pennington
e733179d49 Store Learner language preferences into a cookie rather than the session 
This modifies the lang-pref django app to:
a) Use the current value of the 'edx-language-preference' cookie to set the
   users Accept-Language header on an incoming request.
b) At the end of the request, update the 'edx-language-preference' cookie
   to reflect the users current Language Preference choice, if any.

[LEARNER-542]
 2017-04-24 07:37:19 -04:00
Saleem Latif
0361b50286 Change Account Activation UI on Dashboard 2017-04-24 10:22:35 +05:00
Zubair Afzal
22ab0c8d47 Merge pull request #14907 from edx/zub/ENT-247-enterprise-logo-size-config 
ENT-247 Get enterprise logo image size limit from env configuration
 2017-04-21 19:46:09 +05:00
Muhammad Ammar
c3d0a50d42 Merge pull request #14514 from edx/ammar/tnl-6513-frontend-hls-support 
HLS playback support in video player
 2017-04-21 12:38:11 +05:00
zubair-arbi
470a526d73 Get enterprise logo image size limit from env configuration 
ENT-247
 2017-04-21 12:35:28 +05:00
Clinton Blackburn
163c71e8c4 Updated CREDENTIALS_SERVICE_USERNAME setting for Docker-based devstack 2017-04-20 14:57:22 -04:00
Matt Drayer
561646699c Merge pull request #14762 from edx/mattdrayer/add-enterprise-aws-config 
Add environment overrides for Enterprise settings
 2017-04-20 09:12:05 -04:00
Qubad786
b2cfad1650 Add Configuration Models for HLS Playback Feature. 2017-04-20 16:35:46 +05:00
Marko Jevtic
885d54239f [LEARNER-493] Add feature flag for Bundled Purchase - WL 2017-04-18 05:35:06 +00:00
muhammad-ammar
6f2a2b445f add HLS playback support in video player 
TNL-6513
 2017-04-13 14:20:47 +05:00
Andy Armstrong
da1ac4664e Implement common redirect logic for all course tabs 
LEARNER-76
 2017-04-12 16:05:32 -04:00
Clinton Blackburn
016b652509 Corrected LMS Docker devstack settings 
- Fixed LMS_ROOT_URL
- Fixed Enterprise API URL
 2017-04-10 18:01:39 -04:00
Clinton Blackburn
eaed23d55c Updated Docker devstack settings to support an external marketing site 
These changes help simplify integrating with edx.org's separate marketing site.

ECOM-6627
 2017-04-06 16:10:44 -04:00
Matt Drayer
3aecfe913e Add environment overrides for Enterprise settings 2017-04-03 10:39:03 -04:00
Andy Armstrong
0325425c8c Add data sharing consent redirect for more course tabs 
LEARNER-394
 2017-03-31 19:12:13 -04:00
Robert Raposa
77f111b2b1 Moves and rename common/djangoapps/newrelic_custom_metrics. 2017-03-31 15:19:53 -04:00
asadiqbal
ed33d3b09f ENT-287 Track Selection: Enterprise messaging only for catalog courses 2017-03-31 16:54:16 +05:00
cahrens
e5035746bf Introduce EnrollmentTrackUserPartition. 
TNL-6674
 2017-03-30 12:24:48 -04:00
Nimisha Asthagiri
4ac78706a3 Waffle Switch with namespacing and request caching 2017-03-28 17:49:20 -04:00
Andy Armstrong
89e5c0fd8d Convert course bookmarks into a feature 
LEARNER-39
 2017-03-22 16:09:13 -04:00
Robert Raposa
c37137a6b5 Add course outline bokchoy tests. 
- Rename CourseOutlinePage to StudioCourseOutlinePage in lms tests.
- Introduce CourseHomePage with outline child.
- Add a11y, breadcrumbs, and waffle.
 2017-03-22 13:00:39 -04:00
Andy Armstrong
435a6f5225 Make course_experience a feature 2017-03-22 13:00:38 -04:00
Brian Jacobel
db6c2fe8bf Outline will only show section and subsection, not unit 2017-03-22 13:00:37 -04:00
asadiqbal
bfde6d63c5 ENT-251 Updated track selection UI for Enterprise context 2017-03-22 17:32:58 +05:00
Jillian Vogel
be088dd924 Adds settings.ENTERPRISE_PUBLIC_ENROLLMENT_API_URL 
which is used for external, client-side requests by the Enterprise app to the
Enrollments API.

This allows ENTERPRISE_ENROLLMENT_API_URL to use localhost:8000, to be used for
internal, server-side requests.

Bumps edx-enterprise version to 0.27.4 to use this change.
 2017-03-18 12:43:53 +10:30
Michael Youngstrom
195e7f27d3 Disable Django API browser and bump pa11ycrawler 
Force run on PR for testing

Remove pa11ycrawler from base.txt for testing

Update pa11ycrawler dependency

Revert code needed for testing on Jenkins

Enable testing for Jenkins

Update accessibility-tests.sh

Update accessibility-tests.sh

Point to newest pa11ycrawler release

Remove force run on PR

Reset accessibility-tests.sh
 2017-03-17 13:51:13 +00:00
Clinton Blackburn
4cc7628696 Upgraded to Python Social Auth 0.2.21 to resolve migration issue 2017-03-10 23:06:02 -05:00
Clinton Blackburn
078974d24a Disabled search for Docker-based devstack 
This feature is not well-documented, so it is unclear how to setup Elasticsearch properly to make it work. The next person who needs to work on this feature will need to make it work and, ideally, document it.
 2017-03-07 21:21:49 -05:00
Brittney Exline
0cdce8ed71 ENT-191 Adding new edx-enterprise packages to be optionally installed 
We introduced two more apps in edx-enterprise that need to be pulled in.
 2017-03-02 06:10:53 +00:00
Michael Youngstrom
01ed17426f Merge pull request #14628 from edx/michaelyoungstrom/revert_django_setting 
[WIP] Revert Django renderer change
 2017-03-03 17:37:41 -05:00
Michael Youngstrom
fa74e0bf19 Revert Django renderer change 
Force run on PR

Remove force run on PR
 2017-03-03 17:34:02 -05:00
Brandon DeRosier
20ae9948d1 Merge pull request #14610 from open-craft/bdero/fix-enterprise-api-url 
Keep default ENTERPRISE_API_URL if LMS_ROOT_URL not set
 2017-03-03 14:30:10 -05:00
Brian Jacobel
f3bce3ee20 Merge pull request #13903 from proversity-org/proversity/feature-cookie-consent 
add cookie consent feature flag and popup banner
 2017-03-03 11:16:16 -05:00
Brandon DeRosier
48fe4ad10b Keep default ENTERPRISE_API_URL if LMS_ROOT_URL not set 2017-03-01 15:48:25 -05:00
Andy Armstrong
f6876ce199 Merge pull request #13937 from edx/andya/use-ui-blocks 
[WIP] Use web fragments for discussion and static tabs
 2017-03-01 00:36:48 -05:00
Nimisha Asthagiri
77a29242e3 Merge pull request #14571 from edx/beryl/cbs_models 
Storage-backed versioned Block Structures: Models
 2017-02-28 23:50:21 -05:00
Andy Armstrong
248558f1d4 Render Discussion tab using web fragments 2017-02-28 23:39:39 -05:00