Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
36,161 Commits 1 Branch 0 Tags
2be2b52f632650360f5a930299fe27c1bcc71a4b
Commit Graph

6805 Commits

Author SHA1 Message Date
e0d
2be2b52f63 apply the setting to the CMS too 2016-04-08 06:09:03 -04:00
clrux
0571103bdb Merge pull request #11369 from edx/clrux/ac-223 
AC-223 updating transcript skip links
 2016-04-07 13:23:02 -04:00
Chris Rodriguez
fbe6160461 LMS: updating transcript skip links 2016-04-07 12:18:08 -04:00
Matt Drayer
c7552db4d5 Merge pull request #11987 from edx/asadiqbal08/xblock_translations 
asadiqbal08/WL-388: Add ModuleI18nService for Descriptor System
 2016-04-07 10:54:33 -04:00
Jim Abramson
e0ca1ecaef remove unused CERTIFICATES_ENABLED feature flag 
ECOM-4040
 2016-04-06 17:53:40 -04:00
Ned Batchelder
88e3634d82 Update translations (autogenerated message) 2016-04-06 19:32:20 +00:00
asadiqbal
7ae40dced8 asadiqbal08/WL-388: ModuleI18nService for Descriptor System 
mattdrayer: Default to XBlock class if no unmixed class
 2016-04-06 11:53:14 -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
Nimisha Asthagiri
1c9a75b42e Merge pull request #12029 from openfun/regisb/fix_broken_french_ugettext_in_tests 
Fix broken French i18n in CMS tests
 2016-04-04 14:28:04 -04:00
Régis Behmo
e850ef2db2 Fix broken French i18n in CMS tests 
French ugettext method was being monkey-patched with a "XYZ " prefix in
all tests. This introduces a context manager to guarantee that the
function reverts to its original state after the unit test has ended
(successfuly or not).
 2016-04-04 18:28:26 +02:00
Brian Jacobel
24990272b1 Do not set up underscore.string globally. 2016-04-04 10:18:44 -04:00
Brian Jacobel
1ed5b4bda9 Remove usage of Underscore.string in edit-chapter.underscore 2016-04-04 10:18:44 -04:00
Andy Armstrong
db62db295c Upgrade Underscore.string 
FEDX-117
 2016-04-04 10:18:43 -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
Omar Khan
793bb0f1e9 Custom icons for third party auth login buttons 
- Icon images can be uploaded from the django admin
- Test coverage improved
 2016-04-01 08:57:43 +07:00
Nimisha Asthagiri
0c604da9ee Merge pull request #11900 from edx/nasthagiri/css-template 
XSS Safe by default: dashboard, header, footer, navigation, help_modal
 2016-03-31 17:25:30 -04:00
Nimisha Asthagiri
432c570628 XSS Safe default - header.html, navigation.html, help_modal.html 2016-03-31 16:34:33 -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
Fred Smith
5eb586674d Merge pull request #11641 from eduNEXT/fmo/read_elasticsearch_config_from_json 
Read ELASTIC_SEARCH_CONFIG setting from the cms.env.json file
 2016-03-31 14:27:22 -04:00
Ned Batchelder
259cbdd630 Merge pull request #11993 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-03-31 14:16:15 -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
Ned Batchelder
38a9ace7bf Update translations (autogenerated message) 2016-03-30 19:35:49 +00:00
jsa
52657af81d add edx-management-commands dependency. 2016-03-30 14:59:09 -04:00
sanfordstudent
f730936d76 Merge pull request #11937 from edx/sstudent/MA-2164-followup 
followup to MA-2164, cleaning up unused steps
 2016-03-30 13:30:55 -04:00
sanfordstudent
fd37948726 Merge pull request #11989 from edx/release 
Release
 2016-03-30 11:22:23 -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
Carol Tong
84e88ebaaa Merge pull request #11969 from edx/carol/DOC-2216 
DOC-2216: Modify message text when Adv Settings saved
 2016-03-29 17:11:55 -04:00
Carol Tong
a33e703910 Modify message text when Adv Settings saved 2016-03-29 16:12:00 -04:00
Carol Tong
4ab75c7c00 Update help text on Grading Assignment Types page 2016-03-29 15:39:24 -04:00
Sanford Student
a8c77f8d78 followup to MA-2164, cleaning up unused steps 2016-03-29 13:46:52 -04:00
Calen Pennington
37813d1820 Merge pull request #11958 from cpennington/cale/xss 
Make (some) Mako templates HTML escaped by default
 2016-03-29 11:03:31 -04:00
Calen Pennington
683151a238 XSS escape cms/templates/course-create-rerun.html 2016-03-29 08:51:22 -04:00
Calen Pennington
b81a15d57f XSS escape cms/templates/course_outline.html 2016-03-29 08:51:22 -04:00
Brian Beggs
1dff9d45f3 Merge pull request #11787 from mitocw/enhancement/aq/add_master_course_staff_in_ccx_fix_migration_issue 
Adds staff and instructor users of the master course to CCX
 2016-03-28 18:49:46 -04:00
Christina Roberts
1fa1faeee5 Merge pull request #11903 from edx/christina/cohort-template-cleanup 
Perform escaping in the templates.
 2016-03-28 16:25:28 -04: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
cahrens
39dc8a5915 Perform esacaping in the templates. 
Use new best practices.
 2016-03-28 15:05:40 -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
7ab6aaaa3b Merge pull request #11959 from edx/peter-fogg/request-api-access 
Admin access for API requests.
 2016-03-28 12:44:56 -04:00
Peter Fogg
374e97c15f Admin access for API requests. 
ECOM-3943
 2016-03-28 11:42:42 -04:00
Renzo Lucioni
3cbc03202c Hide chrome and default_tab from advanced settings 
It doesn't make sense to list these LMS block attributes in course-level advanced settings. Doing so is confusing to course teams.
 2016-03-28 10:30:46 -04:00
Amir Qayyum Khan
795ead82b5 Added master course staff and admins to ccx and fixed same issues related to ccx 2016-03-26 03:18:39 +05:00
Sanford Student
ed7237b671 fixing typo in template 2016-03-25 16:50:28 -04:00
Muddasser
a0b63d39f9 Merge pull request #11828 from edx/muddasser/cms/textbooks 
Partially covered in bokchoy at lms/test_lms.py:PDFTextBooksTabTest
 2016-03-25 22:45:38 +05:00
Andy Armstrong
6dd09a89cf Fix issues with Underscore in the asset pipeline 
FEDX-121

The previous approach for handling NPM assets was
to symlink them into the static directory. This appeared
to cause trouble with the asset pipeline where the files
in question were not installed and then old versions were
picked up instead.

This change instead copies NPM libraries to a new
static directory so that the pipeline can consume them
as with any other file. This new directory is added to
.gitignore so that the files don't get accidentally
checked in.
 2016-03-25 10:02:38 -04:00
Akiva Leffert
91c0517b7a Merge pull request #11918 from edx/aleffert/remove-unit-coffee 
Remove unused empty file
 2016-03-24 17:01:10 -04:00