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

37277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Renzo Lucioni
740266bd82 Merge pull request #12675 from edx/renzo/persist-programs-nav 
Show Programs tab on program detail pages
 2016-06-06 16:30:55 -04:00
Calen Pennington
d76f31bc90 Merge pull request #12627 from cpennington/test-certificates-shared-modulestore-test-case 
Don't modify courses inside SharedModuleStoreTestCase test methods in…
 2016-06-06 15:50:47 -04:00
Calen Pennington
8518ce8f30 Merge pull request #12674 from cpennington/assert-item-equality-in-ccx-tests 
Only assert on item-equality when checking ccx course modules
 2016-06-06 15:28:07 -04:00
Calen Pennington
5cc40f06fc Merge pull request #12672 from cpennington/separate-courseinfo-tests 
Separate CourseInfo tests into a separate ModulestoreTestCase
 2016-06-06 15:27:40 -04:00
Calen Pennington
4367460709 Merge pull request #12668 from cpennington/test-tracker-global-settings 
Use copies of tracker settings dicts in tests so that changes don't l…
 2016-06-06 15:26:20 -04:00
Renzo Lucioni
ffd1e29dd1 Show Programs tab on program detail pages 2016-06-06 15:00:14 -04:00
Ben Patterson
b9a38db626 Merge pull request #12647 from edx/benp/pa11ycrawler-update-AC-488 
AC-488. Use tip of pa11ycrawler repo to fix intermittent JSON decodin…
 2016-06-06 14:34:02 -04:00
clrux
1786e25bf2 Merge pull request #12665 from edx/clrux/ac-490 
AC-490 using latest a11y checks and ignoring section test
 2016-06-06 14:26:17 -04:00
Renzo Lucioni
f8be1ed168 Merge pull request #12657 from edx/renzo/include-listing-url 
Include program listing URL on detail pages
 2016-06-06 14:25:43 -04:00
Calen Pennington
bdf08fc7e2 Separate CourseInfo tests into a separate ModulestoreTestCase 2016-06-06 13:57:56 -04:00
Andy Armstrong
d8a8bacd91 Merge pull request #12639 from edx/andya/discussion-board-header 
Add styling for content headers to the edx-platform
 2016-06-06 13:46:40 -04:00
Renzo Lucioni
f913cc52c4 Include program listing URL on detail pages 
Replaces the hardcoded URL in favor of a URL passed by the server.
 2016-06-06 13:45:18 -04:00
Calen Pennington
acc9bca390 Merge pull request #12626 from cpennington/reset-parameters-fake-payment-tests 
Reset client post parameters after each payment_fake test, because th…
 2016-06-06 13:25:22 -04:00
Calen Pennington
3207311e50 Use copies of tracker settings dicts in tests so that changes don't leak between tests 2016-06-06 13:19:52 -04:00
Chris Rodriguez
6be4f84aff Using latest version from NPM and ignoring section tests for now 2016-06-06 13:10:51 -04:00
Calen Pennington
e6c235a4b8 Only assert on item-equality when checking ccx course modules 2016-06-06 13:09:52 -04:00
Andy Armstrong
3b05398022 Address code review feedback 2016-06-06 12:36:54 -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
Andy Armstrong
749f9650ff DO NOT MERGE: show UX reference pages on sandboxes 2016-06-03 16:34:20 -04:00
Andy Armstrong
199c4c350b Support content headers for Pattern Library pages 2016-06-03 16:34:20 -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
Ben Patterson
51099305e2 AC-488. Use tip of pa11ycrawler repo to fix intermittent JSON decoding error. 2016-06-03 10:31:54 -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
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