Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,962 Commits 1 Branch 0 Tags
214091d33bebabaec3b520d429f93a0f8167c2f9
Commit Graph

36962 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alison Hodges
214091d33b Merge pull request #12467 from edx/ahodges/xrefs 
Updates and corrects href links to readthedocs
 2016-05-17 17:35:41 -04:00
John Eskew
e5a5704b38 Merge pull request #12495 from edx/jeskew/release_to_master_merge 
Merge release to master for 2016-05-17 release
 2016-05-17 17:16:16 -04:00
clrux
5db315bebf Merge pull request #12371 from edx/clrux/ac-405 
AC-405 calculator image to icon
 2016-05-17 17:11:56 -04:00
clrux
f0b33e33ff Merge pull request #12244 from edx/clrux/ac-399 
AC-399 adding alt for circuit schematic controls
 2016-05-17 17:11:38 -04:00
clrux
f7eba02808 Merge pull request #12411 from edx/clrux/ac-396 
AC-396 updating courseware nav to display correctly on high contrast displays
 2016-05-17 17:11:09 -04:00
Clinton Blackburn
c67ef7a8fa Merge pull request #12457 from edx/clintonb/user-update 
User administration updates
 2016-05-17 16:35:09 -04:00
Matt Drayer
f2ffbab0ec mattdrayer: Add receipt page + JS test fixes 2016-05-17 15:41:29 -04:00
AlasdairSwan
7a0d7818bc Offscreen a11y test fix 2016-05-17 15:41:28 -04:00
Matt Drayer
c6249f4227 mattdrayer/WL-466: Use LMS Courses API 2016-05-17 15:41:28 -04:00
AlasdairSwan
646d0b9b68 ECOM-4450 Added help tab and model styling to Pattern Library pages 2016-05-17 15:41:28 -04:00
cahrens
cafc15cf7d Move city and country fields to the very end. 
OSPR-1155
 2016-05-17 15:41:28 -04:00
Douglas Hall
4bdeaf7696 Always include the course price in the course_about template context 2016-05-17 15:41:27 -04:00
Douglas Hall
defb08e845 Include course price in course_about template context if either the ecommerce service is enabled or shoppingcart is enabled 2016-05-17 15:41:27 -04:00
Matt Drayer
fe1e659fb7 mattdrayer/rc/2016-05-17: Check for "code" on receipt line item attribute. 2016-05-17 15:41:27 -04:00
Alison Hodges
95894da528 Updates and corrects href links to readthedocs 2016-05-17 15:01:00 -04:00
Diana Huang
1ba73efcfc Merge pull request #12496 from edx/diana/fix-badge-bok-choy-tests 
Fix flaky bok-choy test
 2016-05-17 14:42:08 -04:00
Christina Roberts
d15166e6a3 Merge pull request #12482 from edx/christina/minimal-xss-fix 
Safe template cleanup in settings.html
 2016-05-17 14:18:27 -04:00
Waheed Ahmed
381dc5c274 Merge pull request #12489 from edx/waheed/use-course-overview-to-get-course 
Use CourseOverview instead of modulestore.
 2016-05-17 21:48:34 +05:00
Waheed Ahmed
ee65c8783d Use CourseOverview instead of modulestore. 2016-05-17 21:00:53 +05: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
Diana Huang
d38b43cce3 Set self.browser consistently in page objects. 2016-05-17 11:08:22 -04:00
Christina Roberts
8c418c62fe Merge pull request #12033 from sigberto/submission-history-tz 
Display correct timezone on timestamp for question submission
 2016-05-17 10:52:30 -04:00
Ahsan Ulhaq
7a43b57037 Merge pull request #12401 from edx/ahsan/removal-underscore-string-from-commerce-js 
Ahsan/removal underscore string from commerce js
 2016-05-17 19:49:17 +05:00
Peter Fogg
1bd2ec2535 Merge pull request #12474 from edx/peter-fogg/date-summary-fixes 
Fixes for courseware date formatting/translation.
 2016-05-17 10:13:15 -04:00
Ahsan Ulhaq
300002b54d Add js test for analytics event on LMS receipt page 
ECOM-4281
 2016-05-17 18:56:05 +05:00
Peter Fogg
80bfa36d09 Fixes for courseware date formatting/translation. 2016-05-17 09:20:07 -04:00
Christine Lytwynec
73806beeec Merge pull request #12478 from edx/clytwynec/ac-367 
Add skip_clean option to pa11ycrawler
 2016-05-17 09:05:21 -04:00
Adam
cf8e37b381 Merge pull request #12455 from edx/adam/fix-email-from-addr-length 
refine from_addr length limits (TNL-4264)
 2016-05-17 08:30:15 -04:00
