Commit Graph

822 Commits

Author SHA1 Message Date
Kevin Falcone
b6d5c614dd Merge pull request #12074 from edx/derf/clear_existing_assets_before_copying_new_assets
clear existing assets before copying new assets
2016-04-20 16:18:54 -04:00
Andy Armstrong
60fab86f01 Reconcile double reverts
Resolves conflicts between reverts of pattern library test pages and multi-site comprehensive theming, and the re-introduction of pattern library test pages. Fixes a pipeline rendering test which relied on other tests updating assets. The test now ensures that static assets are available before running.
2016-04-14 23:28:55 -04:00
Renzo Lucioni
affee69296 Manually merge release into master 2016-04-14 14:23:06 -04:00
Matt Drayer
392ee7d258 Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"
This reverts commit a796b56314.

Conflicts:
	lms/envs/common.py
	openedx/core/djangoapps/theming/models.py
	pavelib/assets.py
	pavelib/paver_tests/test_assets.py
2016-04-12 08:22:14 -04:00
Simon Chen
498ab88794 Merge pull request #12044 from edx/schen/ECOM-3198
ECOM-3198 Add banner image to the program listing program cards
2016-04-11 16:00:03 -04:00
Christine Lytwynec
a14718bb92 Add pa11ycrawler command 2016-04-11 15:47:26 -04:00
Simon Chen
149412d2c3 ECOM-3198 Add banner image to the program listing program cards 2016-04-11 14:58:33 -04:00
Andy Armstrong
9290c52b33 Introduce Pattern Library test pages (take two)
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

This is the second attempt to enable the Pattern Library. The
first attempt broke Django Templates and didn't work correctly
with right-to-left styling.
2016-04-11 00:45:31 -04:00
Brian Jacobel
4671970f86 Revert "Introduce Pattern Library test pages"
This reverts commit 845e3708f3.
2016-04-08 14:25:41 -04:00
Brian Jacobel
36917398c0 Revert "Introduce Pattern Library test pages"
This reverts commit 845e3708f3.
2016-04-08 11:41:04 -04:00
Fred Smith
9ff39385c6 clear existing assets before copying new assets 2016-04-07 14:13:47 -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
Ned Batchelder
82e77049fa Merge pull request #11996 from edx/ned/i18n-dummy-compilejs
Compile js strings when we make dummy strings.
2016-04-04 14:57:20 -04:00
Omar Khan
66ac9b0185 Merge pull request #11849 from open-craft/omar/watch-assets
Fix paver watch_assets
2016-04-04 22:37:50 +07:00
Brian Jacobel
9baae2ff3f Merge pull request #11963 from edx/andya/upgrade-underscore-string
Upgrade Underscore.string
2016-04-04 11:35:40 -04:00
Andy Armstrong
db62db295c Upgrade Underscore.string
FEDX-117
2016-04-04 10:18:43 -04:00
Omar Khan
53642579ad Fix paver watch_assets
- Update to latest version of watchdog.
- inotify doesn't work on nfs share in devstack. Use polling instead.
- Some editors (vim) do not trigger modify events in their default
  configuration. Rebuild assets on all filesystem changes, and debounce
  when changes happen too quickly.
2016-04-04 12:36:07 +07:00
J. Cliff Dyer
f2ea041948 Allow paver users to uninstall obsolete python packages via a paver command.
MA-2250
2016-04-01 16:37:15 -04:00
Ned Batchelder
e2109b97db Run compilejsi18n when we make dummy strings 2016-04-01 15:52:27 -04:00
Ned Batchelder
a368982c14 Stop using roundabout ways of passing strings to cmd() 2016-04-01 15:52:27 -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
d426931e40 Add --save_screenshots option to paver test_bokchoy 2016-04-01 08:56:27 +07:00
J. Cliff Dyer
05218f954b Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-03-31 20:15:22 +00: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
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
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
Eric Fischer
be00a96129 Get environment variable for bok-choy-custom runs 2016-03-22 10:16:30 -04:00
cahrens
0c9937889b Enabling XSS vulnerability flag for bok choy tests 2016-03-22 10:16:27 -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
Jesse Zoldak
9251a6dc26 Always uninstall python packages on the uninstall list before installing the python requirements 2016-03-09 17:10:11 -05:00
Kevin Falcone
b4ac588ce1 Update reset-test-db.sh for bok-choy
This now correctly migrates and dumps files for both databases.

