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

1388 Commits

Author SHA1 Message Date
Clinton Blackburn
9efa7770f8 Resolved multi-tenant program issues 
A site must be passed so the system knows which URL to use to contact
the Discovery Service.
 2017-07-25 19:37:14 +05:00
Harry Rein
b523ac3f91 Merge pull request #15589 from edx/HarryRein/LEARNER-1894-in-course-messaging-xsy 
Adding in-course messages on the home page.
 2017-07-24 16:06:52 -04:00
Andy Armstrong
d5fca9ee19 Merge pull request #15642 from edx/andya/studio-bootstrap-theme 
Add basic Bootstrap theme to Studio
 2017-07-24 15:25:04 -04:00
Harry Rein
08df53e110 Adding in course messaging to the home page. 
LEARNER-1894

This commit adds in course messaging for three use cases. First,
when the user is not signed in, the user is shown a message that
provides a link to sign in or register. If the user is signed in
but not enrolled, they are given a link to do so. If the user is
enrolled but the course has not yet started, they are shown a
message explaining when the course starts and shown a link (not
yet enabled) to add a reminder to their calendar.

The implementation defines a base message class and extends it
for the course home messages as well as the previously implemented
page level messages.
 2017-07-24 15:17:12 -04:00
Andy Armstrong
95e47ddb02 Add basic Bootstrap theme to Studio 
LEARNER-1982
 2017-07-24 10:43:18 -04:00
Jesse Shapiro
91752ad98a Merge pull request #15624 from open-craft/haikuginger/remove-sso-consent 
[ENT-491] Remove SSO consent features; verify fully-populated consent URL generation
 2017-07-24 07:43:16 -04:00
Jesse Shapiro
fa9c09f9fe Remove Enterprise SSO hooks 2017-07-21 18:24:09 -04:00
Afzal Wali Naushahi
17d5386046 Merge pull request #15632 from edx/afzaledx/clear_cached_programs 
Clearing the cache if the site's configuration was removed.
 2017-07-21 21:23:18 +05:00
Afzal Wali
e82053ee43 Clearing the cache if the site's configuration was removed. 
The site's configuration does not contain the API URL, it should not keep on displayed the old cached list of uuids.
LEARNER-1146
 2017-07-21 18:25:19 +05:00
Brittney Exline
6439020815 ENT-550 Display only TOS for enterprise's configured to skip registration 
We have recently discovered that for any SSO Provider configured to skip
the registration form, we were auto checking the terms of service box,
which is a legal faux pas. Since IBM is planning to launch imminently and
is depending on this feature, we need to remedy this situation for enterprises
whose SSO Provider is configured to skip registration.

This PR hides all of the registration fields except TOS for this scenario
and disables the autoSubmit functionality that typically happens when skipping
registration.
 2017-07-20 12:53:20 -04:00
George Song
141c0af0eb Merge pull request #15586 from jspayd/hide-passwords-upstream 
Hide passwords in crash reports
 2017-07-20 08:59:12 -07:00
Awais Jibran
125552f204 Switching course view to specific student retains the profile language setting 
https://openedx.atlassian.net/browse/EDUCATOR-891
 2017-07-19 16:48:18 +05:00
Gregory Martin
7799c4adf4 Merge pull request #15592 from edx/yro-cert-pacing-signal 
Course/Certificates Pacing Signal Registration
 2017-07-18 15:36:39 -04:00
sanfordstudent
07ad189b9d Merge pull request #15263 from edx/sstudent/grade-override 
Learner grade override
 2017-07-18 14:33:27 -04:00
Sanford Student
932776159c EDUCATOR-165 instructor task and UI for overriding learner grades. 2017-07-18 13:51:56 -04:00
Gregory Martin
16945cc310 greening tests 2017-07-18 13:31:49 -04:00
Gregory Martin
8b3f285d04 fix tests 2017-07-18 11:13:01 -04:00
Joshua Spayd
97d5e3d8e0 Remove password hiding test code 2017-07-17 22:52:15 +00:00
Joshua Spayd
433477abe4 Hide passwords in register/login crash reports 
Includes code for testing to be removed in the next commit.
 2017-07-17 22:45:35 +00:00
Gregory Martin
e2c8fc53e8 add persistence 2017-07-17 17:57:30 -04:00
Gregory Martin
a82b73ed0c fix 2017-07-17 17:08:17 -04:00
Gregory Martin
7df91841ee cleanup 2017-07-17 15:44:29 -04:00
Andy Armstrong
a077a5e364 Add support for page banner status messages 
LEARNER-1890
 2017-07-17 12:17:32 -04:00
John Eskew
febf2a07ae Merge pull request #15373 from edx/jeskew/drf_upgrade_django_1.11 
Bump DRF version to 3.6.3 for eventual Django 1.11 compatibility.
 2017-07-17 11:19:56 -04:00
