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

632 Commits

Author SHA1 Message Date
Douglas Hall
75945b8c9e Merge pull request #12791 from edx/ibrahimahmed443/WL-529-platform-name-theme-override 
replace references to settings.PLATFORM_NAME in edx-platform with the…
 2016-06-17 10:44:41 -04:00
Ibrahim
603546a04a replace references to settings.PLATFORM_NAME in edx-platform with theme overrides 2016-06-17 18:33:19 +05:00
Clinton Blackburn
eab057c812 Corrected JWT data type 
ECOM-4653
 2016-06-16 23:23:36 -04:00
Clinton Blackburn
372c59e4a4 Added links to download catalog CSVs in API admin tool 
ECOM-4729
 2016-06-16 23:00:48 -04:00
Clinton Blackburn
880493099f Corrected Course Catalog API URL 
Retrieving the URL from settings rather than an OAuth client that might not exist.

ECOM-4729
 2016-06-16 23:00:45 -04:00
Eric Fischer
fdc6d91588 update_in_cache on lms worker (#12689) 
This commit "undoes"a previous hotfix, and allows a cms course_publish
signal to trigger a block_structure update_course_in_cache task, which
is run on an lms worker queue.

Changes:
    -exposes ALTERNATE_QUEUE_ENVS
    -adds routing layer in celery.py
    -moves prior dev_with_worker settings file to devstack_with_worker
    -moves course_block api functionality into openedx/core/djangoapps/content/block_structure
 2016-06-16 18:01:06 -04:00
Douglas Hall
a36ede4e25 Get platform name via microsite configuration for forgot password page 2016-06-14 22:50:05 -04:00
Douglas Hall
036faf9b41 Get platform name via microsite configuration for forgot password page 2016-06-14 16:39:26 -04:00
Awais Jibran
fc885cbcea Merge pull request #12662 from edx/aj/fix-email-opt-in-list 
Fix email opt in list managemnet command
 2016-06-13 18:46:06 +05:00
David Ormsbee
249467c9bb Merge pull request #12527 from cpennington/enable-concurrency-in-lms-tests 
Enable concurrency (but not randomization) in LMS unit tests
 2016-06-10 09:19:59 -04:00
Awais Jibran
2648a63903 Fix email opt in list 2016-06-10 11:33:55 +05:00
Calen Pennington
a7ed99ba79 Add __init__.py to tests folders to make them proper modules 2016-06-09 14:38:33 -04:00
Peter Fogg
14fcb3a11b Merge pull request #12708 from edx/peter-fogg/fix-catalog-404 
Fix 500 error when searching for a user without catalogs.
 2016-06-09 14:30:49 -04:00
Peter Fogg
c43d8e1566 Fix 500 error when searching for a user without catalogs. 
ECOM-4653
 2016-06-09 13:22:51 -04:00
Renzo Lucioni
6d7938fde0 Use cached data to find completed programs on LMS 
These changes improve the performance of the LMS' program certification task. They also reduce strain on the programs service, especially when attempting to award program certificates to large numbers of students. ECOM-4490.
 2016-06-09 09:57:09 -04:00
Renzo Lucioni
ffd1e29dd1 Show Programs tab on program detail pages 2016-06-06 15:00:14 -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
wajeeha-khalid
f19af52054 MA-2050: add optional user profile details in GET thread & comment 2016-06-02 17:05:00 +05: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
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
J. Clifford Dyer
7b75d1d452 Add transformer that collects grading data. 
TNL-4449
 2016-05-26 16:15:34 -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
Nimisha Asthagiri
ee5e61f2a4 Merge pull request #12564 from edx/release 
Merge hotfix-2016-05-25
 2016-05-25 16:17:40 -04:00
Nimisha Asthagiri
7da42ec769 Hotfix: Revert block structure caching changes 2016-05-25 13:26:16 -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
Peter Fogg
760ce74fca Use correct JWT audience when connecting to course discovery. 2016-05-23 17:05:42 -04:00
Asad Iqbal
18cddf6e1e Merge pull request #12488 from edx/asadiqbal08/WL-477 
Got two thumbs up, so merging. 
WL-477 Route direct references to email address configurations through theming.helpers
 2016-05-23 17:56:28 +05:00
asadiqbal
1c19ebb443 WL-477 2016-05-23 13:24:05 +05:00
Nimisha Asthagiri
d37499c29d Hotfix for BlockStructure data not being invalidated upon Course Publish. 2016-05-20 16:21:06 -04:00
Hasnain
d5d51f3293 WL-230 Added additional fields to extended registration fields 2016-05-20 09:57:45 -04:00
Adam
55bfb74c6d Merge pull request #12481 from edx/fix-memory-leak 
clear request cache after celery task finishes (TNL-2705)
 2016-05-18 14:31:22 -04:00
Adam Palay
a7d638de9e clear request cache after celery task finishes (TNL-2705) 
set max_num_courses_in_cache on modulestore
 2016-05-18 10:43:54 -04:00
Peter Fogg
5abb77328e Use the correct JWT key when querying the Catalog API. 
ECOM-4441
 2016-05-17 15:28:19 -04:00
Peter Fogg
b38c4ed9be Provide a link to the catalog admin from the api_admin approval page. 
ECOM-4441
 2016-05-17 14:52:19 -04:00
AlasdairSwan
7bca66c23e Merge pull request #12408 from edx/alasdair/ECOM-4215-program-details-page-setup 
ECOM-4215 adding setup for new program details page
 2016-05-12 18:25:13 -04:00
AlasdairSwan
bc5daffc96 ECOM-4215 adding setup for new program details page 2016-05-12 16:39:23 -04:00
Matt Drayer
55cf0fb2c4 mattdrayer/microsite-jwt-auth: Access setting through microsites/theming framework 
* mattdrayer: Remove individual JWT settings
* mattdrayer: Add settings defaults to JWT_AUTH calls
 2016-05-12 15:04:26 -04:00
Renzo Lucioni
e88a4e5c74 Merge pull request #12437 from edx/renzo/filter-by-passing-certs 
Tune program credential backpopulation command
 2016-05-12 12:12:11 -04:00
Clinton Blackburn
6a0c6f7a14 Merge pull request #12439 from edx/clintonb/credit-admin-update 
Updated credit admin
 2016-05-12 11:14:14 -04:00
Renzo Lucioni
dbe6dfc2ae Tune program credential backpopulation command 
Filter certificates by passing status when looking for users who may be eligible for a program certificate. Doing so dramatically accelerates the query and further reduces the set of targeted users. Part of ECOM-3924.
 2016-05-11 22:29:48 -04:00
Clinton Blackburn
28d4e2e8f4 Updated credit admin 
ECOM-4379
 2016-05-11 22:28:12 -04:00
Clinton Blackburn
23e990df1d Replaced all usages of JSONWebTokenAuthentication with JwtAuthentication 
JwtAuthentication knows how to parse our custom claims.

ECOM-4414
 2016-05-11 22:25:35 -04:00
Renzo Lucioni
91d049794b Merge pull request #12421 from edx/renzo/backpopulate-command 
Add management command for backpopulating missing program credentials
 2016-05-11 14:09:07 -04:00
Renzo Lucioni
065300ba65 Extend program certification task logging to facilitate monitoring during backpopulation 
Log a message at the info level when the task is called for a user with no completed programs, and another when the task is called for a user who is not eligible for any new program certificates. Part of ECOM-3924.
 2016-05-11 12:38:05 -04:00
Renzo Lucioni
c931d4d14b Add management command for backpopulating missing program credentials 
This command triggers program certification tasks for any users in the system who may qualify for a program credential. ECOM-3924.
 2016-05-11 11:36:48 -04:00
Calen Pennington
ccaafce05b Merge pull request #12205 from cpennington/disable-caching-in-tests 
Disable caching in LMS tests
 2016-05-06 15:22:48 -04:00
Clinton Blackburn
bcd762ef91 Updated credit requirements logic 
Credit eligibility can be updated up to the point that the course is closed or the student submits a request for credit. Credit eligibility cannot be removed.

ECOM-4379
 2016-05-06 10:51:06 -04:00
Clinton Blackburn
9b24735cb9 Credit test cleanup 
Removed a lot of duplicate code!

ECOM-4379
 2016-05-06 02:59:11 -04:00