Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,749 Commits 1 Branch 0 Tags
82a7a79264e4667124d73c8eda00a6c44d69bb8a
Commit Graph

1341 Commits

Author SHA1 Message Date
Brian Mesick
af43d08b22 Revert "Upgrade django-ratelimit-backend to 1.1.1" 2017-07-06 16:18:02 -04:00
Mushtaq Ali
e8fee2e09a Add backend video image validations - EDUCATOR-45 2017-07-06 12:35:05 +05:00
Aamish Baloch
7b91095398 Merge pull request #15467 from edx/aamishbaloch/YONK-691 
YONK-691: Configurable profile image sizes
 2017-07-06 12:09:16 +05:00
Brian Mesick
bc485ea580 Merge pull request #15469 from edx/bmedx/django_1.11_upgrade_ratelimit_backend_PLAT-1482 
Upgrade django-ratelimit-backend to 1.1.1
 2017-07-05 16:54:49 -04:00
bmedx
705a68b212 Upgrade django-ratelimit-backend to 1.1.1 2017-07-05 10:14:59 -04:00
Aamish Baloch
ac45850d15 YONK-691: Configurable profile image sizes 2017-07-05 18:50:01 +05:00
Andy Armstrong
3cd985da20 Implement a skeleton page with Bootstrap 
LEARNER-1174
 2017-07-04 15:55:06 -04:00
Afzal Wali
383208c4c8 multitenant Program cache. 
Fetched Programs and Program details from Course Discovery service for all sites and stored the uuids in cache with site-specfic keys.
Learner-1146
 2017-07-04 14:20:55 +05:00
Robert Raposa
a087ce4854 Merge pull request #15416 from edx/robrap/LEARNER-1604-waffle-default 
LEARNER-1604: Change default and refactor old unified_course_view flag.
 2017-06-29 15:37:38 -04:00
Gregory Martin
b9425c5b5c Implement signal/handler for learner passing grades 2017-06-29 14:16:06 -04:00
John Eskew
947e814216 Remove deprecated django.utils.importlib. 2017-06-29 12:08:21 -04:00
Robert Raposa
2e80c1e66b Refactor, enhance, and adjust unified_course_view flag. 
This includes several general enhancement in addition
to the fixes for unified_course_view:
1. Add support for default when no waffle flag defined.
2. Add support for table_blacklist to assertNumQueries.
3. Rename flag to 'course_experience.course_outline_page'.
4. Change flag default to True when it is not defined.
 2017-06-29 11:04:35 -04:00
Joel Barciauskas
89c4705234 Merge pull request #14847 from edx/jbarciauskas/refactor-heartbeat-extensible 
Refactor heartbeat endpoint for extensibility
 2017-06-28 15:59:26 -04:00
Michael Frey
6f60d3b905 Merge pull request #15417 from edx/mjfrey/catch-exception 
catch InvalidKeyError
 2017-06-27 15:58:51 -04:00
Joel Barciauskas
7895875559 Refactor the heartbeat djangoapp to be a bit more extensible 
We may want to add additional heartbeat checks, particularly depending
on the context (e.g. different environments). This is meant to be a
start at enabling a more plug-in style heartbeat check that provides
more detailed diagnostics if desired.
 2017-06-27 11:45:37 -04:00
Michael Frey
f92d02feae catch InvalidKeyError 2017-06-27 09:49:19 -04:00
Omar Al-Ithawi
1b46c3e646 Add optional support for Unicode usernames 
Refactoring: Use format with named variables
 2017-06-27 14:18:49 +03:00
Ivan Ivic
6e45f00041 Created new embargo check api 
LEARNER-1523
LEARNER-1524
 2017-06-26 15:02:04 -04:00
Sven Marnach
3460adc824 Merge pull request #14831 from open-craft/smarnach/immutable-emails 
Add feature flag to disable email address changes.
 2017-06-26 16:49:52 +02:00
Douglas Hall
6ff027ab01 Merge pull request #15395 from open-craft/haikuginger/case-insensitive-country-code 
Allow lower- and mixed-case country default values on registration form
 2017-06-23 13:47:09 -04:00
Harry Rein
aea407b13e Merge pull request #15355 from edx/HarryRein/LEARNER-1485-course-reviews-tool 
LEARNER-1485: Adding a reviews page and link from the course tool bar
 2017-06-23 13:09:13 -04:00
Marko Jevtic
75531b2fef [LEARNER-437] Reflect discount on the Program About Page (WL) 2017-06-23 17:34:06 +02:00
Jesse Shapiro
5d363df5f5 Allow lower- and mixed-case country default values 2017-06-23 11:29:11 -04:00
Harry Rein
82daaa5ad3 Adding a reviews page to the course and updating the reviews module on the course about page. Removed the existing coursetalk implementation and put it in a fragment, removed the tests as well. Added configuration settings to specify the reviews template as well as the reviews provider. This is all protected by a waffle flag. 2017-06-23 11:27:48 -04:00
Marko Jevtic
d48100d386 [LEARNER-1367] Move Program Marketing page from private themes repo to edx platform repo 
[LEARNER-311] Enable a purchase button on the Program page - platform (WL)
 2017-06-23 16:27:37 +02:00
