Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

14096 Commits

Author SHA1 Message Date
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
Renzo Lucioni
85ca1f3e03 Merge pull request #12575 from edx/renzo/program-detail-data 
Include raw program data on the detail page
 2016-05-27 10:01:19 -04:00
Cliff Dyer
4e77d50982 Merge pull request #12396 from edx/cdyer/grading-transformer 
Add transformer to collect grades data
 2016-05-27 09:39:34 -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
Brian Wilson
a36aa68fd7 Add new export_olx management command. 
This moves the functionality of the 'export_course'  management command from lms/djangoapps/courseware
over to the Studio codebase.  This reflects its use going forward to be run with cms settings, to
export the content of the Studio modulestore instead of the LMS modulestore.  The management
command is used by an analytics workflow to output course content for researchers.
 2016-05-26 17:26:59 -04:00
J. Clifford Dyer
7b75d1d452 Add transformer that collects grading data. 
TNL-4449
 2016-05-26 16:15:34 -04:00
Clinton Blackburn
f6d9c9a324 Added scopes claim to JWT access tokens (#12571) 
This will allow API servers to limit access based on scopes.
 2016-05-26 15:45:07 -04:00
Renzo Lucioni
a6b972549a Include raw program data on the detail page 
Uses the view's ID argument to retrieve and drop unmodified programs API data on the details page. Future work will supplement with CourseOverviews data. Part of ECOM-4415.
 2016-05-26 15:33:08 -04: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
Clinton Blackburn
079dc97261 Merge pull request #12562 from edx/clintonb/jwt-fix 
Added administrator bit to JWT access token
 2016-05-25 15:49:00 -04:00
Robert Raposa
ebf89d63e9 Merge pull request #12541 from edx/robrap/fix-imports 
Fix import order for HTML, Text.
 2016-05-25 15:23:08 -04:00
Clinton Blackburn
38148679dc Added administrator bit to JWT access token 2016-05-25 14:35:13 -04:00
asadiqbal
63a30a3110 WL-479 Enable Bulk purchase for anonymous user 2016-05-25 10:40:35 -04:00
Brian Jacobel
182921f1f1 Merge pull request #12433 from edx/bjacobel/upgrade-jquery 
Upgrade jQuery to 2.2
 2016-05-25 09:07:07 -04:00
cahrens
4ba07bf7a4 Assorted test and dependency fixes to cms-squire and cms 
isRejected is deprecated.

Actually serve the slick library in LMS jasmine tests

customwmd doesn't need to wait for DOM ready event

... In order to define a class and extend the Markdown class.
 2016-05-24 16:53:34 -04:00
Bill DeRusha
136f3d3467 Merge pull request #12552 from edx/release 
Merge Release 2016-05-24 to Master
 2016-05-24 16:11:35 -04:00
Ahsan Ulhaq
a8f2de8375 Course Dashboard Visual Update 
ECOM-4398
 2016-05-24 16:17:19 +05:00
Clinton Blackburn
8855f12701 Merge pull request #12435 from mitocw/gdm_certificates_api_key 
Authentication and Authorization for Cert Rest APIs fixed
 2016-05-23 17:31:45 -04:00