cahrens
5f7e1266e7 Safe template cleanup. 2016-05-16 17:13:19 -04:00
Peter Desjardins
2282a2995c Merge pull request #12479 from edx/pdesjardins/DOC-2568 
Updated URLs for help topic links that had become stale. Per DOC-2568.
 2016-05-16 17:02:15 -04:00
sigberto
6e0fb24dab Display correct timezone on timestamp for question submission 
The view for submission history used to grab the timezone from the database (UTC) and
appeded the TIME_ZONE variable after (could be any time zone). Adjusted displayed
timedate to the TIME_ZONE variable. Added unittest checks the localized datetime
object used by submission history for the expected hour difference.
 2016-05-16 12:26:37 -07:00
Peter Desjardins
879fa212c7 Updated URLs for help topic links that had become stale. Per DOC-2568. 2016-05-16 14:30:17 -04:00
Peter Fogg
d5cae7b58a Merge pull request #12450 from edx/peter-fogg/referral-tracking 
Add referral tracking for new registrations.
 2016-05-16 12:08:56 -04:00
Eric Fischer
d324f130ea Merge pull request #12376 from edx/efischer/bulk_email_flag 
Move ENABLE_INSTRUCTOR_EMAIL to admin panel
 2016-05-16 12:06:29 -04:00
Peter Fogg
0e66baf41f Add referral tracking for new registrations. 
ECOM-4325
 2016-05-16 11:17:23 -04:00
Christine Lytwynec
0f90b92775 Add skip_clean option to pa11ycrawler 2016-05-16 11:12:03 -04:00
Eric Fischer
0cf3e39c31 Replace bulk email settings with admin config models 
Moves ENABLE_INSTRUCTOR_EMAIL and REQUIRE_COURSE_EMAIL_AUTH from settings files
to admin-accessible configuration models. This allows for the bulk email settings
to be modified without a new AMI deploy. See TNL-4504.

Also updates tests:
    -python tests mock out the new configurations in place of the old settings
    -lettuce test has been moved to bokchoy
        (note that there was some loss of coverage here - the lettuce tests had
        been doing some voodoo to allow for cross-process inspection of emails
        messages being "sent" by the server, from the client! In discussion with
        testeng, this seems outside the realm of a visual acceptance test. So,
        the bokchoy test simply confirm the successful queueing of the message,
        and leaves the validation of sending messages to the relevant unit tests.)
    -bok choy fixture has been added, to replace the settings in acceptance.py
    -lettuce and bok choy databases have been updated to reflect the backend changes

The new default is to have bulk_email disabled, we'll need to call this out in the
next OpenEdx release to ensure administrators enable this feature if needed.
 2016-05-16 11:09:39 -04:00
Douglas Hall
140fd85eb7 Merge pull request #12472 from edx/hasnain-naveed/WL-446 
ML-446 / Aligned the labels in login and registration pages
 2016-05-16 09:41:29 -04:00
Peter Fogg
89838d40ed Merge pull request #12373 from edx/peter-fogg/password-change-session-invalidation 
Expire sessions after a password change.
 2016-05-16 09:17:45 -04:00
Christine Lytwynec
c61846fbb5 Merge pull request #12462 from edx/clytwynec/ac-367 
update pa11ycrawler version
 2016-05-16 09:09:52 -04:00
Hasnain
c5f0fb87c8 ML-446 / Aligned the labels in login and registration pages 2016-05-16 12:35:08 +00:00
Douglas Hall
14587a5d3e Merge pull request #12442 from edx/ibrahimahmed443/WL-450-save-cancel-button-on-instructor-image-path 
show Save and Cancel button when admin change Instructor image asset …
 2016-05-15 07:28:14 -04:00
Ibrahim
b3411074af show Save and Cancel button when admin change Instructor image asset path from Studio schedule and details page 2016-05-14 16:25:44 -04:00
Douglas Hall
7d96ba50f2 Merge pull request #12446 from edx/ibrahimahmed443/WL-449-asset-image-fix 
WL-499 Fix the issue where images do not appear when set through asset linki…
 2016-05-14 06:46:12 -04:00
Ibrahim
2a2560e30e fix the issue where images do not appear when set through asset linkin Studio scheduls and details page 2016-05-13 16:22:44 -04:00
Robert Raposa
5a372a2c88 Merge pull request #12463 from edx/robrap/safelint-thresholds 
Update thresholds.
 2016-05-13 16:21:16 -04:00
Robert Raposa
06505c45ba Update thresholds. 2016-05-13 15:12:55 -04:00
Christine Lytwynec
86a96b5af0 update pa11ycrawler version 2016-05-13 14:22:14 -04:00
Renzo Lucioni
9129e5df87 Merge pull request #12459 from edx/renzo/kill-tabs 
Remove tab characters
 2016-05-13 12:56:42 -04:00
Adam Palay
c9b0e12d39 use markupspace for escaping 2016-05-13 11:15:00 -04:00