Run lettuce migrations for both databases
2016-02-29 13:59:29 -05:00
Usman Khalid
2586f09d7a Add option to disable migrations when running tests
By default, migrations are applied as they always have been. Exporting DISABLE_MIGRATIONS=1 or passing --disable-migrations to Paver commands will create tables directly from apps' models.
2016-02-29 11:47:32 -05:00
Ned Batchelder
526db7293a A better way to manage the Python packages to uninstall. 2016-02-23 13:51:49 -05:00
Clinton Blackburn
8af930d2eb Fixed package uninstall for django-oauth2-provider
edx-django-oauth2-provider is being mistaken for django-oauth2-provider. Making the filter less liberal ensures we properly uninstall django-oauth2-provider once.

ECOM-3647
2016-02-11 11:46:38 -05:00
Clinton Blackburn
f78945bd1d Updated expected version for python_uninstall_version.txt
Follow up to #11432. This value needs to be incremented to ensure the old package is uninstalled.

ECOM-3647
2016-02-10 19:46:55 -05:00
Clinton Blackburn
219b7f75cf Merge pull request #11432 from edx/clintonb/oauth-client-credentials
Updated django-oauth2-provider
2016-02-10 16:44:37 -05:00
Clinton Blackburn
e92802b382 Updated django-oauth2-provider
New package includes support for client credentials grant.
2016-02-08 21:48:22 -05:00
Ben Patterson
f1b366589b Remove ruby dependencies.
Sass compilation is no longer dependent on Ruby, so we are
removing its dependencies.
2016-02-08 17:02:55 -05:00
Ben Patterson
e5da5006fb Testsonly mode should also skip clearing mongo. 2016-02-04 06:58:57 -05:00
Ben Patterson
4caed6184c Do not flush the database when using bok-choy in testsonly mode.
Testsonly will not work currently, because the database flush will
remove some data fixtures. Even when they are loaded at the beginning
of the next test run, there are database corruptions. Instead of
flushing, do not do anything with the database at the end of the
testsonly test run. That way, tests that use dynamic data can be
run many times in a row.
2016-02-04 06:58:57 -05:00
Robert Raposa
f555ffd585 Refactor and improve js_utils helpers
- Rename escape_json_dumps to dump_js_escaped_json
- Rename escape_js_string to js_escaped_string
- Update js_escaped_string to output empty string for None
- Introduce dump_html_escaped_json
- Move dump_js_escaped_json after the pipe as new best practice
- Introduce additional uses of helpers
- Introduce new djangolib directory and move js_utils
2016-02-03 17:13:21 -05:00
Diana Huang
4b1a37ef02 Merge pull request #11370 from edx/diana/static-i18n-compiled-files
Complete static i18n PR
2016-02-01 17:13:43 -05:00
Diana Huang
cd0bb4c7e0 Add ability to generate static i18n files. 2016-02-01 15:54:10 -05:00
Andy Armstrong
99c90a64dd Support compiling SASS for only one system 2016-01-29 12:43:15 -05:00
David Ormsbee
c13e623067 Speed up SASS compilation with libsass 2016-01-29 12:30:55 -05:00
Jesse Zoldak
d6b258fdeb Merge pull request #11265 from edx/zoldak/bok-choy-clean
Do not clean test files with bok choy testsonly command
2016-01-25 15:25:03 -05:00
Awais Jibran
8a6699a46d Studio breaks DEFAULT_COURSE_ABOUT_IMAGE_URL is not set in settings in cms
ECOM-3384
2016-01-22 16:49:57 +05:00
Jesse Zoldak
a00ebe925a Do not clean test files with bok choy testsonly command 2016-01-19 13:48:17 -05:00
Zia Fazal
7cdeb3300a load db_fixures when run with --testsonly
revert shell script change
2015-12-31 15:39:08 +05:00