Commit Graph

19803 Commits

Author SHA1 Message Date
sanfordstudent
f2a1984f1a Revert "genericizing transformer" (#13063)
This reverts commit 4e65b1f14b.
2016-07-21 17:04:07 -04:00
cahrens
d4cc7b8ffd Support level support for Studio xblock creation.
TNL-4670
2016-07-21 15:44:59 -04:00
Eric Fischer
cae03d0349 Revert "moving milestones check to access.py" (#13060) (#13061)
This reverts commit 5db58c0038.
2016-07-21 13:58:35 -04:00
Kevin Kim
1ab52f8b0a Merge pull request #12945 from edx/kkim/ora_tz_date
Convert ORA Due Dates
2016-07-21 10:52:07 -04:00
Robert Raposa
67e15e22e6 Merge pull request #13046 from edx/release
Release 2016-07-20 back to Master
2016-07-21 10:43:58 -04:00
Kevin Kim
94100f5944 Convert ORA due dates to user preferred time zone 2016-07-21 13:57:20 +00:00
Eric Fischer
35ae67b530 New CMS visibility settings (#12940)
TNL-4906 Subsections now use radio buttons, to allow for "hide after due" as a
visibility option. Also, all tabs have been consolidated to "Basic" and
"Advanced", and visibility options have moved there.

Documentation links are updated to assist course authors with the new
visibility options. Tests have also been updated, and the changes suggested
in TNL-4951 are included.
2016-07-20 19:58:51 -04:00
Diana Huang
f3a46bfb07 Merge pull request #13045 from edx/diana/flaky-course-page-test
Fix flaky asset page test
2016-07-20 16:19:02 -04:00
Andy Armstrong
51bb4d4e00 Merge pull request #12795 from eduNEXT/fmo/coffee_to_js_cms_main
Convert cms/coffee/src/main to js
2016-07-20 15:16:48 -04:00
Diana Huang
b51c4456b8 Fix flaky asset test. 2016-07-20 14:18:27 -04:00
sanfordstudent
ed6995b0ba Merge pull request #12984 from edx/sstudent/TNL-4925
generalizing proctored exam transformer
2016-07-20 13:56:36 -04:00
Brian Jacobel
8ed78a387e Fix TNL-5011 (#13031)
Vote button is now disabled for yourself, but count is still visible
2016-07-20 13:29:33 -04:00
Chris
92010f003a Merge pull request #13015 from edx/clrux/ac-522
AC-522 fixing checkboxgroup ignores in platform
2016-07-20 11:37:23 -04:00
Sanford Student
4e65b1f14b genericizing transformer 2016-07-20 11:28:04 -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
Edward Zarecor
95800be01f Merge pull request #12999 from edx/e0d/random-passwords
use random rather than unusable so they can be reset
2016-07-20 09:28:26 -04:00
Nimisha Asthagiri
9d747fa65c Merge pull request #12975 from edx/tnl/hide_content
LMS Hide Subsection Content
2016-07-20 09:04:32 -04:00
Chris Rodriguez
51f9109bea AC-552 fixing checkboxgroup ignores in platform 2016-07-20 09:01:03 -04:00
Chris
3302b26e65 Merge pull request #12926 from edx/clrux/ac-524
AC-524 fixes `label` ignores
2016-07-20 09:00:15 -04:00
Chris Rodriguez
b97d063181 AC-524 - label - test_lms_instructor_dashboard.py 2016-07-20 07:49:48 -04:00
Nimisha Asthagiri
eb02f2adc1 LMS Update to hide subsection content based on due-date
TNL-4905
2016-07-19 21:13:14 -04:00
Simon Chen
1d768cde7a ECOM-4904 Move the program editor backbone app to Studio (#12962) 2016-07-19 19:09:51 -04:00
Chris Rodriguez
a4a7948b1d AC-523 - duplicate-id - instructor_dashboard.py 2016-07-19 10:59:26 -04:00
Muddasser
186b3badb5 course-settings.feature conversion to bokchoy 2016-07-19 08:18:36 +00:00
Felipe Montoya
c32b30ba94 Relocating inside the cms namespace
Addressing feedback
2016-07-18 18:07:35 -05:00
Ben Patterson
26d49a7544 Merge pull request #12973 from eduNEXT/jfavellar90/TE-1194-2
Relative to absolute imports for all files in common/test/acceptance/pages
2016-07-18 19:04:22 -04:00
Jhony Avella
b1ee84b1d5 Relative to absolute imports for all files in common/test/acceptance/pages
Added author

Fixing pylint line-too-long error

Added missing trailing comma
2016-07-18 10:22:33 -05:00
Chris Rodriguez
237b955d97 AC-526 fixing invalid-aria-attr-value failures and ignores in the platform 2016-07-18 07:28:22 -04:00
E. Kolpakov
e0c7228d11 Quality, safe template linter and test fixes:
* Safe template linter reports zero violations on modified files
* Removed some (or most) coffeescript-genereated returns
* Big HTML chunks in JS converted to underscore templates
* Markdown processor - safe tempate linter compatibility
* Fixed double escaping HTML tags in code blocks caused by passing it through postMathJaxProcessor twice
2016-07-18 10:14:13 +03:00
E. Kolpakov
8d1e10bd8a Fixes and improvements from solutions fork:
* Removing jQuery.ajax.beforeSend - it might be set globally and this code overrides it (part of 62fa253af6ee384f0766d72cd2d67bcf43697692)
* Avoid resetting Backbone history if already started (part of 9591b526bdd56163de0098099e46e44c566061f5)
* goHome no longer triggers thread:removed event - already triggered up the call stack (part of 9591b526bdd56163de0098099e46e44c566061f5)
* Avoid using beforeSend as it might be set globally (adapted from 2dfe104f3915efa546c85ef277eb75c5abb9b49b)
* Refactor triggering navigation to use constant/method instead of magic strings (part of 4843facd507b1cee8712bf10e96ff6c25c98bca2)
* Switching to using jQueyr.prop instead of jQuery.attr
* Fixed email notifications enable/disable (adapted from 8a7f022)
* Load thread if requested thread isn't loaded yet (adapted from e28dde32169b388235030dba945366f4c13e565f)
* Added ability to set custom css classes on search messages (adapted from b2e4c18905d7c7560838e264d6b218a3c4c6dc1f)
* Actually rerendering view with new model data when it is loaded/changed
2016-07-18 10:13:44 +03:00
Chris
e1dbfe3aac Merge pull request #13007 from edx/clrux/ac-531
AC-531 fixing nav-aria-label ignores in the platform
2016-07-15 21:09:08 -04:00
Renzo Lucioni
863782d021 Merge pull request #12991 from edx/renzo/run-marketing-urls
Use course run marketing URLs from the catalog service on program detail page
2016-07-15 17:55:01 -04:00
Renzo Lucioni
a43c507a00 Use course run marketing URLs from the catalog service on program detail page
Part of ECOM-4566.
2016-07-15 16:12:10 -04:00
Chris Rodriguez
3b3186c6ea AC-531 fixing nav-aria-label ignores in the platform 2016-07-15 12:21:37 -04:00
alisan617
6fe894f305 Merge pull request #12977 from edx/alisan/tnl-4815-remove-edx-icons-usage-from-studio
Remove edx icons usage in platform
2016-07-15 11:22:30 -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
e0d
8a18b2c351 use random rather than unusable so they can be reset 2016-07-14 08:09:51 -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
alisan617
95b2bfbbee Remove edx-icons usage in studio - TNL-4815
Remove edx-icons from edx-platform - TNL-4813
Remove edx-icons from LMS - TNL-4952
comment out baseline screenshot Bokchoy assertion tests
SOL-1937 Temporarily comment out baseline screenshot Bokchoy assertion tests
2016-07-13 19:43:59 -04: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