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

50059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mushtaq Ali
d9a67496ff Add CSRF_TRUSTED_ORIGINS settings to successfully make POST requests from edx-learner-portal to edx-platform - ENT-2025 2019-06-19 16:04:24 +05:00
Bessie Steinberg
5414828c00 Merge pull request #20845 from edx/bessiesteinberg/bump-edx-enterprise-to-1.6.15 
Bump edx-enterprise to 1.6.15
 2019-06-18 17:00:55 -04:00
Feanil Patel
e4bb4b0959 Merge pull request #20823 from edx/renovate/npm-underscore.string-vulnerability 
Update dependency underscore.string to v3.3.5 [SECURITY]
 2019-06-18 15:44:06 -04:00
Bessie Steinberg
bb2ba6e2a3 Bump edx-enterprise to 1.6.15 2019-06-18 15:14:05 -04:00
Feanil Patel
11895b843f Run npm install with our version of node. 2019-06-18 14:39:49 -04:00
Calen Pennington
92d9a1f541 Merge pull request #20789 from cpennington/first-enroll-discount-strikeout 
Add strike-out price to LMS Course Home sidebar
 2019-06-18 13:02:15 -04:00
Calen Pennington
2901d5f810 Centralize the strike-out price formatting to make correct accessibility easier 2019-06-18 11:00:08 -04:00
Zainab Amir
f55407a48d Merge pull request #20734 from edx/zamir/LEARNER_6220_remove_remember_me_button 
Remove Remember me button from login page
 2019-06-18 17:57:09 +05:00
Zainab Amir
fa8aeb69d9 Remove Remember me button from login page 
Remember me button does the same thing regardless of if it is checked
or not. Remember me button being unchecked makes a user think they
will be logged out at the end of a browsing session when this is in
fact not the case

LEARNER-6220
 2019-06-18 17:30:37 +05:00
George Babey
7460ecd1b0 Merge pull request #20838 from edx/bexline/enterprise_version_bump 
Version bump for edx-enterprise
 2019-06-17 18:15:48 -04:00
Brittney Exline
52d03626e2 Version bump for edx-enterprise 2019-06-17 14:28:05 -06:00
Dave St.Germain
6014426d83 Merge pull request #20835 from edx/dcs/sgp-setting 
Added Staff Graded Points to CMS settings
 2019-06-17 16:13:11 -04:00
Calen Pennington
4152e16016 Install openedx.features.discounts in Studio so that it can be imported by student 2019-06-17 15:11:33 -04:00
Calen Pennington
f842717c49 Add strike-out price to LMS Course Home sock 2019-06-17 15:11:33 -04:00
Calen Pennington
26cb18b01d Fix test name typo 2019-06-17 15:11:33 -04:00
Calen Pennington
dc7daccfc8 Add strike-out price in LMS courseware 2019-06-17 15:11:33 -04:00
Calen Pennington
d2de618b20 Add strike-out price to LMS Course Home sidebar 2019-06-17 15:11:33 -04:00
Matt Hughes
023540c205 Merge pull request #20825 from edx/matthugs/draw-full-name-from-correct-place-fixing-instructor-dashboard-launch 
Backend-specific dashboard launches depend on the name field
 2019-06-17 11:57:36 -04:00
