Commit Graph

44462 Commits

Author SHA1 Message Date
Robert Raposa
22c8e4c6ad Redirect Course Home for course that hasn't started.
Includes the following:
- Move the redirect logic for before course that hasn't started to
share between Course Info and Course Home.
- Add audit comments for Course Info vs Course Home
- Other minor clean-up.

LEARNER-613
2017-07-14 01:47:32 -04:00
Joshua Spayd
4b733b5657 Fix video caption centering
Fixes super off-center captions for full screen video with captions on
and transcripts off. Perfects caption centering in general, which was
before a bit off.

Leveraging pre-existing .closed class.
2017-07-13 21:30:38 +00:00
Diana Huang
13e06a37a3 Merge pull request #15560 from edx/diana/deprecate-setting
Deprecate the Course Home Sidebar setting.
2017-07-13 17:11:11 -04:00
Harry Rein
3dbe04811a Merge pull request #15518 from edx/HarryRein/updating-bootstrap-theming
Harry rein/updating bootstrap theming
2017-07-13 16:56:28 -04:00
Alex Dusenbery
a0da9b895c Turn down course_grade_factory.py logging. 2017-07-13 15:48:31 -04:00
Brian Mesick
b63e5fa098 Merge pull request #15559 from edx/bmedx/pyinotify_for_dev
Add pyinotify to development requirements for docker devstack perf
2017-07-13 15:42:14 -04:00
Harry Rein
6d89cc1bd1 Updating themes for bootstrap.
LEARNER-1785

This story was to update the existing custom themes to work with the flexible bootstrap design. It also updates the red theme to more closely resemble the real implementation on openedx.
2017-07-13 15:25:40 -04:00
Matthew Piatetsky
de3c802700 Do not count programs with no courses as completed
LEARNER-1143
2017-07-13 14:57:47 -04:00
Diana Huang
6f24c5a234 Deprecate the Course Home Sidebar setting. 2017-07-13 14:09:26 -04:00
Po Tsui
52197fba88 Add TODO for duplicate email/username inconsistency
The function `create_account_with_params` calls `_do_create_account`,
which exhibits some discrepant behavior with throwing errors when handling
duplicate email and/or username.

A duplicate email raises a `ValidationError` (rather than the expected
`AccountValidationError`) from the first part of `_do_create_account`,
when errors from `form` (the `AccountCreationForm`) are raised.

A duplicate username raises the expected `AccountValidationError`, but
from a later part of `_do_create_account`. As a result, registering with
both duplicate username and email raises a `ValidationError` for email only.

