Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
43,133 Commits 1 Branch 0 Tags
5cc73bc7fdcb112afde22bd6e9b58cfd90ca0aa7
Commit Graph

43133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Hallada
5cc73bc7fd Merge pull request #16276 from edx/thallada/ret-dedupe-upgrade-reminder 
Send only one upgrade reminder email per user per day
 2017-10-23 14:11:45 -04:00
Ned Batchelder
5940342f71 Merge pull request #16180 from caesar2164/shopping-cart-style-fixes 
Fix Shopping-cart CSS and JS
 2017-10-23 13:51:43 -04:00
Eric Fischer
9f3f3a501b Merge pull request #16111 from edx/dahlia/watch_studio-frontend 
Webpack studio frontend
 2017-10-23 13:17:55 -04:00
Sanford Student
fd8a9fdb02 EDUCATOR-1511: credit users added to verified user partition irrespective of upgrade deadline 2017-10-23 13:14:47 -04:00
Zubair Afzal
6e846fd938 Merge pull request #16291 from edx/zub/ENT-675-enterprise-version-bump-to-0.52.9 
bump enterprise version from 0.52.4 to 0.52.10
 2017-10-23 22:00:44 +05:00
Tyler Hallada
4ab477eaa7 Address Greg's comment 2017-10-23 11:59:27 -04:00
Eric Fischer
45a5e7853f Correctly install and load webpacked studio-frontend 2017-10-23 11:50:36 -04:00
zubair-arbi
dc20549c6d bump enterprise version from 0.52.4 to 0.52.10 
ENT-675
 2017-10-23 19:49:58 +05:00
Jillian Vogel
1b63bd9cd7 Merge pull request #16155 from open-craft/jill/enable_enterprise_integration 
Lets ENABLE_ENTERPRISE_INTEGRATION be configurable
 2017-10-23 20:09:43 +10:30
Harry Rein
160dba9505 Merge pull request #16210 from edx/HarryRein/responsive-header 
Adding a responsive, unified header to the LMS.
 2017-10-20 17:12:00 -04:00
Harry Rein
3d79e3e05d Adding unified, responsive header. 2017-10-20 16:24:31 -04:00
edx-pipeline-bot
d8620c952a Merge pull request #16296 from edx/release-mergeback-to-master 
Merge release back to master
 2017-10-20 14:52:24 -04:00
sanfordstudent
22f9530dec Merge pull request #16295 from edx/sstudent/EDUCATOR-1573 
EDUCATOR-1573, add waffle switch
 2017-10-20 13:58:01 -04:00
John Eskew
5946e91bcf Merge pull request #16292 from edx/jeskew/upgrade_django_simple_history_in_enterprise 
Upgrade django-simple-history and edx-enterprise together.
 2017-10-20 12:46:22 -04:00
John Eskew
ce37e6d77e Merge pull request #16286 from edx/jeskew/move_third_party_auth_startup_code 
Move third_party_auth settings code to ready method.
 2017-10-20 11:45:37 -04:00
John Eskew
5c03f6554d Upgrade django-simple-history and edx-enterprise together. 2017-10-20 11:42:08 -04:00
Jeremy Bowman
fcc619e419 Merge pull request #16288 from edx/jmbowman/PLAT-1542 
PLAT-1542 No callable queryset method arguments
 2017-10-20 11:41:05 -04:00
Sanford Student
1d6ca854f5 EDUCATOR-1573, add waffle switch 2017-10-20 11:39:03 -04:00
Eric Fischer
b541dfa3fd Revert "Merge pull request #16260 from edx/mulby/dynamic-deadline-upgrade-messaging" 
This reverts commit a13595352f, reversing
changes made to 68d5fe8922.
 2017-10-20 10:45:40 -04:00
Stu Young
c27c39301d Merge pull request #16257 from edx/estute/update-bokchoy-dbs 
update bokchoy dbs after migrations
 2017-10-20 09:41:00 -04:00
John Eskew
54441488dc Add comments to docstring forbidding additional code. 2017-10-20 07:59:32 -04:00
Waheed Ahmed
fa5da136aa Merge pull request #16258 from edx/waheed/LEARNER-2881-fix-edx-logo-link 
Fix edX logo links to home page instead of dashboard.
 2017-10-20 16:02:02 +05:00
Waheed Ahmed
c56f72878e Fix edX logo links to home page instead of dashboard. 
When you are on the Dashboard, or on any page in courseware, the logo
in the Header links to dashboard and the logo in the footer links
to edX home page.

