Commit Graph

13567 Commits

Author SHA1 Message Date
Eric Fischer
9ab92d58c3 Revert "moving milestones check to access.py" (#13060)
This reverts commit 5db58c0038.
2016-07-21 13:12:44 -04:00
Adam Palay
95c0b50ebe authenticate user after their reset confirmation goes through
make password validation code more DRY

grammar nit: "less" -> "fewer"
2016-07-20 11:06:58 -04:00
Ben Patterson
0d227afc4e Merge pull request #12994 from eduNEXT/jfavellar90/rubric-pages-fix
Removing references to deleted module common.test.acceptance.pages.lm…
2016-07-15 08:11:46 -04:00
Awais Jibran
07467a5b68 Merge pull request #12989 from edx/aj/add-logging-for-allow-donation
Adding logging if course_id is not found in enrolled course modes.
2016-07-14 15:03:08 +05:00
Awais Jibran
dba8a51f59 Adding logging if course_id is not found in enrolled course modes. 2016-07-14 12:59:38 +05:00
Jhony Avella
c25cdbad07 Removing references to deleted module common.test.acceptance.pages.lms.rubric 2016-07-13 17:38:10 -05:00
Cliff Dyer
b9056f96a5 Merge pull request #12951 from edx/release
Release
2016-07-13 14:10:02 -04:00
Toby Lawrence
71bebec579 Merge pull request #12986 from edx/PERF-351
Account for settings.STATIC_URL in XBlock resource URLs when rewriting them.
2016-07-13 09:39:52 -04:00
Toby Lawrence
8ab62b5b99 [PERF-351] Account for settings.STATIC_URL in XBlock resource URLs when
rewriting them.

In PERF-341, we adjusted the static_replace middleware to try and
exclude static XBlock resource URLs from being interpreted as the marker
URLs used to signify course assets in course content.  Since they both
started with /static, this could, and did, cause issues where linking
directly to the assets of an XBlock within, say, one of its templates,
would lead to that link being rewritten and ultimately being incorrect.
The fix attempted to see if the link started with the prefix that all
static XBlock resource URLs start, and if so, it returned them
unmodified.

We incorrectly assumed that our testing captured all cases, and since
we're here, we know that this was wrong.  We weren't accounting for cases
when the URLs being generated had the STATIC_URL configuration value
prefixed -- https://example.com/static/xblock/.... -- and so our direct
check of seeing if such a URL started with "/static/xblock" would always
fail, leading to the erroneous rewriting and nonsensical output.

This fix checks if the link either starts with the prefix OR if it
starts with the STATIC_URL value and contains the prefix overall.  There
is a small overlap between the STATIC_URL and the prefix we check for,
so an inconsistency could arise down the line if we changed our
STATIC_URL to use a difference base directory, but our tests will at
least catch the issue now.
2016-07-12 22:33:11 -04:00
Jesse Zoldak
5e6f89b0a9 Mark test for skipping SOL-1811 2016-07-12 15:20:04 -04:00
Chris Rodriguez
4e4c740c2c AC-517 fixes color-contrast ignores across platform 2016-07-12 14:41:06 -04:00
Chris
3d76f092dd Merge pull request #12983 from edx/clrux/safelint-fixup
Safelint violation count
2016-07-12 14:40:42 -04:00
Chris Rodriguez
1b7fe5978a Safelint violation count 2016-07-12 14:03:28 -04:00
Jesse Zoldak
c6e0813785 Mark test for skipping SOL-1811 2016-07-12 13:16:21 -04:00
Chris
53c98f10cc Merge pull request #12750 from edx/clrux/ac-486
AC-486 updating tabbed_view to use proper accessibility rules
2016-07-12 12:50:20 -04:00
Chris Rodriguez
298f168e23 AC-486 updating tabbed_view to be accessible 2016-07-12 11:01:11 -04:00
sanfordstudent
d13e456959 Merge pull request #12939 from edx/sstudent/TNL-4924
moving milestones/gating check to access.py
2016-07-11 16:21:53 -04:00
Douglas Hall
a873bf7c7b Merge pull request #12901 from edx/douglashall/WL-541
WL-541 Add recipient key to Zendesk ticket creation API request payload
2016-07-11 15:36:11 -04:00
Douglas Hall
c38f2373c7 Add recipient key to Zendesk ticket creation API request payload 2016-07-11 14:56:44 -04:00
Sanford Student
5db58c0038 moving milestones check to access.py 2016-07-11 14:32:52 -04:00
John Eskew
4fca1d9d98 Merge pull request #12893 from edx/jeskew/control_chars_in_string_fields
Update version of XBlock repo.
2016-07-11 13:29:51 -04:00
Toby Lawrence
54fa8aebbc Merge pull request #12959 from edx/PERF-346
[PERF-346] Add a second version component to versioned course asset URLs
2016-07-11 09:32:09 -04:00
Toby Lawrence
f15533dc8f [PERF-346] Add a second version component to versioned course asset URLs
This version component reflects the "version" of the StaticContent
objects which we cache server-side.  If the layout of those objects
changes between releases, errors occur when loading them from cache.

By using a separate version value, which can be incremented on its own
after a change has been made to the StaticContent class, we can avoid
loading older cached content and in turn take advantage of these changes
faster, without needing to intervene operationally.
2016-07-10 19:20:20 -04:00
Chris
db04911268 Merge pull request #12924 from edx/clrux/ac-521
AC-521 fixes 'data-table' ignores
2016-07-08 17:10:22 -07:00
Chris Rodriguez
ddc93abf81 AC-521 fixes data-table ignores in the platform 2016-07-08 15:28:31 -04:00
Christina Roberts
6d7a545276 Merge pull request #12932 from edx/christina/deprecated-components
Move deprecating of XBlocks to new XBlockConfiguration model
2016-07-08 15:05:42 -04:00
Christina Roberts
b6b792826c Merge pull request #12864 from edx/christina/disable-xblocks
Move disabling of XBlocks to new XBlockConfiguration model
2016-07-08 15:05:17 -04:00
John Eskew
1131edc9a2 Change test to reflect how XBlock handles control chars. 2016-07-08 14:04:00 -04:00
Cliff Dyer
cb4c712558 Merge pull request #12964 from edx/adam/merge-release-to-rc
Adam/merge release to rc
2016-07-08 13:53:57 -04:00
Adam Palay
2e095e1557 mark StudioHelpTest.test_studio_help_links as flaky 2016-07-08 12:49:53 -04:00
Albert St. Aubin
4df50e9008 Updated to check and ensure the progress Detail is a string before looking for the index of /
TNL-4723

Added basic JS test to check for progress with integer detail

Added another test with a non-string value to force the failure state with data returns a non-string value

Removed test with unrealistic int input for progress_detail

Cleaned up duplicate code in renderProgress tests
2016-07-08 11:44:09 -04:00
Amir Qayyum Khan
0d3f96d4b5 Fixed CCX coach dashboard access issues. 2016-07-08 04:24:19 +05:00
Braden MacDonald
7c3d902ff6 Merge pull request #11286 from open-craft/omar/remove-s3
Add OpenStack Swift support
2016-07-07 11:05:28 -07:00
Adam
f7c45cf47d Merge pull request #12952 from edx/adam/quiet-logs
quiet some noisy logs
2016-07-07 11:02:21 -04:00
Chris
e4db0e39d0 Merge pull request #12915 from edx/clrux/ac-520
AC-520 fixes `section` ignores
2016-07-07 03:20:14 -07:00
Adam Palay
a19d2e76ff quiet some noisy logs 2016-07-06 16:32:27 -04:00
Chris Rodriguez
4cf0e19af2 AC-520 fixing section ignores 2016-07-06 15:01:44 -04:00
cahrens
25bfd0a7d8 Get Studio deprecation list from XBlockConfiguration.
Replaces settings value.
TNL-4669
2016-07-06 11:05:52 -04:00
cahrens
8980d1ab2d Switch disabling of XBlocks to XBlockConfiguration.
Also allows dynamic updates.
TNL-4668
2016-07-06 11:04:53 -04:00
Chris Rodriguez
5b31e4d67f AC-518 - button-name - test_lms_instructor_dashboard.py 2016-07-06 10:32:00 -04:00
Toby Lawrence
bc990d5d75 Merge pull request #12911 from edx/PERF-344
[PERF-344] Add versioning of cached course assets to allow graceful cache invalidation
2016-07-05 19:34:27 -04:00
Toby Lawrence
4e22affb24 [PERF-344] Add versioning of cached course assets to allow graceful cache invalidation
When releasing the versioned assets work, we stumbled on a problem with old pickled
versions of the StaticContent objects residing in cache, which triggered a bug in the
code. Not wanting to blow away all cached items, we ended up having to revert and add
in some backwards-compatible helper code to ease the transition.

With this, we'll now utilize the version argument that Django's caching interface
allows, in conjunction with a constant value that can be modified when breaking changes
are being made, to let us gracefully ignore older cached course assets.
2016-07-05 15:15:47 -04:00
Kevin Kim
0bf8fc4b44 Converts the dates on the dashboard, sidebar navigation, and important course dates to user specified time zone. 2016-07-05 17:45:13 +00:00
Diana Huang
6e538e1304 Fix issues with truncation. 2016-07-05 10:39:37 -04:00
Omar Khan
2faab97eea Add OpenStack Swift support
Refactor all S3 code to use the django storage API and add swift
settings for openstack deployments
2016-07-05 17:31:59 +03:00
Ben Patterson
27499d1456 Merge pull request #12892 from eduNEXT/jfavellar90/TE-1194-1
Replacing relative imports by absolute imports for all files into com…
2016-07-05 08:38:57 -04:00
Awais Jibran
438f10b087 Fix bulk_change_enrollment command to emit event
ECOM-4775
2016-07-01 13:09:20 -04:00
Chris
a561029463 Merge pull request #12904 from edx/clrux/ac-519
AC-519 removing list from ignored a11y check
2016-07-01 06:34:12 -04:00
hamzamunir7300
930e0375a5 Merge pull request #12898 from edx/hamzamunir/TNL-4141-problem_creation_empty_answer_not_allowed
Hamzamunir/tnl 4141 problem creation empty answer not allowed
2016-06-30 19:53:20 +05:00
Chris Rodriguez
b0ede3f6f5 AC-519 - list - test_lms_instructor_dashboard.py 2016-06-30 08:01:38 -04:00