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

44817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
AlasdairSwan
1b11f055a4 Merge pull request #17283 from edx/alasdair/LEARNER-3935-learner-analytics-dashboard-tweaks 
LEARNER-3935 Last minute updates
 2018-01-23 10:30:20 -05:00
Jae Bradley
407bc5ff2b Merge pull request #17256 from edx/add-passing-grade-to-learner-analytics 
LEARNER-3922: Add Grade Information
 2018-01-23 09:59:54 -05:00
adeel khan
0bff520dcf Merge pull request #17272 from edx/adeel/learner_3930_improving_html_escaping_filter 
strip_all_tags_but_br_filter would return HTML safe string.
 2018-01-23 15:26:46 +01:00
AlasdairSwan
8be1079186 Last minute updates 2018-01-23 09:14:33 -05:00
jaebradley
d52aa8c6ec add grade information 
remove console

remove whitespace

update logic

remove console statement
 2018-01-23 08:41:12 -05:00
Michael Frey
47272087cf Merge pull request #17247 from caesar2164/problem-loading-spinner 
Add FA loading spinner to each problem
 2018-01-23 08:24:58 -05:00
Eric Fischer
097e000a24 Merge pull request #16191 from proversity-org/proversity/course-visibility-in-catalog 
add DEFAULT_COURSE_VISIBILITY_IN_CATALOG flag
 2018-01-23 08:10:25 -05:00