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

2549 Commits

Author SHA1 Message Date
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
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
John Eskew
febf2a07ae Merge pull request #15373 from edx/jeskew/drf_upgrade_django_1.11 
Bump DRF version to 3.6.3 for eventual Django 1.11 compatibility.
 2017-07-17 11:19:56 -04:00
Douglas Hall
bff39b034e Merge pull request #15575 from open-craft/configure-ecommerce-service-worker-username 
[ENT-503] Allow configuration of ECOMMERCE_SERVICE_WORKER_USERNAME
 2017-07-15 07:49:42 -04:00
George Song
a45ae04e8b Merge pull request #15006 from open-craft/bdero/bulk-enroll 
Upstream the Bulk Enroll API endpoint
 2017-07-14 14:20:23 -07:00
John Eskew
2cd62c7bfb Upgrade django-rest-framework version to edX fork, which is DRF v3.6.3 
with a custom patch needed by edx-platform.
Upgrade django-filter as well to v1.0.4
Import DjangoFilterBackend from the correct module - django_filter.
Add django-filter to INSTALLED_APPS.
 2017-07-14 16:05:13 -04:00
Brandon DeRosier
a31855c935 Upstream the Bulk Enroll API endpoint 2017-07-14 14:01:16 -04:00
Gregory Martin
214018dfee Merge pull request #15572 from edx/yro/repair_signal_config 
Repair signal config, certs
 2017-07-14 13:20:34 -04:00
Ned Batchelder
b310fbbb03 Merge pull request #15571 from edx/jill/ora2-django-storage 
Use ORA2 django storage on openstack and devstack.
 2017-07-14 12:57:47 -04:00
Jesse Shapiro
f3dd677fa9 Allow configuration of ECOMMERCE_SERVICE_WORKER_USERNAME 2017-07-14 12:50:55 -04:00
Gregory Martin
6fd51467c9 repair signal config 2017-07-14 12:14:53 -04:00
Jillian Vogel
0fcdcb02bb Use ORA2 django storage on openstack and devstack. 
Default ORA2 storage settings use AWS, so no change required to aws envs.
 2017-07-14 11:23:15 -04:00
Tim Krones
cbd3660cdc Merge pull request #15383 from edx/saleem-latif/ENT-367-updates 
ENT-367: Remove enterprise cookie when it is not needed any further.
 2017-07-14 14:57:46 +02:00
Vedran Karačić
2ffabe6333 Merge pull request #15539 from edx/vkaracic/update-settings 
Add COURSE_CATALOG_API_URL settings value to devstack_docker
 2017-07-13 06:51:56 +02:00
Vedran Karacic
3916759ded Add COURSE_CATALOG_API_URL setting to devstack_docker. 
LEARNER-1115
 2017-07-12 13:48:47 +02:00
Harry Rein
5a2998fb5b Allowing writing of reviews on reviews page. 
LEARNER-1628

This allows enrolled users to write reviews on the reviews page that
can be accessed through the course tools sidebar. A button in the top
corner of the page toggles the widget that is configured with a
setting in the common.py file. The reviews tool is Course Talk.
 2017-07-11 16:16:05 -04:00
Alex Dusenbery
6dfa47b2fc EDUCATOR-565 | Add POLICY_CHANGE_GRADES_ROUTING_KEY, fix errors in compute_all_grades_for_course circuitry. 2017-07-11 14:01:38 -04:00
Kyle McCormick
fade4a10af Implement event for forum thread views 
EDUCATOR-341
 2017-07-11 12:42:49 -04:00
Brian Beggs
1720bcf356 Merge pull request #15345 from edx/bbeggs/host_fixes 
ADD LMS_BASE and CMS_BASE to devstack_docker config files
 2017-07-09 12:11:42 -04:00
Brian Beggs
83e52905cf ADD LMS_BASE and CMS_BASE to devstack_docker config files 2017-07-07 17:02:51 -04:00
Mushtaq Ali
7bf717f75d Add video image settings to aws settings so that lms can pull values from lms.env.json 2017-07-06 12:35:06 +05:00
Mushtaq Ali
e8fee2e09a Add backend video image validations - EDUCATOR-45 2017-07-06 12:35:05 +05:00
muhammad-ammar
763f0051bd video thumbnail ui 2017-07-06 12:35:04 +05:00
Muhammad Ammar
dca12d65c2 Save or update course video image - TNL-6762 2017-07-06 12:35:00 +05:00
Aamish Baloch
7b91095398 Merge pull request #15467 from edx/aamishbaloch/YONK-691 
YONK-691: Configurable profile image sizes
 2017-07-06 12:09:16 +05:00
Jeremy Bowman
e4c8ff3aa4 Merge pull request #15445 from edx/jmbowman/PLAT-1499 
PLAT-1499 Use appropriate default settings in Docker devstack
 2017-07-05 13:22:14 -04:00
Christina Roberts
224606bd97 Merge pull request #15392 from open-craft/smarnach/notify-default 
Add flag to configure whether "Notify users by email" is checked by default.
 2017-07-05 11:32:39 -04:00