Robert Raposa
db16ec2a04 Merge pull request #15577 from edx/robrap/LEARNER-1896-fix-waffle-flag-cache 
Fix course override caching bug.
 2017-07-14 18:33:54 -04:00
George Song
a45ae04e8b Merge pull request #15006 from open-craft/bdero/bulk-enroll 
Upstream the Bulk Enroll API endpoint
 2017-07-14 14:20:23 -07:00
Robert Raposa
7e8566b4d8 Fix course override caching bug. 
LEARNER-1896
 2017-07-14 16:45:27 -04:00
John Eskew
2cd62c7bfb Upgrade django-rest-framework version to edX fork, which is DRF v3.6.3 
with a custom patch needed by edx-platform.
Upgrade django-filter as well to v1.0.4
Import DjangoFilterBackend from the correct module - django_filter.
Add django-filter to INSTALLED_APPS.
 2017-07-14 16:05:13 -04:00
Andy Armstrong
0c72a62ad8 Merge pull request #15556 from edx/andya/pre-start-date-access 
Enable conditional pre-start-date access to courses
 2017-07-14 15:46:25 -04:00
Gregory Martin
921950d7eb update 2017-07-14 15:12:51 -04:00
Brandon DeRosier
a31855c935 Upstream the Bulk Enroll API endpoint 2017-07-14 14:01:16 -04:00
Andy Armstrong
aeecf34387 Enable conditional pre-start-date access to courses 
LEARNER-1854
 2017-07-14 14:00:48 -04:00
Gregory Martin
214018dfee Merge pull request #15572 from edx/yro/repair_signal_config 
Repair signal config, certs
 2017-07-14 13:20:34 -04:00
Gregory Martin
6fd51467c9 repair signal config 2017-07-14 12:14:53 -04:00
Matthew Piatetsky
de3c802700 Do not count programs with no courses as completed 
LEARNER-1143
 2017-07-13 14:57:47 -04:00
Vedran Karačić
2ffabe6333 Merge pull request #15539 from edx/vkaracic/update-settings 
Add COURSE_CATALOG_API_URL settings value to devstack_docker
 2017-07-13 06:51:56 +02:00
Kevin Falcone
039afc2517 Merge pull request #15534 from edx/jibsheet/quiet-requests-logging 
Limit requests urllib3 logging to quiet log spam
 2017-07-12 12:49:18 -04:00
Vedran Karacic
beba07efd4 Fix string formatting. 2017-07-12 11:14:06 +02:00
rabiaiftikhar
6e873a4838 EDUCATOR-810 fix UnicodeDecodeError 2017-07-12 07:28:46 +00:00
Kevin Falcone
ee5b8db538 This logs for every API call to an external service 
It accounts for a large chunk of our splunk logs and is often
repetitive.  See forums connections which on a sandbox do:

```
Starting new HTTP connection (1): localhost
```
and
```
comment_client_request_log: request_id=06ac65d3-61b9-4882-9edb-c6b65709318a, method=get, url=http://localhost:18080/api/v1/users/5, duration=0.0101051330566
```

Add this for any other IDA call.
 2017-07-11 16:42:16 -04:00
Anthony Mangano
398fd19ba5 Merge pull request #15502 from edx/LEARNER-1298-LEARNER-1299-send-ui-lang-to-sailthru 
Set ui_lang in Sailthru when creating and updating users
 2017-07-11 14:35:06 -04:00
Alex Dusenbery
6dfa47b2fc EDUCATOR-565 | Add POLICY_CHANGE_GRADES_ROUTING_KEY, fix errors in compute_all_grades_for_course circuitry. 2017-07-11 14:01:38 -04:00
Anthony Mangano
4f4f25b432 Set ui_lang in Sailthru when creating and updating users 2017-07-11 11:27:01 -04:00
Andy Armstrong
a815003b3b Handle anonymous and unenrolled users on the new course home page 
LEARNER-1696
 2017-07-10 17:52:28 -04:00
David Ormsbee
4fb972432a Merge pull request #15506 from edx/ormsbee/fix_inline_discussions_asset_caching 
Fix inline discussions to use cached static assets.
 2017-07-09 22:42:33 -04:00
David Ormsbee
978e9fe656 Fix inline discussions to use cached static assets. 
In production environments, the DiscussionXBlock was generating CSS and
JS asset URLs that pointed to the unminified versions of those bundled
assets. Due to our nginx rules, this would cause the assets to be
served without the long expiration times, forcing the user's browser to
constantly refetch these assets while browsing a course.

[PERF-431]
 2017-07-07 17:22:52 -04:00
Gregory Martin
16f06bf651 Generate eligible certificates on learner track change 2017-07-07 16:04:05 -04:00
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