Commit Graph

37847 Commits

Author SHA1 Message Date
Renzo Lucioni
a653d449fc Merge pull request #13024 from edx/renzo/pdp-enrollment-start
Prevent program utilities from formatting dates prior to 1900
2016-07-19 09:57:16 -04:00
Jesse Zoldak
2a2a1c3c17 Merge pull request #12985 from edx/zoldak/EV-56
Make the temp dir for instructor dashboard local files uniquely named EV-56
2016-07-19 09:28:33 -04:00
Muddasser
3216940c13 Merge pull request #12789 from edx/muddasser/bok-choy-to-lettuce/course_settings
course-settings.feature conversion to bokchoy
2016-07-19 15:10:43 +05:00
Muddasser
186b3badb5 course-settings.feature conversion to bokchoy 2016-07-19 08:18:36 +00: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
Renzo Lucioni
7ede26a117 Prevent program utilities from formatting dates prior to 1900
ECOM-4973
2016-07-18 16:22:51 -04:00
Chris
a9068dccde Merge pull request #13014 from edx/clrux/ac-526
AC-526 fixing invalid-aria-attr-value failures and ignores in the platform
2016-07-18 15:39:31 -04:00
alisan617
b66f163355 Merge pull request #13010 from edx/alisan/go_away_pycharm
Remove pycharm xml files and add gitignore
2016-07-18 15:11:13 -04:00
Christina Roberts
fa56b575c9 Merge pull request #13017 from edx/jeskew/xblock_version_num_bump
Bump XBlock version to 0.4.12
2016-07-18 12:18:21 -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
John Eskew
ffcd3440de Bump XBlock version to 0.4.12 2016-07-18 11:06:31 -04: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
Eugeny Kolpakov
9f3b8ddf78 Merge pull request #12914 from open-craft/ekolpakov/discussion_fixes_from_solutions
Discussion fixes from solutions
2016-07-18 11:13:16 +03: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
Jesse Zoldak
5600a9bd0c Fix instructor_task model tests to use unique temp dirs 2016-07-16 09:37:30 -04:00
Jesse Zoldak
3647c17911 Make the temp dir for instructor dashboard local files uniquely named. EV-56 2016-07-16 09:37:30 -04: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
alisan617
72dbbaeafb delete unwanted pycharm xml files 2016-07-15 21:03:19 -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
PaulWattenberger
ff247a6802 Merge pull request #13004 from edx/pwattenberger/sailthru-fix
Fix 500 error unenrolling when running Sailthru integration on Stage ECOM-4960
2016-07-15 17:40:36 -04:00
PaulWattenberger
ab242145cb Fix 500 error unenrolling when running Sailthru integration on Stage ECOM-4960 2016-07-15 16:36:20 -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
Ned Batchelder
9e189f7cc1 Merge pull request #13000 from edx/ned/update-translations
Update translations (autogenerated message)
2016-07-15 09:55:44 -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
Ahsan Ulhaq
18a2b535ba Merge pull request #12922 from edx/ahsan/ECOM-4681-Tech-Debt-on-Certificate-generate-panel
Tech Debt on Certificate generate panel
2016-07-15 15:56:14 +05:00
Ned Batchelder
49f8f4d2e9 Update translations (autogenerated message) 2016-07-15 00:08:25 +00:00
Saleem Latif
bfae8206ff Merge pull request #12987 from edx/saleem-latif/branding-logo-url-fix
Fix branding api get_logo_url return value
2016-07-14 17:52:28 +05: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
Adam
6e7d4cef04 Merge pull request #12992 from open-craft/bump-problem-builder-2.0.4
Bump problem-builder on edx.org to edx-release 2.0.4
2016-07-13 17:30:28 -04:00
Cliff Dyer
b9056f96a5 Merge pull request #12951 from edx/release
Release
2016-07-13 14:10:02 -04:00
Braden MacDonald
c0f608e638 Bump problem-builder on edx.org to edx-release 2.0.4 2016-07-13 10:37:49 -07:00
Chris
c72d2b56bc Merge pull request #12990 from edx/clrux/tabs-hotfix
Hotfix for tabs
2016-07-13 12:12:46 -04:00
Chris Rodriguez
638263027d Hotfix for tabs 2016-07-13 11:13:39 -04:00
Cliff Dyer
e6c88a2415 Merge pull request #12963 from edx/rc/2016-07-12
Release Candidate: 2016-07-12
2016-07-13 10:19:33 -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
Ahsan Ulhaq
518218ba7d Tech Debt on Certificate generate panel
ECOM-4681
2016-07-13 12:44:23 +05:00
Saleem Latif
5503285f5c Fix branding api get_logo_url return value 2016-07-13 09:25:22 +05: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
Douglas Hall
0332ebea9e Merge pull request #12880 from caseylitton/up_logistration_toggle_footer_setting
Add flag allow toggle logistration footer
2016-07-12 20:34:51 -04:00
Cliff Dyer
e410cd972e Merge pull request #12981 from edx/adam/small-fix-to-rc
small fix to typo in activation email
2016-07-12 16:12:05 -04:00
Chris
facb1eb8fd Merge pull request #12953 from edx/clrux/ac-517
AC-517 fixes `color-contrast` ignores
2016-07-12 15:30:29 -04:00
Jesse Zoldak
5e6f89b0a9 Mark test for skipping SOL-1811 2016-07-12 15:20:04 -04:00
caseylitton
a6e028c6b4 Add flag allow toggle logistration footer 2016-07-12 12:13:12 -07:00
caseylitton
6761be0b29 Add name and email to Authors 2016-07-12 12:13:03 -07:00