Commit Graph

672 Commits

Author SHA1 Message Date
muzaffaryousaf
e2d9ecc010 Make migrations in-sync with models 2016-04-07 12:26:18 +05:00
Robert Raposa
a6ac06f210 Remove outdated safe template recommendations
- Remove <%include> linting
- Remove dump_html_escaped_json
2016-04-06 14:57:48 -04:00
Andy Armstrong
845e3708f3 Introduce Pattern Library test pages
FEDX-93

These are developer only pages, so can not be seen in production
environment. On devstack, you can access these pages in LMS and
Studio at:

    /template/ux/reference/pattern-library-test.html
2016-04-05 09:22:14 -04:00
Peter Fogg
d86aff2866 Merge pull request #11982 from edx/peter-fogg/create-api-request
Request API access.
2016-04-04 22:56:49 -04:00
Peter Fogg
b340c2fd9c Allow users to request access to the Course Discovery API.
ECOM-3940
2016-04-04 20:29:19 -04:00
Jonathan Piacenti
17ec12c650 Address platform final review notes. 2016-04-01 21:06:07 +00:00
Jonathan Piacenti
a04a635efc Add accomplishments to user profile 2016-04-01 10:13:08 -05:00
Jonathan Piacenti
a2104634a1 Implement Badging API views. 2016-04-01 10:13:08 -05:00
Clinton Blackburn
c921f2ac90 Merge pull request #12011 from edx/clintonb/course-api-image
Exposing absolute/CDN image URLs via Course API
2016-04-01 10:31:59 -04:00
Clinton Blackburn
00b48e54a1 Exposing absolute/CDN image URLs via Course API
ECOM-4013
2016-04-01 09:42:57 -04:00
Cliff Dyer
6917eb03cf Merge pull request #12009 from edx/merge-release-into-master
Merge oauth release into master via intermediary branch
2016-04-01 06:12:16 -04:00
J. Cliff Dyer
05218f954b Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-03-31 20:15:22 +00:00
Simon Chen
21be72048a Create the listing page of Programs (x-series) which learners have enrolled in 2016-03-31 15:35:50 -04:00
Saleem Latif
7b549bc354 Merge pull request #11806 from edx/saleem-latif/WL-327
WL-327: Add SiteConfiguration and SiteConfigurationHistory models to LMS
2016-03-31 18:39:38 +05:00
Saleem Latif
d7f781db20 Add SiteConfiguration configuration model to LMS 2016-03-31 12:46:42 +05:00
Clinton Blackburn
1185fff1ec Added pacing field Course API
ECOM-3994
2016-03-30 14:36:43 -04:00
J. Cliff Dyer
1df040228a Configure LMS to select oauth2 providing library.
Available backends:

* django-oauth-toolkit (DOT)
* django-oauth2-provider (DOP)

* Use provided client ID to select backend for
  * AccessToken requests
  * third party auth-token exchange
* Create adapters to isolate library-dependent functionality
* Handle django-oauth-toolkit tokens in edX DRF authenticator class

