Commit Graph

44824 Commits

Author SHA1 Message Date
John Eskew
5a71fa1e33 Allow inactive users to authenticate in Django 1.10+ 2018-01-26 14:04:19 -05:00
Troy Sankey
e649d2d782 Shim query count assertions due to added SAVEPOINTs 2018-01-25 11:38:46 -05:00
Troy Sankey
1deb26e190 avoid unnecessary attempt to update an immutable dict
request.data has become immutable under Django 1.11 for some reason.
Regardless, setting the 'id' key should be extraneous because we already
instruct the update method to use a specific pk (see kwargs) which
should be sufficient to locate the database record and update it.
2018-01-25 11:38:46 -05:00
John Eskew
27edca3c5e Replace all clean_course_id form methods with common method. 2018-01-25 11:38:46 -05:00
John Eskew
875a127f84 Pylint fixes to move number below allowed threshold. 2018-01-25 11:38:37 -05:00
John Eskew
b1f0b7d230 Convert course id to locator differently to accomodate Django 1.11 2018-01-25 11:33:52 -05:00
Troy Sankey
6d061a16c5 Enable cache isolation for test_email tests
Cache isolation is provided by
CacheIsolationMixin/CacheIsolationTestCase, and was enabled in these
tests in order to stop the 'site' variable in the edxmako template
context from bleeding into subsequent tests via the request cache.
2018-01-25 11:33:51 -05:00
John Eskew
ff545e2a60 Handle different cookie processing for Django 1.11 2018-01-25 11:33:51 -05:00
John Eskew
56f9efcc4c Create course mode in one line without extra save. 2018-01-25 11:33:51 -05:00
John Eskew
efbde03ce0 Move param addition for POST request to creation. 2018-01-25 11:33:51 -05:00
John Eskew
c55aa9e1d5 Change POST request upon creation only. 2018-01-25 11:33:44 -05:00
John Eskew
2eab707cc0 Change str conversion to text_type. 2018-01-25 11:23:31 -05:00
John Eskew
3915c47d71 Bump query counts for grading in Django 1.11. 2018-01-25 11:23:31 -05:00
sanfordstudent
fda773721c Merge pull request #17285 from edx/sstudent/hide_cert_setting
deprecate html setting for web certs and set to true by default
2018-01-24 16:27:40 -05:00
Sanford Student
e2becea8cb deprecate html setting for web certs and set to true by default 2018-01-24 15:02:44 -05:00
Michael Youngstrom
1a1e3b8a44 Merge pull request #17275 from edx/youngstrom/bokchoy_s3
Dont require creds to read from cache bucket
2018-01-24 14:55:42 -05:00
Brian Mesick
bffd906909 Merge pull request #17115 from edx/bmedx/django111_cms_test_failures
Fixes to CMS failures in Django 1.11 tests
2018-01-24 14:46:52 -05:00
Farhanah Sheets
0f90c62dcb Merge pull request #17298 from edx/fsheets/sfe-filter-fix
SFE Version bump
2018-01-24 13:59:34 -05:00
Jeremy Bowman
e139e83b79 Merge pull request #17269 from open-craft/kshitij/master_with_setuptools_fix
Upgrade setuptools to avoid bug that prevents OpenStack requirements install
2018-01-24 13:19:58 -05:00
Jeremy Bowman
96e05913d7 Merge pull request #17282 from edx/jmbowman/PLAT-1890
PLAT-1890 Fixed assorted ModifyingEnforceTypeWarning warnings
2018-01-24 13:17:45 -05:00
Jeremy Bowman
ebc54c8f1a PLAT-1890 Fixed assorted ModifyingEnforceTypeWarning warnings 2018-01-24 11:49:42 -05:00
Farhanah Sheets
d06a52f662 SFE version bump 2018-01-24 11:40:23 -05:00
bmedx
40951a28cf Fixing some violations to assuage pylint and get a bit of overhead 2018-01-24 11:26:43 -05:00
bmedx
1d45c85135 Refactor student login for readability and fix Django 1.11 issues 2018-01-24 11:26:43 -05:00
Harry Rein
2935578b9a Merge pull request #17294 from edx/HarryRein/a11y-footer-upgrade-div
Ensuring div and not button inside link tag for a11y.
2018-01-24 11:18:04 -05:00
Matthew Piatetsky
d716d7409c Merge pull request #17293 from edx/bundles_dashboard_fix
Bundles dashboard fix
2018-01-24 10:21:02 -05:00
Calen Pennington
69348d06d7 Merge pull request #17009 from cpennington/cms-login-factory-page
Convert cms login.html to the require_page pattern in preparation for…
2018-01-24 10:19:27 -05:00
Michael Frey
90bb8af3c6 Merge pull request #15618 from open-craft/bdero/failed-password-reset-email
Add optional password reset failure emails
2018-01-24 10:06:16 -05:00
Michael Frey
51499e2c4b Merge pull request #15921 from open-craft/haikuginger/advertised-start-date-courseware-detail-page
Show advertised start date on course details page
2018-01-24 10:04:57 -05:00
Harry Rein
98b8eaf27e Ensuring div and not button inside link tag for a11y. 2018-01-24 10:01:50 -05:00
Saleem Latif
ca3a6654cf Merge pull request #17232 from edx/saleem-latif/837
ENT-837: Fix styling of enterprise sidebar on registration page.
2018-01-24 16:11:04 +05:00
Saleem Latif
4ed64ee5d0 Fix styling of enterprise sidebar on registration page. 2018-01-24 14:28:04 +05:00
Tasawer Nawaz
4be097253e Merge pull request #17217 from edx/tasawer/learner-2437-update-learner-help-link-to-help-center
update help link in header
2018-01-24 13:10:16 +05:00
Kshitij Sobti
d8b236da87 Upgrade setuptools to avoid bug while installing of OpenStack requirements
RE: pypa/setuptools#951
2018-01-24 12:47:52 +05:30
Tasawer Nawaz
f16cfea801 update help link in header
LEARNER-2437
2018-01-24 11:53:06 +05:00
Michael Youngstrom
b23eea5fcb Allow public read and handle write errors for db cache 2018-01-23 21:46:56 -05:00
Matthew Piatetsky
955dc60a3f Merge pull request #17292 from edx/add_screenshots
Add screenshots
2018-01-23 19:49:24 -05:00
Matthew Piatetsky
8cf1e04781 Add screenshots 2018-01-23 17:51:03 -05:00
Matthew Piatetsky
eeb05406a0 fix list price on bundle button 2018-01-23 17:46:55 -05:00
Jae Bradley
6bfb9c9478 Merge pull request #17291 from edx/mobile-learner-analytics-modal
Make Learner Analytics Test Modal Mobile Responsive
2018-01-23 16:48:30 -05:00
Michael Roytman
8e667d8bdf Merge pull request #17287 from edx/mroytman/assets-api-zero-assets
mroytman/assets api zero assets
2018-01-23 16:16:43 -05:00
Calen Pennington
974f099835 Teach the xss_linter about the require_page tag 2018-01-23 15:58:12 -05:00
Jae Bradley
7fb4ca5ce1 Merge pull request #17284 from edx/jaebradley/LEARNER-3945
LEARNER-3945: Add try/catch in Learner Analytics View
2018-01-23 15:48:06 -05:00
jaebradley
a2cc48d37d fix mobile responsive modal
fix errors
2018-01-23 15:38:37 -05:00
Michael Roytman
97954d48fb add condition for when no assets are found in the database 2018-01-23 15:13:12 -05:00
bmedx
46cb89e55d Fixes to CMS failures in Django 1.11 tests 2018-01-23 14:11:06 -05:00
AlasdairSwan
b241e56f0f Merge pull request #17286 from edx/alasdair/LEARNER-3935-style-updates
LEARNER-3935 Style updates
2018-01-23 12:37:40 -05:00
AlasdairSwan
77d254dcad LEARNER-3935 Style updates 2018-01-23 11:28:06 -05:00
jaebradley
5ab2533b1e add try/catch for analytics api calls
add comment

update jsx comment

simplify try block and update comment

fix comment
2018-01-23 11:10:04 -05:00
Ari Rizzitano
a54b6d2dda Merge pull request #16680 from edx/ari/node-8
Upgrade Jenkins Node version to 8.9.3
2018-01-23 10:32:32 -05:00