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

37256 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
c4c4ee31c2 Reset current language after discussion tests, so that other languages don't leak into tests that don't use the LocaleMiddleware 2016-06-08 10:07:49 -04:00
Douglas Hall
95054e1a03 Merge pull request #12649 from edx/ibrahimahmed443/MAYN-280-explore-new-courses-button-fix 
fix 'explore new courses' button overlap issue
 2016-06-06 09:58:57 -04:00
Awais Qureshi
ab75b402bd Merge pull request #12574 from edx/awais786/ECOM-4214-support-tool-modifications 
Remove support tool limitation based on verified enrollment deadline
 2016-06-06 18:01:51 +05:00
Tasawer
c6a6cdd72d Quality fixes. 
ECOM-4214
 2016-06-06 16:50:16 +05:00
Ibrahim Ahmed
0a84b65dcb Merge branch 'master' into ibrahimahmed443/MAYN-280-explore-new-courses-button-fix 2016-06-06 15:55:21 +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
Renzo Lucioni
9b58bded9f Merge pull request #12650 from edx/renzo/no-program-data 
Make program details page 404 if no program data found
 2016-06-04 23:15:35 -04:00
Douglas Hall
55eba94e6b Merge pull request #12659 from edx/release 
Merging Hotfix Release 2016-06-03 back to master
 2016-06-04 07:16:45 -04:00
Douglas Hall
c47a117771 Merge pull request #12640 from edx/hotfix/2016-06-03 
WL-494 MAYN-285 Hotfix Release Candidate 2016-06-03
 2016-06-03 20:31:07 -04:00
Renzo Lucioni
ff9e5f3f27 Make program details page 404 if no program data found 2016-06-03 17:57:55 -04:00
Chris Rodriguez
ceff3e70a9 Uses previous commit hash to prevent failures on master 2016-06-03 17:27:23 -04:00
Christina Roberts
efdb84ca83 Merge pull request #12559 from jkozera/svg-thumbnail-generation 
[TNL-3960] Fix for thumbnail generation code crashing with SVG files
 2016-06-03 16:36:39 -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
clrux
4b25766aed Merge pull request #12652 from edx/clrux/a11y-ruleset-update 
Uses previous commit hash to prevent failures on master
 2016-06-03 15:22:36 -04:00
Douglas Hall
ea654200f5 Put shopping cart bulk purchase behind a settings flag 2016-06-03 14:41:32 -04:00
Chris Rodriguez
fbdce96725 Uses previous commit hash to prevent failures on master 2016-06-03 14:26:17 -04: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
Ibrahim
8c9ad0d338 fix 'explore new courses' button overlap issue 2016-06-03 20:02:16 +05: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
Asad Iqbal
962fa8071d Merge pull request #12643 from edx/asadiqbal08/updating-poll_xblock-version 
updated the xblock version
 2016-06-03 16:45:22 +05:00
Syed Hassan Raza
745e481597 Fixed logging and unicode handling 2016-06-03 15:36:41 +05:00
Tasawer
f05d03802e Revert "Update Receipt page" 
This reverts commit 8d2c27fd04.
 2016-06-03 15:03:00 +05:00
Tasawer
8d2c27fd04 Update Receipt page 
ECOM-4559
 2016-06-03 15:01:53 +05:00
asadiqbal
9725fa94a5 updated the xblock version 2016-06-03 13:22:47 +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
Ned Batchelder
d0dcfe12e4 Merge pull request #12621 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-06-02 19:52:51 -04:00
Douglas Hall
40386b311d Fix student profile data download for courses with extended profile fields 2016-06-02 17:02:35 -04: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
Douglas Hall
b9f4902ef1 Merge pull request #12636 from edx/douglashall/WL-494 
WL-494 Fix JQuery data attribute type conversion bug for shopping cart
 2016-06-02 16:16:38 -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
Andy Armstrong
086b0a14b5 Merge pull request #12538 from edx/andya/new-discussion-page 
Move discussion board to the Pattern Library
 2016-06-02 14:29:57 -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
Cliff Dyer
9acc82ddf5 Merge pull request #12595 from edx/cdyer/authorize-endpoint 
Dispatch authorization endpoint to correct backend.
 2016-06-02 11:02:04 -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
Douglas Hall
1d23b806e5 Fix JQuery data attribute type conversion bug for shopping cart 2016-06-02 10:51:54 -04:00
Ned Batchelder
64828c48c8 Update translations (autogenerated message) 2016-06-02 14:36:45 +00:00
Kevin Kim
aecb809205 Merge pull request #12553 from edx/kkim/neg_vert_positions 
Changed courseware/views/index.py to fix negative vertical positions
 2016-06-02 10:32:21 -04:00
wajeeha-khalid
d03f4a97c4 Merge pull request #12568 from edx/jia/MA-2419 
MA-2419: make thread 'read' mutual exlusive to update fields
 2016-06-02 19:29:03 +05:00
Attiya Ishaque
f7659c8bb7 Merge pull request #12587 from edx/PLAT-1004-Email-field-lenght 
Set the Email field length is 254 characters.
 2016-06-02 19:28:07 +05:00
J. Cliff Dyer
1270df1500 Enable dispatch of Authorization endpoint. 
* Created URL route
* Expanded test code to confirm expected behavior

MA-2124
 2016-06-02 13:58:38 +00:00
Attiya Ishaque
62b431ead3 Merge branch 'master' into PLAT-1004-Email-field-lenght 2016-06-02 18:12:54 +05:00
wajeeha-khalid
9d3365f067 Merge pull request #12424 from edx/jia/MA-2050 
MA-2050: add profile image url in GET thread & comment
 2016-06-02 18:01:38 +05:00