Sven Marnach
f127a29d62 Add feature flag to disable email address changes. 2017-06-21 15:15:52 +02:00
Afzal Wali Naushahi
2b4fb4fd95 Merge pull request #15180 from edx/clintonb/multi-tenant-catalog-integration 
Updated CatalogIntegration to use a site-specific URL
 2017-06-21 15:31:53 +05:00
Afzal Wali
8173182c86 Taking the url change behind the waffle switch. Required for the Learner-1146 
Learner-1111
 2017-06-21 14:02:14 +05:00
Uman Shahzad
8b65ca17c5 Migrate to latest, split python-social-auth. 
PSA was monolothic, now split, with new features, like
a DB-backed partial pipeline. FB OAuth2 version also upped.

Partial pipelines don't get cleared except when necessary.
They persist for special cases like change of browser while
still mid-pipeline (i.e. email validation step).

Refactor, cleanup, and update of a lot of small things as well.

PLEASE NOTE the new `social_auth_partial` table.
 2017-06-20 22:05:36 +05:00
Clinton Blackburn
f318661df5 Updated CatalogIntegration to use a site-specific URL 
The internal_api_url field has been deprecated. All usages have been updated with calls to the method get_internal_api_url().

LEARNER-1111
 2017-06-20 18:38:56 +05:00
Uman Shahzad
d5c85331c5 Automatically populate additional fields for SSO scenarios. 
When authenticating using an SAML IdP, gather additional user
data besides what is standard. Requires admin to input JSON
in settings to recognize the additional user data.
 2017-06-18 22:18:43 +00:00
cahrens
31d99e8d2d ED-549 Assign learner to a cohort before registration. 2017-06-16 10:23:13 +00:00
Adam
691d6872c7 Merge pull request #15294 from edx/adam/add-precedes-to-coursegraph-3 
write courses to neo4j in background tasks (EDUCATOR-583)
 2017-06-15 15:10:11 -04:00
rabiaiftikhar
7bf0674de8 EDUCATOR-394 disable self-generated certificates when course is reset to instructor-paced 2017-06-14 19:46:59 +05:00
Noraiz Anwar
371c422aaf Revert "EDUCATOR-394 Disable self generation certificates when course is reset to instructor-paced." 2017-06-14 15:57:07 +05:00
rabiaiftikhar
2eab85ebf7 Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-06-14 13:38:29 +05:00
Sarah Fischmann
eafb79defc Added lang attribute in LMS and Studio; added language col to course_overviews 
Added course level lang attribute for LMS

added lang attribute to Studio

fixed error when trying to get language attribute on course that does not exist

simplified code

added lang attribure to more places in LMS, added migration for language attribute in course_overview

fixing contraints in the database for language attribute

added lang attribute to several more places in LMS and Studio

added lang attribute to discussion and custom pages; cleaned up code

fixed issue that was causing test failures

moved lang attribute higher in tree in two places
 2017-06-13 14:42:29 -04:00
Brandon Baker
7d2d0657fe Merge pull request #15290 from edx/bbaker/educator-344 
Bbaker/educator 344
 2017-06-13 10:42:35 -04:00
rabiaiftikhar
22d3b02807 respond to comments 2017-06-13 16:29:17 +05:00
rabiaiftikhar
b84d4c0209 Review Rehan 2017-06-13 15:43:36 +05:00
rabia23
a8913f9a66 Review Alex 2017-06-13 06:51:38 +00:00
Adam Palay
51abe89a80 respond to comments 2017-06-12 11:55:58 -04:00
Adam Palay
69d76b69d7 write courses to neo4j in background tasks (EDUCATOR-583) 
move tasks into tasks.py

add more logging
 2017-06-12 10:44:27 -04:00
rabia23
bb219ed4a7 Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-06-12 11:24:30 +00:00
Marko Jevtic
bf164ae962 [LEARNER-1183] Prepare program data to be presented on program marketing page 
[LEARNER-1393] Filter program course runs by status
 2017-06-12 10:15:38 +00:00
rabia23
642c3b47e2 Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-06-11 09:53:08 +00:00
rabia23
955c64470e reset self-generation of certs according to course pacing 2017-06-11 09:48:29 +00:00
Ibrahim Ahmed
07dc1e6b20 Merge pull request #15248 from edx/ibrahimahmed443/LEARNER-1127 
Exclude hidden programs from white label course page and home page
 2017-06-10 03:41:09 +05:00
Brandon Baker
f4c9044d2e EDUCATOR-344 
Removed instances of track function
 2017-06-09 18:51:10 +00:00
Ibrahim
9995716899 Exclude hidden programs from white label course and homepage 
LEARNER-1126, LEARNER-1127
 2017-06-09 21:42:21 +05:00