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

1199 Commits

Author SHA1 Message Date
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
228356dc09 Merge pull request #15633 from edx/jibsheet/remove-pre-insights-analytics-config 
Remove these unused config settings
 2017-07-25 13:07:17 -04:00
Andy Armstrong
95e47ddb02 Add basic Bootstrap theme to Studio 
LEARNER-1982
 2017-07-24 10:43:18 -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
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
Gregory Martin
7df91841ee cleanup 2017-07-17 15:44:29 -04: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
George Song
59794ea9c9 Merge pull request #15338 from ravi-ojha/educator_269 
Fix EDUCATOR-269: Don't show "Issue Open Badges" if the feature is disabled
 2017-07-12 10:50:55 -07:00
rabiaiftikhar
6e873a4838 EDUCATOR-810 fix UnicodeDecodeError 2017-07-12 07:28:46 +00:00
Sylvia Pearce
121ef86fa1 Fix Studio context-sensitive help link to video documentation 2017-07-11 14:08:23 -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
Joel Barciauskas
6b08528193 Don't allow any user to create courses by default 
* Change settings default
* Set `ENABLE_CREATOR_GROUP` to False for devstack
* Set `ENABLE_CREATOR_GROUP` to False for tests

In f095c5fec6 it was decided to enable
anyone to make courses in Studio by default in order to make things
easier in dev environments. This was before the code was open source.
This default is likely in effect for many Open edX instances, but almost
no one would want this setting outside of development.
 2017-07-10 12:47:42 -07: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
Christina Roberts
8fb8647473 Merge pull request #15360 from open-craft/replaceafill/aws_with_filesystem_storage_tested 
Set the MEDIA_ROOT and MEDIA_URL settings in the cms.envs.aws module
 2017-07-06 12:36:56 -04: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
Aamish Baloch
ac45850d15 YONK-691: Configurable profile image sizes 2017-07-05 18:50:01 +05:00
Harry Rein
7ea3b013ad Style LMS header, footer and nav for Bootstrap. 2017-07-04 17:24:12 -04:00
Ravi Ojha
4d95ea30a6 Fix EDUCATOR-269: Don't show "Issue Open Badges" if the feature is disabled 
Summary: We show "Issue Open Badges" setting in Studio
Course -> Settings -> Advanced Settings, even if the flag
ENABLE_OPENBADGES is set to False. With this commit, it
will only show up in Advanced Settings if ENABLE_OPENBADGES
is set to True.
 2017-07-04 22:57:40 +05:30
Jeremy Bowman
353b4c4f67 PLAT-1499 Use appropriate default settings in Docker devstack 2017-07-03 12:04:27 -04:00
Omar Al-Ithawi
1b46c3e646 Add optional support for Unicode usernames 
Refactoring: Use format with named variables
 2017-06-27 14:18:49 +03:00
Douglas Cerna
c567add628 Set the MEDIA_ROOT and MEDIA_URL settings in the cms.envs.aws module 2017-06-25 19:47:39 -06:00
Brian Beggs
7074e3abba Merge pull request #14902 from Salomari1987/salah/copyright-year 
Set COPYRIGHT_YEAR dynamically
 2017-06-23 16:06:35 -04:00
Harry Rein
82daaa5ad3 Adding a reviews page to the course and updating the reviews module on the course about page. Removed the existing coursetalk implementation and put it in a fragment, removed the tests as well. Added configuration settings to specify the reviews template as well as the reviews provider. This is all protected by a waffle flag. 2017-06-23 11:27:48 -04:00
Jeremy Bowman
5a6b8cd35b PLAT-1228 Support bok-choy in Docker Devstack 2017-06-22 15:03:12 -04:00
Salah Alomari
b8ba64cbe1 Set copyright year dynamically 2017-06-19 14:33:55 +03:00
Adam
691d6872c7 Merge pull request #15294 from edx/adam/add-precedes-to-coursegraph-3 
write courses to neo4j in background tasks (EDUCATOR-583)
 2017-06-15 15:10:11 -04:00
Andy Armstrong
4ed9776a4b Handle issues with JQuery in Studio and LMS 
LEARNER-1341
 2017-06-13 20:53:29 -04:00
Carol Tong
82b8cf40b3 Change help target for enrollment track groups 2017-06-13 15:51:13 -04:00
Sylvia Pearce
fe3105cc38 Update Studio help tokens following doc reorg for Publisher 2017-06-13 13:52:07 -04:00
Giulio Gratta
2b25c9fc78 Enable DEFAULT_MODE to be customized in config 
- Keeps platform set default of "Audit" to be backwards compatible and not break stuff
- get COURSE_MODE_DEFAULTS from config if set
 2017-06-12 14:09:00 -04:00
Adam Palay
51abe89a80 respond to comments 2017-06-12 11:55:58 -04:00
Adam Palay
69d76b69d7 write courses to neo4j in background tasks (EDUCATOR-583) 
move tasks into tasks.py

add more logging
 2017-06-12 10:44:27 -04:00
Stu Young
8870dde933 Revert "Set the MEDIA_ROOT and MEDIA_URL settings in the cms.envs.aws module" 2017-06-09 16:18:12 -04:00
Kevin Falcone
eb3bbc7c58 Merge pull request #15005 from replaceafill/aws_with_filesystem_storage 
Set the MEDIA_ROOT and MEDIA_URL settings in the cms.envs.aws module
 2017-06-09 10:39:45 -04:00
Douglas Cerna
ca33342ce3 Removed MEDIA_ROOT override in cms.envs.devstack 2017-06-08 22:22:50 -06:00
Albert St. Aubin
fd7ac21608 Working publisher/subscriber events for Cohorts and discussions 2017-06-06 13:58:54 -04:00
Uman Shahzad
13ac08a41f Allow configurable password reset support link. 
Defaults to SUPPORT_SITE_LINK intentionally.
Also fixed surrounding quality tests, and overall
quality improvements.
 2017-06-05 19:42:18 +05:00
Robert Raposa
eaab2cf444 Add course overrides of waffle flags. 2017-06-01 15:12:50 -04:00
Gregory Martin
77b2229210 GradingPolicyChanged Signal Handler 
https://openedx.atlassian.net/browse/EDUCATOR-393
 2017-05-31 10:46:55 -04:00
John Eskew
3b57542ab0 Revert "Merge pull request #15170 from edx/jeskew/PLAT_1316_partitions_inheritance" 
This reverts commit f97f052591, reversing
changes made to 800bcd8e20.
 2017-05-30 12:42:54 -04:00