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

4024 Commits

Author SHA1 Message Date
Robert Raposa
06aa8d8f38 Merge pull request #16097 from edx/robrap/fix-bokchoy-docker 
Fix bokchoy on docker.
 2017-09-26 10:44:29 -04:00
Robert Raposa
cec406e9dd Fix bokchoy on docker. 2017-09-25 17:21:02 -04:00
Diana Huang
d26694fb5a Update help link for profile. 2017-09-25 17:06:08 -04:00
Uman Shahzad
a27688afd0 Bump to edx-enterprise to 0.48.1 2017-09-26 00:43:09 +05:00
Harry Rein
bc76ffe5dc Add message for setting course goal. 
LEARNER-2307
 2017-09-22 09:56:27 -04:00
McKenzie Welter
288ae94857 Added language field to certificate template 2017-09-15 08:51:09 -04:00
Douglas Hall
04a61ff6a5 Merge pull request #15970 from open-craft/uman/enterprise-support-url 
[ENT-486] Add `ENTERPRISE_SUPPORT_URL` to environment config & version bump edx-enterprise to 0.44.0.
 2017-09-13 09:11:31 -04:00
Uman Shahzad
5fc4bad9ee Add ENTERPRISE_SUPPORT_URL to environment config and bump edx-enterprise to 0.44.0. 2017-09-13 07:42:09 -04:00
Calen Pennington
6156fe929e Add tests of recurring nudge template rendering 2017-09-12 08:23:21 -04:00
M. Rehan
8c37dff1a8 Merge pull request #15475 from OmarIthawi/omar/default-english-transcripts 
Allow displaying videos without transcripts
 2017-09-12 12:22:41 +05:00
Omar Al-Ithawi
302e1d923e Allow displaying videos without transcripts 2017-09-11 21:29:58 +03:00
Gabe Mulley
8a8c9747a7 update template 2017-09-08 12:09:13 -04:00
Harry Rein
c9f75f6bc8 Merge pull request #15926 from edx/HarryRein/FEDX-375-bootstrap-beta 
Harry rein/fedx 375 bootstrap beta
 2017-09-07 10:12:05 -04:00
Fred Smith
75ca7342fe Merge pull request #15966 from edx/derf/reduce_celery_heartbeat_frequency 
reduce celery heartbeat frequency
 2017-09-07 08:17:28 -04:00
Andy Armstrong
6e10d2a556 Update to use Bootstrap beta release 
FEDX-375
 2017-09-06 22:49:05 -04:00
Fred Smith
f891c0fae8 reduce celery heartbeat frequency 2017-09-06 14:58:34 -04:00
Jeremy Bowman
ded294c420 pytest compatibility fixes 2017-09-06 14:20:34 -04:00
Brian Mesick
94400d21b6 Merge pull request #15936 from edx/bmedx/oauth_token_delete_setting 
Add default OAUTH_DELETE_EXPIRED to LMS settings
 2017-09-05 11:04:13 -04:00
bmedx
bad68f8b1e Add default OAUTH_DELETE_EXPIRED to LMS settings 2017-09-01 11:06:54 -04:00
Gabe Mulley
6a36eb0183 Use ACE to 'send' Recurring Nudge emails 2017-08-31 16:58:08 -04:00
Harry Rein
f42e6f1c5d Merge pull request #15826 from edx/HarryRein/LEANER-1859-social-profile-links 
LEARNER-1859: social profile links
 2017-08-29 14:43:30 -04:00
Harry Rein
9f88427f9b Add social links to learner profile. 
LEARNER-1859

Added fields to add social links to the user account settings file.
Added icons to the user profile when these links are set, only shown
when users show their entire profile. Added jasmine tests for account
settings and learner profile pages. Added python unit tests to test
validation on the user account.
 2017-08-29 13:53:08 -04:00
Jeremy Bowman
00c4ede8ee Merge pull request #15831 from edx/jmbowman/PLAT-1710 
PLAT-1710 Support lettuce tests in Docker Devstack
 2017-08-29 13:25:58 -04:00
Omar Al-Ithawi
d0c7a532ad Make the platform name translatable 2017-08-29 12:43:36 -04:00
Robert Raposa
7cc9400b91 Support for joined date to profile. 
LEARNER-1858
 2017-08-22 12:52:37 -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
Uman Shahzad
cc3a63415e Add consent application to installed apps. 2017-08-14 10:41:14 +05:00
bmedx
62f1790999 Fix several RemovedInDjango19Warning by re-ordering INSTALLED_APPS 
- PLAT-1642
- PLAT-1643
 2017-08-10 13:54:28 -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
Clinton Blackburn
7274a20f38 Created Schedule model 
This model will be used to control dynamic upgrade deadlines for
learners.
 2017-08-05 22:06:17 -04:00
Brian Beggs
7b54cf5603 Modify COMMENTS_SERVICE_URL for bokchoy docker settings 2017-08-04 15:17:01 -04:00
Brian Beggs
54695d84fb Add forums URL default for docker devstack 2017-08-04 15:07:10 -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
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
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
John Eskew
f1b13595c0 Only display debug toolbar on non-ajax requests. 2017-07-27 16:59:08 -04:00
Jeremy Bowman
70c0b7bd3d PLAT-1590 Fixes for Docker Devstack e2e tests 2017-07-26 15:07:57 -04:00
Ari Rizzitano
3d4b2a7382 include webpack commons bundle on all pages; stub webpack_loader in python unittests 
include webpack commons bundle on all pages

quotes

homegrown webpack_loader mock

toggle installed webpack_loader in test env file instead

fix test checking context
 2017-07-26 11:28:30 -04:00
Kevin Falcone
585d85ea96 ANALYTICS_API_KEY and ANALYTICS_SERVER_URL aren't used 
ANALYTICS_API_KEY was used to make direct requests to the
ANALYTICS_SERVER_URL which was our original original analytics effort.
 2017-07-21 17:06:05 -04:00
Kevin Falcone
deaf89b709 Remove these unused config settings 
We cleaned out the feature flag and code using these in
https://github.com/edx/edx-platform/pull/5707
but missed the config (I'll go get them in configuration.git later,
when I pull them out of the secure repos, which is where I found them).
 2017-07-21 12:46:11 -04:00
Gregory Martin
7799c4adf4 Merge pull request #15592 from edx/yro-cert-pacing-signal 
Course/Certificates Pacing Signal Registration
 2017-07-18 15:36:39 -04:00
Andy Armstrong
33bee3f70b Refactor learner profile into openedx/features directory 
LEARNER-1855
 2017-07-18 12:30:12 -04:00
Gregory Martin
7df91841ee cleanup 2017-07-17 15:44:29 -04:00