Commit Graph

45584 Commits

Author SHA1 Message Date
sanfordstudent
028ad2ebd4 Merge pull request #17743 from edx/sstudent/EDUCATOR-2444
Show inline discussions by default
2018-03-29 09:26:12 -04:00
Awais Jibran
5ac5d9d532 Merge pull request #17796 from edx/aj/COURSE_LOADING_ERROR
Logging: Error getting the course from modulestore
2018-03-29 13:09:39 +05:00
Awais Jibran
52f66a8d9d Merge pull request #17795 from edx/aj/use-get-or-create-EDUCATOR-2549
Use get or create rather than create
2018-03-29 13:08:53 +05:00
Michael Roytman
c9c97e58c5 Merge pull request #17700 from edx/mroytman/studio-link-to-lms
Link to LMS from Studio footer
2018-03-28 16:14:28 -04:00
Douglas Hall
82038870aa Merge pull request #17808 from edx/douglashall/ENT-936
ENT-936 Allow TPA providers to be configured to not send a welcome email upon registration.
2018-03-28 15:39:15 -04:00
Sanford Student
0bfe9c8d94 remove showbydefault 2018-03-28 15:33:52 -04:00
Ned Batchelder
465427f454 Merge pull request #16297 from open-craft/cornwell/content-of-static-pages
Ability to set content of static pages via Site Configuration
2018-03-28 14:28:19 -04:00
Michael Roytman
a0ed8fa38d Add a link to the LMS from Studio footer. 2018-03-28 14:10:30 -04:00
McKenzie Welter
a3521b9ce1 Merge pull request #17758 from edx/McKenzieW/learner-4095
Enable mode-specific course entitlement policy
2018-03-28 14:04:40 -04:00
Douglas Hall
2ecbe19b29 ENT-936 Allow TPA providers to be configured to not send a welcome email upon registration. 2018-03-28 14:00:35 -04:00
McKenzie Welter
cc19e50590 add mode field to entitlement policy model and set custom policy on entitlement create 2018-03-28 12:53:20 -04:00
Michael Youngstrom
187bc401b2 Merge pull request #17809 from edx/youngstrom/update-lettuce-cache
Update lettuce db cache
2018-03-28 11:55:19 -04:00
Alex Dusenbery
26ba411eb0 EDUCATOR-2535 | Small style cleanup for course outline. 2018-03-28 10:42:20 -04:00
Awais Jibran
f840b8fdd6 Merge pull request #17811 from edx/aj/video-ie11-issue-fix
Fix IE11 not loading Video Uploads
2018-03-28 19:18:36 +05:00
Michael LoTurco
498c8915a6 Merge pull request #17814 from edx/MLoTurco/learner-3925-bug-fix
adjust bug-causing variable name
2018-03-28 08:55:44 -04:00
Michael LoTurco
45175494ed adjust bug-causing variable name 2018-03-28 08:42:59 -04:00
Awais Jibran
05a1d61f5c quality 2018-03-28 16:41:34 +05:00
Awais Jibran
5ac686bbb9 COURSE_LOADING_ERROR 2018-03-28 14:50:39 +05:00
Awais Jibran
a681d91b46 fix js issue with video uploads 2018-03-28 14:41:27 +05:00
Michael Youngstrom
6715f086d6 Update lettuce db cache 2018-03-27 21:42:20 -04:00
Eric Fischer
5540954dee Merge pull request #17801 from edx/efischer/sfe_1.6.2
Load studio-frontend language files
2018-03-27 16:15:23 -04:00
Tyler Hallada
04279bf5af Refer to new sfe file names in templates 2018-03-27 15:17:58 -04:00
Douglas Hall
ea18712fa9 Merge pull request #17802 from edx/douglashall/ENT-823
Upgrade edx-enterprise to 0.67.0.
2018-03-27 13:41:35 -04:00
Eric Fischer
022001e53d EDUCATOR-2584 2018-03-27 12:42:00 -04:00
Michael Youngstrom
dc5b75800d Merge pull request #17793 from edx/testeng/bokchoy_auto_cache_update_6c414680e89989ff8a53693971d2066bd3e00c8b
Bokchoy db cache update
2018-03-27 12:40:54 -04:00
Douglas Hall
5c1ab83c29 Upgrade edx-enterprise to 0.67.0.
https://github.com/edx/edx-enterprise/compare/0.66.1...0.67.0
2018-03-27 12:21:55 -04:00
edx-cache-uploader-bot
7f92409804 Updating migrations 2018-03-27 11:49:05 -04:00
hamzamunir7300
e30e12e83d Merge pull request #17797 from edx/LEARNER-4766
Footer Chinese Language Dupluication Issue
2018-03-27 19:34:03 +05:00
Hamza Munir
90f674e358 Footer Chinese Language Dupluication Issue
Removed the duplicate footer ICP LICENSE.

