Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

9424 Commits

Author SHA1 Message Date
Eric Fischer
37241b30a9 Better handling of proctoring help URL 2017-08-23 14:54:12 -04:00
Sanford Student
d0b2787f24 TNL-1230: cert available date hidden in self paced 2017-08-23 13:58:48 -04:00
Ned Batchelder
fee0c41ce0 XBlock fields with formatted-in values can now translate properly 2017-08-19 15:37:12 -04:00
Andy Armstrong
82f7d6ee64 Convert /update_lang/ page to use Bootstrap 
LEARNER-1922
 2017-08-18 16:15:38 -04:00
Jesse Shapiro
7a31441ebc Move to new consent API 2017-08-16 22:58:09 -04:00
Jeremy Bowman
1f06604694 PLAT-1710 Support lettuce tests in Docker Devstack 2017-08-16 17:30:18 -04:00
Kevin Falcone
c2175423fe BOOK_URL hasn't been used since the 6.00 courses 
RSS_TIMEOUT was removed in e8ee29786f
but missed in lms/envs
 2017-08-16 15:04:02 -04:00
Brian Beggs
f451c7602e Enable forums for docker devstack 2017-08-15 15:05:11 -04:00
Ned Batchelder
c9e8fc371c Merge pull request #15807 from edx/nedbat/translate-two-strings 
Two labels were untranslated, fixed.
 2017-08-14 13:36:13 -04:00
Ned Batchelder
6e9ac07710 Merge pull request #15805 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-08-14 12:52:43 -04:00
Ned Batchelder
c75c742b83 Two labels were untranslated, fixed. 2017-08-14 12:03:40 -04:00
Ned Batchelder
408d6b5e0c Update translations (autogenerated message) 2017-08-14 11:32:28 -04:00
cahrens
819a56fee3 Remove usages of deprecated SlashSeparatedCourseKey. 2017-08-14 11:01:00 -04:00
cahrens
6446f6111e Log courses with improper end dates. 
EDUCATOR-1134
 2017-08-11 14:37:16 -04:00
edx-pipeline-bot
dc2f808f60 Merge pull request #15797 from edx/release-mergeback-to-master 
Merge release back to master
 2017-08-11 13:20:28 -04:00
Brian Mesick
e14cad4532 Merge pull request #15784 from edx/bmedx/app_label_warnings_PLAT-1642_PLAT-1643 
Reorder INSTALLED_APPS
 2017-08-11 13:10:30 -04:00
cahrens
b22f35b71d Disable ENABLE_SEPARATE_ARCHIVED_COURSES due to server error. 
EDUCATOR-1134
 2017-08-10 13:58:41 -04:00
bmedx
62f1790999 Fix several RemovedInDjango19Warning by re-ordering INSTALLED_APPS 
- PLAT-1642
- PLAT-1643
 2017-08-10 13:54:28 -04:00
Muhammad Ammar
ac78d4d802 Merge pull request #15688 from edx/ammar/update-video-uploads-page 
update video uploads page
 2017-08-10 11:35:56 +05:00
muhammad-ammar
712e63bb08 update video uploads page 
EDUCATOR-1037
 2017-08-10 10:22:55 +05:00
Christina Roberts
5e81eb5bf0 Merge pull request #15390 from edx/christina/first-react 
Convert Studio course and library dashboard lists to React.
 2017-08-09 16:49:19 -04:00
cahrens
e1e57b5d09 Convert course list to React. 
EDUCATOR-625, AC-620
 2017-08-09 15:09:37 -04:00
sarahkf
679bd2c6a6 Merge pull request #15743 from edx/sarahkf/proctor-review-rules 
Adding link to proctor review rules in Studio
 2017-08-09 15:06:57 -04:00
Jesse Shapiro
f0c685307c Merge pull request #15739 from open-craft/haikuginger/configure-sap-sf-sso-user-fields 
[ENT-538] Configure country field for SAP SuccessFactors IdP
 2017-08-09 13:57:01 -04:00
Jesse Shapiro
700e8053db Generalize support for user fields from SAP SuccessFactors SSO providers 2017-08-09 13:07:00 -04:00
Sarah Fischmann
2511c9fad6 Adding link to proctor review rules in Studio 
Allows instructors to see a link to the online proctoring review rules documentation while configuring and exam to be a proctored exam. Also updates the GitHub requirements to point to the newest 0.19.0 release of edx-proctoring.