MA-1998
MA-2000
2016-03-30 14:21:27 +00:00
J. Cliff Dyer
88fef8b2a4 Use renamed edx_oauth2_provider throughout.
MA-1998 Install and configure django_oauth_toolkit to coexist with
existing oauth libraries.
2016-03-30 14:21:17 +00:00
Tasawer
05898df1c1 updated dashboard with providers text
ECOM-2935
2016-03-29 09:26:35 +00:00
Matt Drayer
ed0c26160b Merge pull request #11885 from edx/saleem-latif/WL-328
WL-325: Multi-Site Comprehensive Theming
2016-03-28 16:23:34 -04:00
Zia Fazal
a796b56314 saleem-latif/WL-328: Multi-Site Comprehensive Theming
ziafazal: improvements need for multi-tenancy
ziafazal: fixed broken tests
ziafazal: no need to add setting in test.py
ziafazal: added hostname validation
ziafazal: changes after feedback from mattdrayer
ziafazal: fixed branding and microsite broken tests
ziafazal: make STATICFILES_DIRS to list
ziafazal: added theme directory to mako lookup for tests
ziafazal: added more protection in test_util
saleem-latif: Enable SCSS Overrides for Comprehensive Theming
saleem-latif: Incoporate feedback changes, Correct test failures, add tests and enable theming for django templates
saleem-latif: Correct errors in python tests
mattdrayer: Fix invalid release reference
mattdrayer: Update django-wiki reference to latest release
saleem-latif: Update Theme storages to work with Caching, Pipeline and collectstatic
saleem-latif: Incorporate feedback changes
mattdrayer: Pylint violation fix
mattdrayer: Fix broken pavelib test
2016-03-28 14:57:01 -04:00
Peter Fogg
374e97c15f Admin access for API requests.
ECOM-3943
2016-03-28 11:42:42 -04:00
solashirai
0dcddf1e57 moved bokchoy tests 2016-03-26 18:02:33 -04:00
solashirai
fc5ccbfb95 removed unused context_selector 2016-03-26 18:02:33 -04:00
solashirai
d3115f3c7d quality fixes 2016-03-26 18:02:33 -04:00
solashirai
d59b5fb87a quality fixes 2016-03-26 18:02:33 -04:00
solashirai
436cebdebc added __init__.py 2016-03-26 18:02:33 -04:00
solashirai
512167485d quality fixes 2016-03-26 18:02:33 -04:00
solashirai
9dd604ee73 removed accidental addition of unneeded file 2016-03-26 18:02:33 -04:00
solashirai
38752a777b modified to resemble test_recommender 2016-03-26 18:02:33 -04:00
solashirai
fdae162b84 added method to skip test unless testing in lms 2016-03-26 18:02:33 -04:00
solashirai
b7b1d43e0e Added basic docstrings 2016-03-26 18:02:33 -04:00
Piotr Mitros
da6e3e23a8 Fixes for imports 2016-03-26 18:02:33 -04:00
solashirai
052655016b added crowdsourcehinter 2016-03-26 18:02:33 -04:00
Toby Lawrence
beabe25a97 Merge pull request #11839 from edx/PERF-268
Make CDNifying of course over image URLs only happen for relative URLs.
2016-03-24 15:29:21 -04:00
Waheed Ahmed
b8a447c132 Moved white label sites to logistration.
ECOM-2948
2016-03-24 14:09:11 +05:00
Toby Lawrence
85304b8b9d Make CDNifying of course over image URLs only happen for relative URLs.
We don't want to blindly assemble the base CDN URL with whatever an
image URL happens to be, since it might be an absolute URL and now the
result is a broken URL.  We take a more selective approach now.
2016-03-22 13:56:40 -04:00
Awais
a154e7f1c3 Adding the ecom api functionality for the credentials.
ECOM-2931
2016-03-22 14:01:54 +05:00
Ben Patterson
c504029b39 Create a third shard for lms unit tests.
This will leverage the nose attrib plugin to allow us
to break tests apart on our build system to run
in parallel on separate nodes.
2016-03-17 12:01:42 -04:00
Jesse Zoldak
f891d27cbb Revert "ziafazal/WL-328: Multi-Site Comprehensive Theming"
This reverts commit 954dae584a.
2016-03-16 11:19:36 -04:00
Zia Fazal
954dae584a ziafazal/WL-328: Multi-Site Comprehensive Theming
ziafazal: improvements need for multi-tenancy
ziafazal: fixed broken tests
ziafazal: no need to add setting in test.py
ziafazal: added hostname validation
ziafazal: changes after feedback from mattdrayer
ziafazal: fixed branding and microsite broken tests
ziafazal: make STATICFILES_DIRS to list
ziafazal: added theme directory to mako lookup for tests
ziafazal: added more protection in test_util
saleem-latif: Enable SCSS Overrides for Comprehensive Theming
saleem-latif: Incoporate feedback changes, Correct test failures, add tests and enable theming for django templates
saleem-latif: Correct errors in python tests
mattdrayer: Fix invalid release reference
mattdrayer: Update django-wiki reference to latest release
2016-03-14 13:42:53 -04:00
Nimisha Asthagiri
a1458b99f8 Merge pull request #11684 from CredoReference/feature/edx-23-new
New optional parameters for course blocks API: lti_url, block_types_filter
2016-03-11 17:09:41 -05:00
Calen Pennington
f092550945 Merge pull request #11562 from CredoReference/tags-selectbox-in-studio-based-on-xblockasides
XBlockAside improvement. Difficulty selectbox in Studio (based on new XBlockAside functionality)
2016-03-10 10:32:22 -05:00
Douglas Hall
fd318e05db Merge pull request #11767 from edx/ibrahimahmed443/SOL-1691
return course end date in credit service and rename flag
2016-03-10 05:52:06 -05:00
erm0l0v
4142438372 add CourseTalk widget
Move tests to one test class
2016-03-09 13:32:07 +03:00
Ibrahim
97ef7397ce return course end date in credit service and rename flag 2016-03-08 19:12:19 +05:00
Christina Roberts
e6fcfae994 Merge pull request #11751 from edx/christina/remove-profile-name
Remove unused profile name.
2016-03-07 10:44:34 -05:00
Kevin Falcone
ec6eccce7a Merge pull request #11748 from edx/jibsheet/course_overview_0009_on_migrate_from_scratch
Migrate correctly from scratch also
2016-03-07 10:30:30 -05:00
cahrens
2f3e3a55bb Remove unused profile name.
The profile name requires escaping when displayed. Proactively removing since it is not being used. Also discovered some dead code.
2016-03-07 09:37:39 -05:00
Kevin Falcone
631bfc08a3 Migrate correctly from scratch also
Unfortunately, instrospection.get_table_description runs
select * from course_overview_courseoverview, which of course
does not exist while django is calculating initial migrations, causing
this to fail.  Additionally, sqlite does not support information_schema,
but does not do a select * from the table.

Lift the main part of mysql's get_table_description up to the migration itself
and just inspect it directly.  Continue to call the API for sqlite.
2016-03-04 11:46:25 -05:00