Commit Graph

667 Commits

Author SHA1 Message Date
Afzal Wali
eadd656df0 SOL-1802 Allow proctoring service to create support ticket. 2016-05-27 09:29:06 -04:00
Ned Batchelder
83155840aa Merge pull request #12520 from edx/ned/oops-messages-po
Two tweaks because we keep django.po and djangojs.po now.
2016-05-24 06:40:10 -04:00
Ned Batchelder
2245a8f577 Use the latest non-clobbering i18n_tools 2016-05-20 13:28:29 -04:00
Jillian Vogel
83c58c603d Bump Drag-and-Drop-v2 v2.0.6 2016-05-20 17:23:46 +09:30
Ned Batchelder
6142c76ce8 Merge pull request #12471 from edx/ned/release-translations
Support named-release translation files.
2016-05-19 10:41:06 -04:00
Asad Iqbal
5d6362f3d5 Merge pull request #12147 from edx/asadiqbal08/WL-420
asadiqbal08/WL-420 Updating drag and drop version. 
merging.
2016-05-17 20:20:26 +05:00
Ned Batchelder
f88181aca9 Add paver i18n_release_push and _pull commands 2016-05-17 10:31:53 -04:00
Christine Lytwynec
86a96b5af0 update pa11ycrawler version 2016-05-13 14:22:14 -04:00
Christine Lytwynec
510eaa3c95 Merge pull request #12423 from edx/clytwynec/ac-367
Speed up pa11ycrawler runs on Jenkins, Update pa11ycrawler to v0.0.2
2016-05-12 13:16:19 -04:00
Christine Lytwynec
f68747ec96 Speed up pa11ycrawler runs on Jenkins, Update pa11ycrawler to v0.0.2 2016-05-12 11:33:58 -04:00
Afzal Wali
15b113b657 Bumped the proctoring version. 2016-05-03 17:48:53 +05:00
Christina Roberts
2497f0a0eb WIP: xblock pipeline work (#10176)
[PERF-303] Integer XBlocks/XModules into the static asset pipeline.

This PR, based on hackathon work from Christina/Andy, implements a way to discover all installed XBlocks and XModules and to enumerate their public assets, then pulling them in during the collectstatic phase and hashing them.  In turn, the methods for generating URLs to resources will then returned the hashed name for assets, allowing them to be served from nginx/CDNs, and cached heavily.
2016-04-29 10:52:42 -04:00
Eric Fischer
ecfd953e80 Updated edx-proctoring requirement
Contains latest release, changes for TNL-4366
2016-04-28 13:27:18 -04:00
Douglas Hall
139524cadb Upgrade xblock_lti_consumer to 1.0.6 2016-04-26 16:08:16 -04:00
muzaffaryousaf
db672f4631 Karma configurations for common, lms and cms.
TNL-4102
2016-04-22 19:09:27 +05:00
Christine Lytwynec
66e2d06235 Merge pull request #12060 from edx/clytwynec/ac-367
Clytwynec/ac 367
2016-04-22 09:49:26 -04:00
Mushtaq Ali
8e93c69e6d edx-ora2 release version 1.1.4 update 2016-04-21 11:29:58 +05:00
Dmitry Viskov
0151a149b0 Asides can be exported with the rest of courseware through the Export function within CMS 2016-04-16 03:48:23 +03:00
asadiqbal
a185bb3a83 WL-420 2016-04-14 18:22:16 +05: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
Christine Lytwynec
a14718bb92 Add pa11ycrawler command 2016-04-11 15:47:26 -04:00
Douglas Hall
2d3a034695 Upgraded xblock-lti-consumer to 1.0.5 2016-04-11 12:04:05 -04:00
Douglas Hall
fed01b3547 Upgraded xblock-lti-consumer to 1.0.5 2016-04-07 16:00:12 -04:00
Eric Fischer
813b50aed2 Fix conflict, 1.1.3 is correct 2016-04-07 14:45:19 -04:00
Eric Fischer
16d62e551b Bump ora2 version 2016-04-07 12:39:08 -04:00
Diana Huang
efc1f9683e Bump ORA version. 2016-04-06 15:28:32 -04:00
Clinton Blackburn
320abd7d24 Using edx-ccx-keys from PyPI
ECOM-4016
2016-04-01 16:59:02 -04:00
Matt Drayer
d6385a0c72 mattdrayer/update-xblock-dependency: Bump to 0.4.7 2016-03-31 09:39:55 -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
solashirai
82936a0f7c changed entry in github.txt 2016-03-26 18:03:34 -04:00
solashirai
052655016b added crowdsourcehinter 2016-03-26 18:02:33 -04:00
Douglas Hall
fb6f3ca568 Upgrade xblock-lti-consumer to 1.0.4 to pull in bug fixes 2016-03-25 09:34:52 -04:00
Douglas Hall
3acc6da98c Merge pull request #11859 from edx/douglashall/edx_proctoring_0_12_15
Updated edx-proctoring requirement to 0.12.15
2016-03-24 13:48:39 -04:00
Mushtaq Ali
1b60f73119 ORA2 version update to 1.1.1. Includes bug fixes for TNL-4268 2016-03-23 00:24:26 +05:00
Douglas Hall
f2707bb480 Updated edx-proctoring requirement to 0.12.15 2016-03-21 10:22:15 -04:00
Toby Lawrence
9b8ff773ee Merge pull request #11824 from edx/release
Merge release back to master.
2016-03-16 21:11:37 -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
Clinton Blackburn
ae0a128966 Reverted rfc6266 change
The fork actually does include a commit that is not in the PyPI version.

ECOM-3833
2016-03-15 15:37:21 -04:00
Sven Marnach
d29dcc1697 Merge pull request #11803 from open-craft/smarnach/update-dndv2-version
Bump the version of the Drag&Drop XBlock to 2.0.4.
2016-03-15 14:14:53 +01: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
Sven Marnach
6d9598f325 Bump the version of the Drag&Drop XBlock to 2.0.4. 2016-03-14 16:07:57 +01:00
Clinton Blackburn
6fef56977c Merge pull request #11778 from edx/clintonb/update-requirements
Replaced Git requirements with PyPI
2016-03-11 09:53:09 -05:00
Clinton Blackburn
9c90de6507 Replaced Git requirements with PyPI
Each of the replaced commits can be sourced from PyPI rather than Git. Also, django-pipeline does not need to be editable.

ECOM-3833
2016-03-10 17:26:32 -05:00
Eric Fischer
25e67370cd Unbound xblock method requires user id
clear_student_state(), a method defined by ORA, requires information
about the user making the request. Since this xblock is not bound,
we must provide that information explicitly.
2016-03-10 11:13:02 -05:00
Eric Fischer
a647169a90 Merge pull request #11167 from edx/christina/ora-data-download
WIP: Asynchronous download button for ORA2 data
2016-03-10 11:09:36 -05:00
dylanrhodes
2b1a7eece2 Asynchronous download button for ORA2 data
Conflicts:
	lms/djangoapps/instructor/tests/test_api.py
	lms/djangoapps/instructor/utils.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/api_urls.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor_task/api.py
	lms/djangoapps/instructor_task/tasks.py
	lms/djangoapps/instructor_task/tasks_helper.py
	lms/djangoapps/instructor_task/tests/test_api.py
	lms/djangoapps/instructor_task/tests/test_tasks.py
	lms/djangoapps/instructor_task/tests/test_tasks_helper.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/coffee/src/instructor_dashboard/data_download.coffee
	lms/templates/instructor/instructor_dashboard_2/data_download.html
2016-03-10 09:58:55 -05:00
Douglas Hall
dd0b74f7ee Upgrading edx-proctoring requirement to 0.12.13 2016-03-10 05:58:23 -05:00
clrux
7f7886be90 Merge pull request #11770 from edx/release
Weekly release for 08 Mar 2016
2016-03-08 16:09:46 -05:00
Eric Fischer
c35f5ba9d6 ORA release 2016-03-07 13:52:44 -05:00
Sven Marnach
b026038574 Bump the version of the Drag&Drop XBlock to 2.0.3. 2016-03-07 18:10:04 +01:00