EDUCATOR-757
 2017-08-09 12:48:02 -04:00
Brian Mesick
7f32e03dd2 Merge pull request #15766 from edx/bmedx/ratelimit_upgrade_PLAT-1633 
Upgrade django-ratelimit-backend to Django 1.11
 2017-08-09 10:59:24 -04:00
Aamish Baloch
941605cc7e Merge pull request #15728 from edx/aamishbaloch/YONK-725 
YONK-725: PARENTAL_CONSENT_AGE_LIMIT set to be configurable
 2017-08-09 11:57:52 +05:00
bmedx
973d26f4b6 Make autodiscover the same across CMS/LMS 2017-08-08 11:21:51 -04:00
bmedx
45d6f97e63 Clean up autodiscover 2017-08-08 10:28:27 -04:00
Christina Roberts
4f5b033c27 Merge pull request #15750 from edx/christina/slash-the-slash 
Remove SlashSeparatedCourseKey from tests
 2017-08-07 15:53:08 -04:00
bmedx
d91a634d4b Set up correct admin urls in CMS 2017-08-07 15:34:50 -04:00
bmedx
48e6e552f2 PLAT-1633: Upgrade django-ratelimit-backend to 1.1.1 2017-08-07 15:34:21 -04:00
cahrens
6f71706b17 Remove SlashSeparatedCourseKey from tests. 2017-08-07 14:49:30 -04:00
Steven Zheng
d04c03e67c Add advanced settings to generate_courses command 2017-08-04 15:28:59 -04:00
Brian Beggs
7b54cf5603 Modify COMMENTS_SERVICE_URL for bokchoy docker settings 2017-08-04 15:17:01 -04:00
Michael Roytman
0dddf9eb1a Merge pull request #15660 from edx/mroytman/PLAT_1495_django_1.11_upgrade_django-debug-toolbar 
update django-debug-toolbar from 1.5 to 1.8
 2017-08-03 10:10:34 -04:00
Aamish Baloch
6f3ef7c9c9 YONK-725: PARENTAL_CONSENT_AGE_LIMIT set to be configurable 2017-08-03 14:28:56 +05:00
Aamish Baloch
ac84fd39b6 PROFILE_IMAGE_SIZES_MAP grouped with the similar settings 2017-08-03 12:30:52 +05:00
Michael Roytman
54f4a9dee1 remove is_ajax condition and JQUERY initialization from lms/cms devstack env files 
Please enter the commit message for your changes. Lines starting
 2017-08-02 15:12:13 -04:00
Alex Dusenbery
55d41bdc60 EDUCATOR-1072 | Don't validate certificate_available_date field just yet. 2017-08-02 13:31:18 -04:00
Michael Youngstrom
77acdac75a Update number SQL queries 2017-08-02 11:42:50 -04:00
Jillian Vogel
d0cfa7fa5a Merge pull request #15431 from open-craft/jill/studio-filter-archived-courses 
Separate Archived courses into a separate list in Studio
 2017-08-02 10:42:09 +09:30
Ned Batchelder
555d251472 Update translations (autogenerated message) 2017-08-01 21:27:56 +00:00
sanfordstudent
903bb6ab3f Merge pull request #15682 from edx/sstudent/cms_cert_date 
add cert available date to CMS settings
 2017-08-01 13:23:32 -04:00
Sanford Student
bf7b3eab1a add cert available date to CMS settings 2017-08-01 10:44:42 -04:00
John Eskew
19a5aa7d44 Merge pull request #15684 from edx/jeskew/enable_django_debug_toolbar 
Only display debug toolbar on non-ajax requests.
 2017-07-28 15:47:09 -04:00
Sofiya Semenova
366cc044be Merge pull request #15635 from edx/ssemenova/ed-699 
Educator-699 Modify deleted group warning on the unit/container page
 2017-07-28 07:23:11 -07:00
Andy Armstrong
d247fe63bb Merge pull request #15643 from edx/andya/site-theme-preview 
Implement theme admin UI to support previewing
 2017-07-27 20:33:07 -04:00
Andy Armstrong
0f808cec78 Implement theme admin UI to support previewing 
LEARNER-2017
 2017-07-27 17:24:31 -04:00