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

14265 Commits

Author SHA1 Message Date
Calen Pennington
940d38e2e5 Merge pull request #12671 from cpennington/separate-discussion-blackout-tests 
Separate discussion blackout tests into a separate ModulestoreTestCase
 2016-06-07 10:09:02 -04:00
Calen Pennington
c124fb343b Make test_favicon tests work independently 2016-06-07 10:02:44 -04:00
Calen Pennington
1537f0407a Mock SignatureValidator.verify using patch so that the mock is unset at the end of the test 2016-06-07 10:01:40 -04:00
Calen Pennington
d49e1e91cb Separate discussion blackout tests into a separate ModulestoreTestCase 2016-06-07 09:16:29 -04:00
Eric Fischer
faa7f544d2 Bulk Email Cohorts (#12602) 
Adds cohorts as valid bulk email targets.
 2016-06-06 16:32:59 -04:00
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
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
Renzo Lucioni
ffd1e29dd1 Show Programs tab on program detail pages 2016-06-06 15:00:14 -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
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
e6c235a4b8 Only assert on item-equality when checking ccx course modules 2016-06-06 13:09:52 -04:00
Tasawer
c6a6cdd72d Quality fixes. 
ECOM-4214
 2016-06-06 16:50:16 +05:00
Matt Drayer
d655e6b6f6 mattdrayer/WL-493: Enable bulk purchase via Otto for unauthenticated users 2016-06-06 07:45:59 -04:00
Douglas Hall
372c8f1d70 Merge pull request #12658 from edx/release 
Merging hotfix/2016-06-07 release to rc/2016-06-07
 2016-06-06 07:31:11 -04: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
Renzo Lucioni
ff9e5f3f27 Make program details page 404 if no program data found 2016-06-03 17:57:55 -04:00
Douglas Hall
ea654200f5 Put shopping cart bulk purchase behind a settings flag 2016-06-03 14:41:32 -04:00
Matt Drayer
c2c2a67753 mattdrayer/WL-493: Enable bulk purchase via Otto for unauthenticated users 2016-06-03 13:00:45 -04: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
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
Douglas Hall
40386b311d Fix student profile data download for courses with extended profile fields 2016-06-02 17:02:35 -04:00
Ehtesham
2d29751d14 fixing paging footer in topics tab 2016-06-03 00:06:57 +05: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
Calen Pennington
6963c5307b Deactivate translations after all i18n tests in courseware so that they don't leak to future tests 2016-06-02 11:06:59 -04:00
Calen Pennington
234ed7635b Reset client post parameters after each payment_fake test, because the sign method modifies the supplied dictionary 2016-06-02 11:04:16 -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
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
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
wajeeha-khalid
f19af52054 MA-2050: add optional user profile details in GET thread & comment 2016-06-02 17:05:00 +05:00
wajeeha-khalid
1d5fe0ed33 MA-2419: make thread 'read' mutual exlusive to update fields 2016-06-02 11:38:25 +05:00
wajeeha-khalid
3c0502726c MA-2318: get DiscussionTopic against topic id 2016-06-02 11:33:39 +05:00
Douglas Hall
a07a762f73 Merge pull request #12555 from edx/hasnain-naveed/MAYN-193 
MAYN-193 Use django_sites_extensions.middleware.RedirectMiddleware to enable redirects
 2016-06-01 21:18:01 -04:00
Kevin Kim
17b8dfa94d Changed courseware/views/index.py to fix negative vertical positions 
TNL-4408
 2016-06-01 20:16:46 +00:00
AlasdairSwan
a7d036f912 Merge pull request #12613 from edx/release 
Release 1st June 2016
 2016-06-01 15:22:19 -04:00
Hasnain
11454640da Added middleware to redirect the user from expired course page to all courses page. 2016-06-01 14:56:27 -04:00
Matt Drayer
42af66cee7 mattdrayer/determine-correct-checkout: Select proper checkout workflow based on context 2016-06-01 00:39:15 -04:00
ssemenova
36c867c42a changed icon html from <i> to <span> 
TNL-4651
 2016-05-31 15:46:23 -04:00
tasawernawaz
feb8ca4467 Revert "ECOM-4334 Update learner dashboard" 
This reverts commit caa5a0ac02.
 2016-05-31 14:36:19 +00: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
Nimisha Asthagiri
4a56fa5fb1 Adding infrastructure to support context-sensitive help links in the LMS. 2016-05-27 11:35:05 -04:00
Douglas Hall
641f29b671 Merge pull request #12525 from edx/afzaledx/sol-1802_zendesk_tickets_for_suspicious_proctored_attempts 
(WIP) SOL-1802 Create Zendesk ticket when "Suspicious" proctored exam reviews are received from the proctoring provider
 2016-05-27 10:15:16 -04:00