Commit Graph

3988 Commits

Author SHA1 Message Date
muzaffaryousaf
e2d9ecc010 Make migrations in-sync with models 2016-04-07 12:26:18 +05: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
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
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
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
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
Ned Batchelder
fd4164de1d Merge pull request #11737 from edx/release
Release ⇒ master
2016-03-03 14:51:29 -05:00
Simon Chen
b47a6d592f ECOM-3415 make sure all the xseries programs associated with a course is displayed 2016-03-03 08:42:14 -05:00
Omar Khan
50b6bf27f2 Registration: don't require terms of service if checkbox is hidden
Fixes test failures in e461374973
2016-03-03 16:58:58 +07:00
Nimisha Asthagiri
a0871900e6 Merge pull request #11734 from edx/security/quiet_safe_sessions
Quiet the safe sessions logging for expected use cases
2016-03-02 18:01:15 -05:00
Nimisha Asthagiri
de3fca35be Quiet the safe sessions logging for expected use case 2016-03-02 14:47:44 -05:00
John Eskew
2ab54f315a Merge pull request #11669 from edx/jeskew/fix_django19_warnings
Add app_label to models to prevent Django1.9 warnings.
2016-03-01 17:19:55 -05:00
Ben Patterson
9e4f14f1be Revert "Registration: don't require terms of service if checkbox is hidden" 2016-02-29 12:08:09 -05:00
Omar Khan
23a0a6d41a Merge pull request #11644 from open-craft/omar/hide-tos
Registration: don't require terms of service if checkbox is hidden
2016-02-29 23:15:56 +07:00
Kevin Falcone
7a129b0e9f Noop the 0008 and conditional the 0009 migration
We removed a column in the same release that we removed it
from the model.  This creates a gap where the code still looks for
a column which has been dropped until the new code has been deployed.

The initial fix was to put the column back, but that creates a window
during the alterations where views will error.

This noops the 0008 migration and effectively noops 0009 unless you've
run the old migration.
2016-02-26 17:14:12 -05:00
Nimisha Asthagiri
33e47d317b Course Overview migrations fix: Readd the Facebook URL field. 2016-02-26 10:20:36 -05:00
John Eskew
e87bb74c22 Add app_label to models to prevent Django1.9 warnings. 2016-02-25 17:34:31 -05:00
Omar Khan
e461374973 Registration: don't require terms of service if checkbox is hidden 2016-02-24 16:18:32 +07:00
Ibrahim
c503c236a9 add student email in credit service 2016-02-22 14:45:25 +05:00
Nimisha Asthagiri
4bbe9a2021 Merge pull request #11326 from edx/mobile/remove-dead-code
Mobile API: remove unused endpoints
2016-02-19 15:14:13 -05:00
Usman Khalid
4be5aeb194 Merge pull request #11550 from edx/muzaffar/tnl4013
Using display_name_with_default  instead of display_name.
2016-02-19 17:51:27 +05:00
muzaffaryousaf
509522414a Using display_name_with_default instead of display_name.
TNL-4103
2016-02-19 16:50:23 +05:00
Nimisha Asthagiri
fa8ca11d8c Remove unused Mobile Social Facebook endpoint 2016-02-18 12:12:04 -05:00
M. Rehan
af9e26f5cb Merge pull request #11479 from edx/mrehan/plat-998-warnings-on-logout
Fix - Bypass unnecessary logs on logging out.
2016-02-17 17:46:05 +05:00