edX requirements bot
f56e2af599 Updating Python Requirements (#20834) 2019-06-17 11:48:57 -04:00
Matt Hughes
c5e7c71983 Backend-specific dashboard launches depend on the name field 
... being set and fail if there is none. We were drawing in this
information from the auth_user.first_name and .last_name fields, which
are deprecated on the edX platform.
 2019-06-17 11:11:03 -04:00
Jeremy Bowman
7b9a161875 Revert "Updating Bokchoy testing database cache (#20827)" (#20837) 
This reverts commit aef1986cac.
 2019-06-17 10:56:40 -04:00
edX cache uploader bot
aef1986cac Updating Bokchoy testing database cache (#20827) 2019-06-17 10:15:45 -04:00
Diana Huang
fbdbbf3863 Merge pull request #20782 from edx/diana/remove-microsite-commerce 
Remove microsites from commerce and theming.
 2019-06-17 10:14:48 -04:00
Dave St.Germain
8ebdfb4b74 Added Staff Graded Points to CMS settings 2019-06-17 09:17:54 -04:00
Zainab Amir
ef0d07d283 Merge pull request #20831 from edx/transifex-bot-update-translations2019-06-16 
fix(i18n): update translations
 2019-06-17 11:42:21 +05:00
George Babey
d799debf9f Merge pull request #20830 from edx/revert-ent-1.6.12 
Revert "Version bump for edx-enterprise"
 2019-06-16 20:21:41 -04:00
George Babey
c7484125b8 Revert "bump edx-enterprise to version 1.6.8" 
This reverts commit 375ccb7bf9.
 2019-06-16 17:08:35 -04:00
edX Transifex Bot
389702b9b6 fix(i18n): update translations 2019-06-16 20:52:17 +00:00
George Babey
fb0a4220a7 Revert "Version bump for edx-enterprise" 
This reverts commit bf88bca776.
 2019-06-16 15:22:09 -04:00
Bill DeRusha
a6d77ef74e Merge pull request #20822 from edx/bexline/enterprise_version_bump 
Version bump for edx-enterprise
 2019-06-14 16:56:51 -04:00
Brittney Exline
bf88bca776 Version bump for edx-enterprise 2019-06-14 13:57:01 -06:00
Diana Huang
0c7ad64350 Clean up theming tests and microsites. 2019-06-14 15:22:33 -04:00
Diana Huang
6604cf104e Remove more microsites code. 2019-06-14 15:22:32 -04:00
Diana Huang
fe3d33091f More test fixes. 2019-06-14 15:20:50 -04:00
Diana Huang
762f20385e Fix theming test helpers. 2019-06-14 15:20:50 -04:00
Diana Huang
f8c54212f4 Remove more microsites from theming. 2019-06-14 15:20:50 -04:00
Diana Huang
58a363e9d4 Remove microsites from commerce and theming. 2019-06-14 15:20:50 -04:00
Renovate Bot
31c7ac589e Update dependency underscore.string to v3.3.5 [SECURITY] 2019-06-14 17:48:49 +00:00
Jeremy Bowman
45e390d0ea Upgrade to edx-opaque-keys 1.0.1 (#20817) 2019-06-14 12:15:44 -04:00
Mike Dikan
dd4fbf7736 Merge pull request #20812 from edx/mdikan/update-cookie-banner 
Update Cookie Policy Banner
 2019-06-14 10:09:10 -04:00
Usama Sadiq
7373a021cc Merge pull request #20816 from edx/usama/prod-338-support-contact-us-form 
Support Contact Form Updated
 2019-06-14 18:52:18 +05:00
Andytr1
c25aee3329 Merge pull request #20776 from edx/mroytman/EDUCATOR-4355-add-student-key-to-gradebook 
add external_user_key to response and add ability to search by userna…
 2019-06-14 09:50:45 -04:00
Mike Dikan
51c690f75a Update Cookie Policy Banner 
DISCO-1067
 2019-06-14 09:47:26 -04:00
usama sadiq
44475b9efc Support Contact Form Updated 
- Changed the Subject text field to drop down.
- Added aditional text to guide learners to course forums.
 2019-06-14 18:22:14 +05:00
Michael Roytman
05c0510cd3 add external_user_key to response and add ability to search by username, email, or external user key 
Code review comments - EDUCATOR-4319

undoing changes temporarily

undoing changes temporarily

Fixed exception handling

re-added changes after hard reset

removed waffle flag (wrong merge

removed waffle flag (wrong merge
 2019-06-14 08:36:00 -04:00
atesker
dff3eec0d1 Merge branch 'master' of https://github.com/edx/edx-platform 2019-06-13 14:46:56 -04:00
Douglas Hall
fc88c55c76 Header logo should now redirect to learner dashboard. (#20815) 2019-06-13 11:07:08 -04:00
Zainab Amir
0978b0e533 Merge pull request #20813 from edx/transifex-bot-update-translations2019-06-13 
fix(i18n): update translations
 2019-06-13 14:29:46 +05:00
edX Transifex Bot
e6e3f1e3fa fix(i18n): update translations 2019-06-13 08:15:21 +00:00
edX Transifex Bot
ec691f3be5 geoip2: update maxmind geolite country database 2019-06-12 16:58:05 -04:00