The user message for username is “An account with the Public Username
'{username}' already exists.” which differs from that of email, “It
looks like {email} belongs to an existing account. Try again with a
different email." The latter is more consistent with other user messages.
2017-07-13 11:08:15 -07:00
bmedx
8d184480ea Update comment in development.txt to be more correct 2017-07-13 13:09:28 -04:00
bmedx
390ba5c86c Add pyinotify to development requirements for docker devstack perf
Django can use pyinotify for watching files in runserver which should
save a lot of CPU work in docker.
2017-07-13 12:40:59 -04:00
Christina Roberts
cdd0e945bd Merge pull request #15551 from edx/christina/update-organizations
Update version of edx-organizations.
2017-07-13 10:13:43 -04:00
Simon Chen
be3c29b006 Merge pull request #15550 from edx/LEARNER-683
Allow enrollment into expired seats if the api is called by ECOM service
2017-07-13 09:04:08 -04:00
George Song
06c9826904 Merge pull request #14845 from Salomari1987/salah/password_reset_email_subject
Use platform_name instead of site_name in password reset email
2017-07-13 05:52:21 -07: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
Po Tsui
af96ad260f Add tests for duplicate email/username error catching
Test all errors raised by account creation function as a result of
duplicate email/username will be caught, if the user somehow managed to
pass the first check, `check_account_exists`.
2017-07-12 17:03:20 -07:00
Albert (AJ) St. Aubin
c78b84ca3f Merge pull request #15480 from edx/staubina/ed-592
Staubina/ed 592
2017-07-12 17:24:53 -04:00
George Song
1f6a4f22d1 Merge pull request #15549 from edx/george/git-import-sysadmin
Disable Git Import view for professor's who are not staff
2017-07-12 13:20:15 -07:00
Simon Chen
a3d511926f Allow enrollment into expired seats if the api is called by ecom service 2017-07-12 16:04:52 -04:00
bmedx
6b7d0a7f1b Upgrade djangorestframework-jwt to 1.11.0
- PLAT-1586
2017-07-12 15:49:18 -04:00
edx-pipeline-bot
0e9f5b3d24 Merge pull request #15553 from edx/release-mergeback-to-master
Merge release back to master
2017-07-12 15:39:36 -04:00
cahrens
c1cebb1674 Update version of edx-organizations.
EDUCATOR-772
2017-07-12 14:32:56 -04:00
George Song
59794ea9c9 Merge pull request #15338 from ravi-ojha/educator_269
Fix EDUCATOR-269: Don't show "Issue Open Badges" if the feature is disabled
2017-07-12 10:50:55 -07:00
mrey
d682802f58 Disable view of Git Import when user is professor of course but not staff user
Reason: Before this fix, if the user is not staff (user.is_staff=0) and ENABLE_SYSADMIN_DASHBOARD=True
happens that the user can access the Git Import in Sysadmin dashboard and get to see the links in the menu
of the sysadmin dashboard (Users, Courses, Staffing and enrollment). When this user clicks on one of
these links, it gets an error from the server.
2017-07-12 10:36:35 -07:00
Joel Barciauskas
72c9d58ae1 Merge pull request #14899 from edx/jbarciauskas/import-rest-api-2
Create REST API for importing a course
2017-07-12 13:02:30 -04:00
Christina Roberts
04f9db20c0 Merge pull request #15533 from edx/christina/remove-mustache
Remove last Mustache usage.
2017-07-12 12:58:21 -04:00
Alex Dusenbery
6919fc8ce8 Use kwargs right. 2017-07-12 12:51:42 -04:00
Albert St. Aubin
b8b0110d15 Ui updates, Error messaging shown when discussion scheme is not selected 2017-07-12 12:49:54 -04: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
Diana Huang
267968b029 Merge pull request #15542 from edx/diana/update-naming
Update names to be more consistent.
2017-07-12 12:27:33 -04:00
cahrens
bddc29a850 Remove last Mustache usage. 2017-07-12 12:08:59 -04:00
Joel Barciauskas
01db7a7d74 Add course import REST API to Studio 2017-07-12 11:48:35 -04:00
Brian Mesick
fdaf1b4c9a Merge pull request #15472 from edx/bmedx/django_1.11_upgrade_help_tokens_PLAT-1441
Upgrade help-tokens to 1.0.3
2017-07-12 11:14:10 -04:00
Brian Mesick
ef0e15af74 Merge pull request #15439 from edx/bmedx/django_1.11_upgrade_crum_PLAT-1478
Upgrade django-crum to 0.7.2
2017-07-12 11:13:49 -04:00
Diana Huang
fc9737581e Update names to be more consistent.
LEARNER-1669
2017-07-12 10:55:31 -04:00
Matt Tuchfarber
3be1da942d Center password reset page
The screen the set a new password after a reset is currently misaligned
on prod. It's pushed to the left side due to an inline-block display
property. Changed to block and fixed margins.
2017-07-12 10:38:33 -04:00
Michael Roytman
9c7043c226 Merge pull request #15532 from edx/mroytman/PLAT_1487_django_1.11_upgrade_edx-django-sites-extensions
upgrade edx-django-sites-extensions from 2.1.1 to 2.3.0
2017-07-12 10:35:13 -04:00
Jeremy Bowman
da32c5af56 Merge pull request #15531 from edx/jmbowman/PLAT-1629
PLAT-1629 Retry abspath() failures
2017-07-12 10:24:20 -04:00
M. Rehan
c3e1d59237 Merge pull request #15528 from edx/mrehan/fix-noisy-ajax-captions
Dont fetch captions while fetching translations
2017-07-12 18:24:11 +05:00
Ibrahim Ahmed
d8133c3aa1 Merge pull request #15523 from edx/ibrahimahmed443/WL-1079-minor-styling-issues
fix styling issues in program details page
2017-07-12 18:14:48 +05:00
Vedran Karacic
3916759ded Add COURSE_CATALOG_API_URL setting to devstack_docker.
LEARNER-1115
2017-07-12 13:48:47 +02:00
Qubad786
c9bbc0b68a Dont fetch caption on getting translations
This fixes the endless loop of fetchCaptions ajax requests. fetchCaption on error calls fetchAvailableTranslations which again calls fetchCaption on success and so on. We don't see any significance for calling fetchCaption in fetchAvailableTranslations.
2017-07-12 16:45:17 +05:00
Vedran Karacic
beba07efd4 Fix string formatting. 2017-07-12 11:14:06 +02:00
Rabia Iftikhar
aee1b7f412 Merge pull request #15510 from edx/ri/EDUCATOR-810-unicode-decode-error
EDUCATOR-810 fix UnicodeDecodeError
2017-07-12 14:13:54 +05:00
rabiaiftikhar
6e873a4838 EDUCATOR-810 fix UnicodeDecodeError 2017-07-12 07:28:46 +00:00
Po Tsui
dd5e8d072c Fix PEP8 issues 2017-07-11 17:47:40 -07:00
Po Tsui
a807aa041e Add myself to authors 2017-07-11 16:28:16 -07:00
Ari Rizzitano
6ea2ed929b upgrade jenkins node version to 6.11.1 2017-07-11 18:08:27 -04:00
Nishant Karandikar
6e617fe2a6 Catch exception with duplicate username/email
Previously, there was no catch for the AccountValidationError
exception raised by the account creation function. If, for some
reason, the user made it past the first check for a duplicate
username/email, then the exception was raised, uncaught, and
crashed the server.
2017-07-11 14:20:44 -07:00