LEARNER-2881
 2017-10-20 14:49:06 +05:00
Jeremy Bowman
d4ce82a4f9 PLAT-1542 No callable queryset method arguments 2017-10-19 18:06:26 -04:00
Nimisha Asthagiri
41862cf163 Merge pull request #16035 from proversity-org/proverity/NVN-enrollment-search-instructor-dashboard-fix 
FIX: course enrollment search, FIX: hidden tabs on instructor dashboard
 2017-10-19 17:50:06 -04:00
Andy Armstrong
e2612bdccf Merge pull request #16249 from edx/andya/responsive-discussions 
Make the discussion board responsive
 2017-10-19 17:09:47 -04:00
Tyler Hallada
89e7404955 Add copy preceding course list in upgrade reminder 2017-10-19 16:51:07 -04:00
Ayub khan
9c1d2b6bfa Merge pull request #16226 from edx/LEARNER-717 
LEARNER-717 Added logs for discovery
 2017-10-20 01:35:34 +05:00
John Eskew
a6757e47a4 Move third_party_auth settings code to ready method. 2017-10-19 16:17:31 -04:00
Andy Armstrong
b85b7dad72 Disable Bok Choy tests that are failing on Jenkins 2017-10-19 16:15:21 -04:00
Bill Filler
dc99968c4a Merge pull request #16277 from edx/bfiller/WL-1279 
Pass course name to data sharing consent declined template
 2017-10-19 15:53:17 -04:00
Bill Filler
9ed51381f3 Pass course name to template 
WL-1279
 2017-10-19 15:51:39 -04:00
ayub-khan
a71fd68673 Added user logs for save bearer token 
Purpose of those logs is to get more information
about deadlocks coming on prod when we revoke already
existing refresh tokens.

LEARNER-717
 2017-10-20 00:26:18 +05:00
Ayub khan
c739f59ea9 Merge pull request #16284 from edx/you/update_translations 
Update translations (autogenerated message)
 2017-10-20 00:15:55 +05:00
Stuart Young
a9ea168ce9 update bokchoy dbs after migrations 2017-10-19 15:01:13 -04:00
Sven Marnach
b754ad59ca Unconditionally include the wrapper div for the visibility message. 2017-10-19 14:24:58 -04:00
Sven Marnach
4837b6eb65 Link "Topic Area" dropdown to the visibility message via aria-describedby. 2017-10-19 14:24:58 -04:00
Douglas Cerna
49a13216a4 Fixed JS tests 2017-10-19 14:24:58 -04:00
Douglas Cerna
68714d9e97 Fixed quality errors 2017-10-19 14:24:58 -04:00
Douglas Cerna
94bea7a707 Cherry picked Adolfo's commits and addressed Braden's observations 2017-10-19 14:24:58 -04:00
ayub-khan
3032de0251 Update translations (autogenerated message) 2017-10-19 23:18:25 +05:00
Andy Armstrong
d18022bb5d Make the discussion board responsive 
LEARNER-1923
 2017-10-19 14:09:22 -04:00
Brittney Exline
40f37608fa Merge pull request #16265 from edx/bexline/data_passback 
ENT-594 Enterprise version bump and Add settings variable for ENTERPRISE_REPORTING_SECRET
 2017-10-19 14:01:28 -04:00
Gabe Mulley
a13595352f Merge pull request #16260 from edx/mulby/dynamic-deadline-upgrade-messaging 
Change upgrade deadline messaging
 2017-10-19 13:16:35 -04:00
Brittney Exline
23640d0019 ENT-594 Enterprise version bump and Add settings variable for ENTERPRISE_REPORTING_SECRET 2017-10-19 12:24:05 -04:00
Tyler Hallada
de072f8d24 Update upgrade_reminder template for multi-course 2017-10-19 11:57:41 -04:00
Tyler Hallada
9724843327 Group by user in the upgrade_reminder task 2017-10-19 11:57:40 -04:00
Gabe Mulley
dafeca5770 Change upgrade deadline messaging 2017-10-19 10:59:44 -04:00
David Ormsbee
68d5fe8922 Merge pull request #16264 from edx/ormsbee/section_summaries2 
Separate SectionDescriptor and add summary field.
 2017-10-19 09:46:16 -04:00
Matt Tuchfarber
b5ddcb3950 Merge pull request #16263 from edx/tuchfarber/program_marketing_fix 
Fix program marketing page when it doesn't have a video.
 2017-10-19 09:18:48 -04:00