Commit Graph

36216 Commits

Author SHA1 Message Date
Bill DeRusha
9e548cd83e Merge pull request #12108 from edx/bderusha/api-status-notification
Email notification
2016-04-13 16:55:50 -04:00
Bill DeRusha
bf37b4a028 Email notification 2016-04-13 15:59:30 -04:00
wajeeha-khalid
c31164c3ad Merge pull request #11838 from edx/jia/TNL-3818
TNL-3818: fixed recent activity mapping in thread-list sort
2016-04-13 20:57:52 +05:00
Vedran Karačić
a533472ae8 Merge pull request #12052 from edx/vkaracic/SOL-1668
[SOL-1668] Coupon codes application is not available for a user who has just activated his account
2016-04-13 16:01:49 +02:00
wajeeha-khalid
5b5fb2464d TNL-3818: fixed recent activity mapping in thread-list sort for Forums Web 2016-04-13 17:47:31 +05:00
Simon Chen
d53e4f2ed2 Merge pull request #12064 from open-craft/omar/no-free-verified-coursemodes
Disallow free verified course modes (second attempt)
2016-04-13 07:52:44 -04:00
Vedran Karacic
02c5e7f939 Redirect to ecommerce checkout on the PayAndVerify view.
When a user tries to purchase a verified certificate for the first
time or upgrade to verified, if the ecommerce checkout is enabled
redirect the user to the ecommerce checkout basket.
2016-04-13 10:14:09 +00:00
Omar Khan
6fc4b38ea0 Disallow free verified course modes
The verification workflow assumes that all verified courses will have a
price. Free verified course modes cause a 404 when the user attempts to
enroll or upgrade.
2016-04-12 18:06:16 -07:00
Robert Raposa
a2c686cf6f Merge pull request #12122 from edx/robrap/linter-mako
TNL-4324: Add check for strings that should be wrapped with HTML()
2016-04-12 17:43:15 -04:00
Robert Raposa
70a64aee2b Fix code review comment 2016-04-12 16:34:00 -04:00
Peter Fogg
56ca0e90f2 Merge pull request #12085 from edx/peter-fogg/improve-api-request-ui
API request page improvements.
2016-04-12 15:58:49 -04:00
Robert Raposa
b5a674d941 Fix parsing defect 2016-04-12 15:20:24 -04:00
Christina Roberts
5b52f3a8a8 Merge pull request #11636 from eduNEXT/Bound3R/rtl_support_static-pages
rtl support static pages
2016-04-12 14:58:18 -04:00
Ned Batchelder
537dd040c8 Merge pull request #12117 from edx/ned/fix-mako-encoding
Fix encoding of Django-called Mako files to be safe
2016-04-12 14:21:12 -04:00
Peter Fogg
0da55b0f0e Add the real terms of service to our API request page, and improve UI.
ECOM-4024
2016-04-12 14:05:31 -04:00
Bound3R
4ddcf31ad8 change css properties for mixins bi-aap in about template
remove unnecessary parentheses

change css properties for mixins bi-aap in login/register page

change css properties for mixins bi-app in about course page

change css properties for mixins bi-app in the dashboard

change css properties for mixins bi-app in help template

change css properties for mixins bi-app in the home page

change css properties for mixins bi-app in jobs, press and media pages

remove the extra spaces
2016-04-12 12:59:53 -05:00
Robert Raposa
f9ab191c33 Fix mako-wrap-html
- Make mako-wrap-html fire when '<' found anywhere in unwrapped string
- Fix typo
- Fix quality errors
- Fix defect found when Python string broken over lines
2016-04-12 13:06:11 -04:00
Robert Raposa
46c113ce60 Add check for strings that should be wrapped with HTML()
Also include the following:
- new rule for strings that should be wrapped with HTML()
- allow expressions to use "| n, unicode"
- refactor string parsing into separate class
- switch end_index to be the index following the expression
2016-04-12 10:48:33 -04:00
Peter Fogg
7864ec1c2c Merge pull request #12109 from edx/peter-fogg/course-home-a11y-test
Add a11y test for the course home page.
2016-04-12 10:04:28 -04:00
Christina Roberts
bb06e57115 Merge pull request #12099 from edx/christina/fix-default-cohort
Allow the "Default Group" to be renamed (automatic cohorting)
2016-04-12 08:03:03 -04:00
Robert Raposa
ff2e6dc1fa Merge pull request #12082 from edx/robrap/linter-mako
TNL-4324: Enhance linter for HTML() and Text()
2016-04-11 16:11:43 -04:00
Simon Chen
498ab88794 Merge pull request #12044 from edx/schen/ECOM-3198
ECOM-3198 Add banner image to the program listing program cards
2016-04-11 16:00:03 -04:00
Simon Chen
149412d2c3 ECOM-3198 Add banner image to the program listing program cards 2016-04-11 14:58:33 -04:00
Peter Fogg
beb3c19722 Add a11y test for the course home page. 2016-04-11 14:28:06 -04:00
Ned Batchelder
4f9f87c192 Fix encoding of Django-called Mako files to be safe
The old code set the output-encoding to None, which means, I want
Unicode strings as output.  This made Mako pass markupsafe objects to
"unicode()", which applied all the escaping.  Then the result would be
given to Django, would would html-escape it again, resulting in
over-escaping.

