Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,258 Commits 1 Branch 0 Tags
e93d112c04779111c2ef60fcd0fa3fb3b5e85196
Commit Graph

13362 Commits

Author SHA1 Message Date
Calen Pennington
e93d112c04 Make UrlResetMixin.reset_urls a public method (so that it can be used inside test methods) 2016-06-06 13:27:38 -04:00
Tasawer
c6a6cdd72d Quality fixes. 
ECOM-4214
 2016-06-06 16:50:16 +05:00
Matt Drayer
920fba502c Merge pull request #12642 from edx/mattdrayer/WL-493 
mattdrayer/WL-493: Enable bulk purchase via Otto for unauthenticated users
 2016-06-05 21:54:50 -04:00
Jerzy Kozera
d7ca5d94d9 Fix for thumbnail generation code crashing with SVG files 
Fixes TNL-3960: adding an SVG file to assets resulted in a logged
exception while generating a thumbnail. A user-visible side effect
was that no thumbnail was shown next to the uploaded file, which
is working correctly now after this change.
 2016-06-03 21:26:29 +02:00
Matt Drayer
c2c2a67753 mattdrayer/WL-493: Enable bulk purchase via Otto for unauthenticated users 2016-06-03 13:00:45 -04:00
Renzo Lucioni
93ba637e5f Merge pull request #12638 from edx/renzo/fix-failing-a11y 
Fix program details a11y test
 2016-06-03 13:00:13 -04:00
Renzo Lucioni
9c4a3dc9c7 Fix program details a11y test 2016-06-03 11:32:07 -04:00
Calen Pennington
90286cd944 Merge pull request #12581 from edx/zoldak/TNL-4683 
Mark test as flaky  TNL-4683
 2016-06-03 09:16:34 -04:00
Syed Hasan raza
f31e370f46 Merge pull request #12607 from edx/shr/bug/PLAT-1040-video-module-non-ASCII-values-fixed 
Fixed logging and unicode handling
 2016-06-03 17:05:19 +05:00
Syed Hassan Raza
745e481597 Fixed logging and unicode handling 2016-06-03 15:36:41 +05:00
Ehtesham Kafeel
fab5ef320b Merge pull request #12584 from edx/ekafeel/topics-pagination-fix 
fixing paging footer in topics tab
 2016-06-03 10:29:20 +05:00
Calen Pennington
80fdc5212c Merge pull request #12580 from edx/zoldak/TNL-4682 
Mark tests as flaky  TNL-4682
 2016-06-02 16:27:08 -04:00
Peter Fogg
d7da5f0af1 Merge pull request #12625 from edx/peter-fogg/bulk-change-enrollment 
Add a bulk version of the change_enrollment script.
 2016-06-02 15:23:39 -04:00
Ehtesham
2d29751d14 fixing paging footer in topics tab 2016-06-03 00:06:57 +05:00
Renzo Lucioni
b16db7e141 Merge pull request #12634 from edx/renzo/skip-failing-a11y 
Disable program details page a11y test
 2016-06-02 14:55:06 -04:00
Peter Fogg
e6d31acb11 Add a bulk version of the change_enrollment script. 2016-06-02 14:16:08 -04:00
Renzo Lucioni
87d58e1d3a Disable program details page a11y test 
The tested page is currently disabled. This test will be re-enabled once a11y failures are resolved.
 2016-06-02 13:53:39 -04:00
Andy Armstrong
7e2a174eec Move discussion board to the Pattern Library 
TNL-4622
 2016-06-02 12:48:12 -04:00
Renzo Lucioni
ed798bb945 Merge pull request #12599 from edx/renzo/supplement-program-data 
Supplement program data with course and enrollment data
 2016-06-02 12:04:51 -04:00
Renzo Lucioni
a8150a51d2 Supplement program data with course and enrollment data 
The supplemented data is passed through to the program details page. Part of ECOM-4415.
 2016-06-02 10:57:46 -04:00
attiyaishaque
47f2f7de0f Set the Email field length is 254 characters. 2016-06-02 17:08:06 +05:00
AlasdairSwan
a7d036f912 Merge pull request #12613 from edx/release 
Release 1st June 2016
 2016-06-01 15:22:19 -04:00
Sofiya Semenova
7fa763b29f Merge pull request #12579 from edx/christina/icons 
Christina/icons
 2016-06-01 09:26:35 -04:00