LEARNER-4766
2018-03-27 19:19:37 +05:00
Bill Filler
a77d7cad4f Merge pull request #17799 from edx/bfiller/bump-ora2-version
bump version of ora2 to 2.1.13
2018-03-27 10:18:28 -04:00
Bill Filler
1657697903 bump version of ora2 to 2.1.13 2018-03-27 10:08:56 -04:00
Noraiz Anwar
0d4c2707d0 Merge pull request #17780 from edx/noraiz/EDUCATOR-2546
use library summary to fetch metadata
2018-03-27 18:26:04 +05:00
Ahsan Ul Haq
952906ab35 Merge pull request #17781 from edx/ahsan/LEARNER-4520-pdf-cert-not-generate-discovery
Discovery for pdf cert generation
2018-03-27 18:00:07 +05:00
Ahsan Ul Haq
b8a7952762 Merge pull request #17633 from edx/ahsan/LEARNER-3552-Limit-LoginWithAccessTokenView-endpoint
update LoginWithAccessTokenView to only support DOT type accesstoken
2018-03-27 17:00:35 +05:00
Ahsan Ulhaq
ea9a679c27 small nit 2018-03-27 16:59:07 +05:00
noraiz-anwar
f18e0b881c use library summary to fetch metadata 2018-03-27 15:57:14 +05:00
Ahsan Ulhaq
7428b2fe94 Discovery for pdf cert generation
LEARNER-4520
2018-03-27 15:23:46 +05:00
Awais Jibran
16fda2322d Use get or create rather than create 2018-03-27 14:31:01 +05:00
Nimisha Asthagiri
e5b9452e76 Merge pull request #17385 from mitodl/hack18_instructor_django_plugin
Changed 'instructor' django app to follow plugin pattern
2018-03-26 15:20:47 -06:00
Michael Youngstrom
f3672ba215 Merge pull request #17792 from edx/revert-17697-vkaracic/watch_sass
Revert Watch assets on specific system
2018-03-26 17:20:00 -04:00
Michael Youngstrom
d4d9a113c1 Revert "Watch assets on specific system." 2018-03-26 16:07:54 -04:00
Michael Youngstrom
5b9b01b04d Merge pull request #17789 from edx/testeng/bokchoy_auto_cache_update_6cbfa1e7607b38f53e3f4ddb58d308850860d22c
Bokchoy db cache update
2018-03-26 16:06:35 -04:00
Alex Dusenbery
fb7efb7338 EDUCATOR-2582 | Inspect waffle switch model to find completion tracking date start. 2018-03-26 15:58:28 -04:00
Brittney Exline
1b4ac84141 Merge pull request #17788 from edx/bexline/verify_student_cleanup
ENT-934 Remove deprecated models in verify_student
2018-03-26 13:51:35 -06:00
Feanil Patel
4321acd2c0 Merge pull request #17784 from edx/feanil/update_newrelic_agent
Update newrelic agent.
2018-03-26 15:39:52 -04:00
edx-cache-uploader-bot
0dbaffa405 Updating migrations 2018-03-26 15:08:41 -04:00
Brian Beggs
6b9f52b224 Merge pull request #17697 from vkaracic/vkaracic/watch_sass
Watch assets on specific system.
2018-03-26 15:02:21 -04:00
Troy Sankey
fe9990608d Merge pull request #17782 from edx/pwnage101/improve-old-banner-appearance
move global status messages to the user notificatio area
2018-03-26 14:58:54 -04:00
Brittney Exline
956b627501 ENT-934 Remove deprecated models in verify_student
These models say they are to be fully removed in Hawthorn, so let's make it happen!
2018-03-26 14:48:34 -04:00
Michael LoTurco
a3fdf8827d Merge pull request #17785 from edx/MLoTurco/learner-3925-support-link
Adds entitlement tool to support tool home
2018-03-26 13:44:43 -04:00