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

7589 Commits

Author SHA1 Message Date
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
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
John Eskew
f1b13595c0 Only display debug toolbar on non-ajax requests. 2017-07-27 16:59:08 -04:00
Sofiya Semenova
d888498038 EDUCATOR-699 Modify deleted group warning on the unit/container page 
EDUCATOR-1001 Fix language for visibility editor and validation to include units
 2017-07-27 20:55:07 +00:00
Jeremy Bowman
c7db5d894e Merge pull request #15674 from edx/jmbowman/PLAT-1590 
PLAT-1590 Fixes for Docker Devstack e2e tests
 2017-07-27 14:40:27 -04:00
Eric Fischer
562322d71e Merge pull request #15673 from edx/efischer/actually_limit_libraries 
Return no libraries if org not specified
 2017-07-26 16:29:44 -04:00
Jeremy Bowman
70c0b7bd3d PLAT-1590 Fixes for Docker Devstack e2e tests 2017-07-26 15:07:57 -04:00
Eric Fischer
2ab2ed7760 Return no libraries if org not specified 
Due to a bug in org=None vs org='', all libraries were being returned
from the "optimization" in #15292. This fix returns no libraries on the
default '' value.
 2017-07-26 14:47:37 -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
Jillian Vogel
8087a1d165 Adds settings.FEATURES.ENABLE_SEPARATE_ARCHIVED_COURSES 
Separates archived courses into a different tab on the Studio index page.

Data is rendered synchronously, but tests are added to ensure that no new sql
or mongo queries were required.
 2017-07-26 14:44:08 +09:30
Brandon Baker
53d9f87df3 Merge pull request #15662 from edx/bbaker/EDUCATOR-760 
EDUCATOR-760
 2017-07-25 16:40:11 -04:00
bbaker6225
8e06cdbf5e EDUCATOR-760 
Change partitions logic to include partitions with one deleted group
 2017-07-25 15:06:54 -04:00
Eric Fischer
0f2279d325 Merge pull request #15658 from edx/efischer/fix_leaks 
CMS memory leak fix
 2017-07-25 13:26:55 -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
Eric Fischer
d4943c5337 Use bulk_operations when loading items 
This has been causing a huge memory leak, wrapping the call in this
context manager properly cleans up the 'records' entries.

EDUCATOR-274
 2017-07-25 12:40:15 -04:00
Andy Armstrong
d5fca9ee19 Merge pull request #15642 from edx/andya/studio-bootstrap-theme 
Add basic Bootstrap theme to Studio
 2017-07-24 15:25:04 -04:00
cahrens
83ae677b83 Don't add groups in experiment configurations twice. 
EDUCATOR-947
 2017-07-24 11:03:31 -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
Ahmed Jazzar
fc5716d9b1 Fixed milestone issues 
In settings_handler and any_unfulfilled_milestones (for mobile APIs)
 2017-07-20 10:55:44 -07:00
Ned Batchelder
8ce7d86471 Merge pull request #15620 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-07-20 12:45:05 -04:00
Harry Rein
ce87896fb6 Merge pull request #15609 from edx/HarryRein/LEARNER-1879-updates-image-styling 
Update Image Styling on Welcome Message and Updates
 2017-07-20 09:34:35 -04:00
Ned Batchelder
8702988000 Update translations (autogenerated message) 2017-07-20 11:52:03 +00:00
cahrens
299fd0982f Fix safe lint violation. 2017-07-19 16:31:04 -04:00
Jeff LaJoie
aa5b8bed11 Merge pull request #15289 from edx/jlajoie/EDUCATOR-434 
EDUCATOR-434: Unit Group Access
 2017-07-19 15:32:02 -04:00
Harry Rein
2658646e1e Fixing styling on updates. 
LEARNER-1879

Issues with images overflowing over their container divs and images being too large for the containing div. Also did a bit of cleanup to improve scss quality.
 2017-07-19 14:33:47 -04:00
Jeff LaJoie
1c90220462 EDUCATOR-434: Extends Course Outline Unit settings to allow Group Access configuration 2017-07-19 14:17:38 -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
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
sarahkf
51208f370a Merge pull request #15339 from edx/sarahkf/fix-structure-files-and-uploads 
fixed files and uploads template in Studio
 2017-07-17 10:46:05 -04:00
Sarah Fischmann
f617deea05 Fix files and uploads template in Studio 
EDUCATOR-605

fixed template in places that only affect Studio

changed > to dash and article to div

Added translation of aria-label

EDUCATOR-605

Capitalize Files and Uploads

EDUCATOR-605

fixed aria label on div
 2017-07-17 09:40:08 -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
Joel Barciauskas
01db7a7d74 Add course import REST API to Studio 2017-07-12 11:48:35 -04: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