By setting the output-encoding to utf8, we use filters.encode.utf8
instead, which is aware of Markupsafe, which avoids the over-escaping.
2016-04-11 14:00:15 -04:00
Robert Raposa
96fe8afbde Enhance linter for HTML() and Text()
- Add capability to run linter on file or directory
- Add rule for HTML() requiring Text()
- Add rule for HTML() and Text() being closed before format()
- Add rule for Text() unnecessary without HTML()
- Enhance expression parsing
- Add real arg parser for script
- Clean up unit tests
2016-04-11 13:56:35 -04:00
Andy Armstrong
fd3a87a2cf Merge pull request #12102 from edx/andya/pattern-library-test-page-take-2
Introduce Pattern Library test pages (take two)
2016-04-11 10:28:25 -04:00
Vedran Karačić
4f8bf7a838 Merge pull request #11978 from edx/vkaracic/mobile-header
Lower padding on header for 320 breakpoint.
2016-04-11 16:22:42 +02:00
Vedran Karacic
733f7375f6 Lower padding on header for 320 breakpoint 2016-04-11 13:20:40 +00:00
Ben Patterson
bf66cb767d Merge pull request #12103 from edx/benp/assetindex-flaky
FEDX-88. Marking bok-choy test as flaky.
2016-04-11 07:32:16 -04:00
Andy Armstrong
9290c52b33 Introduce Pattern Library test pages (take two)
FEDX-93

These are developer only pages, so can not be seen in production
environment. On devstack, you can access these pages in LMS and
Studio at:

    /template/ux/reference/pattern-library-test.html

This is the second attempt to enable the Pattern Library. The
first attempt broke Django Templates and didn't work correctly
with right-to-left styling.
2016-04-11 00:45:31 -04:00
Ben Patterson
61a3b07e99 FEDX-88. Marking bok-choy test as flaky. 2016-04-10 09:28:07 -04:00
cahrens
28d743e2c8 Allow the "Default Group" to be renamed.
TNL-4355
2016-04-08 19:10:41 -04:00
Andy Armstrong
807fed392b Merge pull request #12092 from edx/revert-uxpl-asset-changes-in-master
Revert "Introduce Pattern Library test pages"
2016-04-08 18:03:58 -04:00
Diana Huang
c7bc0490d9 Merge pull request #12091 from edx/diana/verified-cohort-naming
Add configurable name for verified track cohort.
2016-04-08 17:07:21 -04:00
Diana Huang
53517df0a7 Add new name for verified track. 2016-04-08 16:02:48 -04:00
Eric Fischer
08c3a13f5e Merge pull request #11968 from edx/efischer/refactor_date_utils
Course Updates date validation
2016-04-08 15:23:00 -04:00
clrux
6ef023bac4 Merge pull request #11980 from edx/clrux/testing.rst-i18n-updates
Adding i18n info for developers
2016-04-08 15:11:07 -04:00
Ben Patterson
b6b0d7fd4d Merge pull request #12016 from edx/muddasser/bokchoy/upload_tar_flakiness
Decreased the flakiness of upload_tar function
2016-04-08 14:41:15 -04:00
Brian Jacobel
4671970f86 Revert "Introduce Pattern Library test pages"
This reverts commit 845e3708f3.
2016-04-08 14:25:41 -04:00
Ned Batchelder
46d69eba7a Merge pull request #12088 from edx/ned/remove-unused-imports
Remove unused imports
2016-04-08 14:20:31 -04:00
Eric Fischer
29961736db Styling changes for Course Updates errors 2016-04-08 14:07:38 -04:00
Chris Rodriguez
e42520194c Adding i18n info 2016-04-08 13:28:44 -04:00
Kevin Falcone
f2c8582c46 Merge pull request #11909 from edx/jibsheet/html-escape-submission-history
Submission History safe by default
2016-04-08 13:00:06 -04:00
Ned Batchelder
fac216c35b Lower the overall pylint count to 4175 2016-04-08 12:05:38 -04:00
Eric Fischer
2735fdc2d4 Course Updates date validation
TNL-4115. Previously, course updates (which are intended to be posted with
dates, for sorting in the LMS) could be authored in studio with a valid
date, nothing, or a random string as the "date" for the update. As there
is no validation for this in studio, everything succeeded with no warning.

However, the LMS has problems parsing some of these values, and barfs when
loaded by learners.

The fix does two big things:
- gracefully handles invalid dates in LMS. These updates are now treated as
having a date of today, for sorting purposes.
- turns on validation in studio. Now, it is not only impossible to enter
invalid dates in studio, but notifications will draw the course author's
eye if any invalid updates were previously saved.

Test additions for this commit:

Adds:
- unit test for LMS parsing
- Jasmine test to confirm invalid dates cannot be set by the user
    -also adds event to setAndValidate instead of using a global object
- fix for lettuce test
    -It is no longer valid to enter the string "January 1, 2013" as this test
    had been doing. Keyed-in entries must use MM/DD/YY format.
2016-04-08 11:37:40 -04:00
Ned Batchelder
2e1238b83e Remove unused imports 2016-04-08 11:23:05 -04:00
Nimisha Asthagiri
05ffcb0ab8 Merge pull request #12075 from edx/tnl/ccx-fix-MA-2258
Fix sequence navigation issues for CCX courses
2016-04-08 09:29:11 -04:00
Douglas Hall
05d0ba7786 Merge pull request #12078 from edx/douglashall/upgrade_xblock_lti_consumer_1_0_5
Upgraded xblock-lti-consumer to 1.0.5
2016-04-08 09:23:56 -04:00
Clinton Blackburn
8f4ac178e6 Merge pull request #12079 from edx/clintonb/s3-url-fix
Stripping auth querystring from S3 URLs
2016-04-08 09:05:10 -04:00