Clinton Blackburn
8ea3b62016 Added admin for UserAttribute model (#12596) 
ECOM-4502
 2016-05-31 18:22:18 -04:00
Clinton Blackburn
2fd9896ca1 Allowing profile image upload date to be blank (#12601) 2016-05-31 16:46:11 -04:00
ssemenova
36c867c42a changed icon html from <i> to <span> 
TNL-4651
 2016-05-31 15:46:23 -04:00
Tasawer Nawaz
454368bbc2 Merge pull request #12594 from edx/revert-ecom-4334-update-learner-dashboard 
Revert "ECOM-4334 Update learner dashboard"
 2016-06-01 02:03:05 +08:00
Peter Fogg
f7d002e65e Change user attribute for cookies to a constant value. 2016-05-31 11:23:51 -04:00
Christina Roberts
98fcc4ff9e Merge pull request #12578 from edx/christina/tnl-4561 
Christina/tnl 4561
 2016-05-31 11:06:48 -04:00
Chris Rodriguez
f64bf4c081 Revert "AC-454 adding visual clarify for selected menu options" 
This reverts commit 4175616519.
 2016-05-31 10:43:44 -04:00
tasawernawaz
feb8ca4467 Revert "ECOM-4334 Update learner dashboard" 
This reverts commit caa5a0ac02.
 2016-05-31 14:36:19 +00:00
Christina Roberts
880206e438 Merge pull request #12577 from edx/christina/4642 
Add missing file.
 2016-05-31 08:48:40 -04:00
cahrens
3aa7a313fc Move file to common directory. 
It is needed by both Studio and LMS.
TNL-4642

x
 2016-05-30 12:43:46 -04:00
Ehtesham Kafeel
9cb660a7d2 Merge pull request #12410 from edx/fedx/upgrade-paging-collection 
Upgrade edx-platform's paging collection with new edx-ui-toolkit's paging collection
 2016-05-30 17:44:57 +05:00
cahrens
292cd93131 Focus seems to be flaky when running tests. 
TNL-4561
 2016-05-28 22:03:35 -04:00
Jesse Zoldak
06351ebd14 Mark test as flaky TNL-4683 2016-05-27 15:44:01 -04:00
Jesse Zoldak
86408e795c Mark tests as flaky TNL-4682 2016-05-27 15:33:51 -04:00
Nimisha Asthagiri
4a56fa5fb1 Adding infrastructure to support context-sensitive help links in the LMS. 2016-05-27 11:35:05 -04:00
Afzal Wali
eadd656df0 SOL-1802 Allow proctoring service to create support ticket. 2016-05-27 09:29:06 -04:00
Ehtesham
b31ba9d041 upgrade Pagingcollection to edx-ui-toolkit's PagingCollection 2016-05-27 04:35:44 +05:00
Eric Fischer
a9a3fabfe8 Bulk Email Multiselect (#12301) 
TNL-4356

Allows multiple bulk email targets to be specified at once.

-The previous "All" option has been split into "Staff" and "Learners"
-The backend changes made here lay the groundwork for cohort emailing
-The data migration, 0005, is somewhat large and requires deploy attention
-Tests have been updated
-Numerous safe-commit-linter fixes are included
 2016-05-26 14:22:04 -04:00
Renzo Lucioni
e77166c2b0 Adjust program detail page URL routing 
The new URL pattern expects a program ID and allows a program name to be included, if desired. It will match paths like 'programs/123/' and 'programs/123/foo/', but not 'programs/123/foo/bar/'. The given ID is passed to the view, where it will be used to retrieve program data. Part of ECOM-4415.
 2016-05-26 12:17:21 -04:00
clrux
0bcb378a6d Merge pull request #12419 from edx/clrux/ac-454 
AC-454 adding visual clarity for selected menu options in the video player
 2016-05-26 06:04:09 -04:00
Chris Rodriguez
4175616519 AC-454 adding visual clarify for selected menu options 2016-05-25 15:50:22 -04:00
Diana Huang
e613b7f460 Merge pull request #12556 from edx/diana/discussion-a11y 
Add a11y tags on accessibility tests.
 2016-05-25 15:12:21 -04:00
Diana Huang
cbe9142996 Add a11y tags on accessibility tests. 2016-05-25 10:59:24 -04:00
Diana Huang
53f6d40d45 Merge pull request #12542 from edx/diana/discussion-a11y 
Add accessibility tests for discussion forums.
 2016-05-25 10:16:38 -04:00
Diana Huang
677403192b Add accessibility tests for discussion forums. 2016-05-25 09:26:35 -04:00
Brian Jacobel
f4bede6c5b Fix library load paths (incl. jquery.scrollTo) 
Simplify paths in karma_cms_squire require paths
 2016-05-24 16:53:59 -04:00
Brian Jacobel
ad2a9a985d .val is not working here, approximate its intent with .prop("checked") 2016-05-24 16:53:58 -04:00