Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,515 Commits 1 Branch 0 Tags
209ddc700dfce5bb0aa151c19dafbac8ae7de2d2
Commit Graph

291 Commits

Author SHA1 Message Date
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
Ned Batchelder
02fa9c101d Stop adding lms/lib and cms/lib to the PYTHONPATH for pylint 
These two directories are not added to sys.path when running the
application, so there is no need to add them for pylint.  When they are
added, they make it impossible to run pylint properly because
lms.lib.xblock is imported when trying to import xblock.
 2015-12-09 15:07:37 -05:00
David Baumgold
58daa365cd re-enable edx.org comprehensive theme 2015-12-03 17:18:55 -05:00
Brian Beggs
89a7e42576 Merge pull request #10742 from edx/bbeggs/acceptance-test-migration-fix 
Migrations will now run during Acceptance tests
 2015-11-26 09:34:51 -05:00
Jim Abramson
8f4c2264a1 Merge pull request #10701 from edx/renzo/studio-programs-tab 
Add Programs tab to Studio
 2015-11-25 16:37:34 -05:00
Renzo Lucioni
70d57327eb Add Programs tab to Studio 
Extends the Programs ConfigurationModel, cleans up Programs-related utilities and corresponding tests, and corrects caching. Uses the Programs API to list programs within Studio. ECOM-2769.
 2015-11-25 14:56:50 -05:00
Brian Beggs
3d204a87f2 updated paver command to fake migrations when the DB exists 2015-11-25 13:24:08 -05:00
Jesse Zoldak
c5be59d8c7 Disable the pip version check message for uninstalls 2015-11-25 10:45:20 -05:00
Ned Batchelder
f5d0f3ff55 Remove useless pylint suppressions 2015-11-22 07:41:19 -05:00
Brian Beggs
141e0a93c7 Merge branch 'master' into dj18-release-merge 2015-11-19 13:36:13 -05:00
Christine Lytwynec
01d8a9bcad Fix paths for diff quality jshint comparison 2015-11-18 15:52:27 -05:00
muhammad-ammar
8d5f153201 Merge remote-tracking branch 'origin/release' into dj18-release-merge 
Conflicts:
	common/djangoapps/util/testing.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/teams/tests/test_views.py
	openedx/core/djangoapps/programs/models.py
	openedx/core/djangoapps/user_api/accounts/tests/test_views.py
	requirements/edx/github.txt
 2015-11-18 17:53:44 +05:00
Christine Lytwynec
9aa1f2b73f use .jshintignore instead of hardcoded directory list 2015-11-13 16:19:02 -05:00
Ned Batchelder
d3f9e1a7b2 Fix the uninstall of django-storages 2015-11-12 15:53:25 -05:00
Usman Khalid
fb9526b9cd Update expected_version. 2015-11-11 18:39:55 +05:00
muhammad-ammar
a6ec8cd2a4 add django-storages into uninstall list 2015-11-11 14:20:01 +05:00
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5 
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
 2015-11-10 15:00:19 -05:00
Christine Lytwynec
5d9dc32558 add custom-a11y-rules.js from edx-custom-a11y-rules 2015-11-05 16:09:06 -05:00
Christine Lytwynec
468864a314 add paver test_a11y and a11y_coverage commands 2015-11-05 13:55:35 -05:00
Ben Patterson
183fce375e Merge pull request #10508 from edx/benp/bokchoy_default_store_envvar 
Allow bok-choy default_store to be controlled by env vars.
 2015-11-05 10:21:42 -05:00
Ben Patterson
634d0ffd9e Allow bok-choy default_store to be controlled by env vars. 2015-11-04 09:28:28 -05:00
Ben Patterson
a1bb822c8e Generify message. User will see context in previous console line. 2015-11-04 08:40:56 -05:00
Ned Batchelder
3f79dd0b75 If NO_PREREQ_INSTALL is set, print a message to explain why 2015-11-03 17:34:22 -05:00
Ben Patterson
7eb9cecb9b Ability to run bok-choy in multiprocess mode. 
This includes:
* Ability to specify number of processes to run bok-choy tests in
* A forked nose commit to get the multiprocess plugin's logging to work
* A different plugin (xunitmp) must be used for pulling together xunit results

This works by:
* Starting the various servers that are needed for the acceptance test environment
* Running the tests themselves in multiprocess mode
 2015-11-03 08:19:20 -05:00
Matt Drayer
1eab25f292 mattdrayer/increment-edx-lint: Bump to v0.2.9 and address pylint/pep8 violations 
* Fix paver violations to stablize edx-lint update
* Parens, Line2Long
* Fix missing docstrings
* Fix PEP8 issues
* Address PR feedback (thanks @nedbat!)
 2015-10-19 10:11:59 -04:00
Justin Abrahms
86864116e1 Fix help description for test's --fail_fast flag 2015-10-13 15:17:27 -07:00
Ben Patterson
60c439c93b Merge pull request #9898 from edx/benp/fix-jshint-report-diff-qual 
Use correct reports for jshint diff-quality.
 2015-09-24 11:59:23 -04:00
Ben Patterson
4acde8e1fc Use correct reports for jshint diff-quality. 2015-09-23 16:13:57 -04:00
Ned Batchelder
210be884bf A faster way to clean the .pyc files 
On my devstack, the old line takes about 5.5 seconds, the new line takes
about 1.3 seconds.

For background:
http://nedbatchelder.com/blog/201505/be_careful_deleting_files_around_git.html
 2015-09-23 13:57:12 -04:00
Ned Batchelder
a8dd9ca99d Use the proper 'off' default for COMP_THEME_DIR. 2015-09-17 15:39:03 -04:00
David Baumgold
6ebf2515f4 Comprehensive theming 
This is a squash of 38 commits ending with
5b080f979d692804452400ac5bed9b17c50b001e
 2015-09-17 15:39:03 -04:00
David Baumgold
58ea785e6e Merge pull request #9660 from OmarIthawi/edraak/watch-xmodule-assets 
Watch and process xmodule assets
 2015-09-15 11:43:35 -04:00