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

7306 Commits

Author SHA1 Message Date
muzaffaryousaf
d73d2f5889 Increase the yttimeout to un-skip the video tests. 2017-02-08 20:30:54 +05:00
Calen Pennington
e71a6c24b0 Merge pull request #13899 from CredoReference/possible-to-add-multiple-tag-values 
Allow multiple values for a single tag
 2017-02-03 10:39:23 -05:00
Christina Roberts
a46aec9b0e Merge pull request #14456 from edx/christina/cruft 
ALLOW_ALL_ADVANCED_COMPONENTS was deleted.
 2017-02-03 10:29:12 -05:00
cahrens
fdba584472 Removes an obsolete Django setting, ALLOW_ALL_ADVANCED_COMPONENTS. 
We moved from configuring installed components in settings.py files to using just Python entry points.
This used to be a setting which enabled all XBlocks with appropriate entry points.
It was removed from the rest of the codebase in a previous PR, and this usage was
inadvertently left behind.
 2017-02-03 09:31:01 -05:00
Dmitry Viskov
5fe79dbdb4 Allow multiple values for a single tag 2017-02-03 01:39:58 +03:00
Ned Batchelder
c2573ab5d6 Update translations (autogenerated message) 2017-02-02 14:53:47 -05:00
Jesse Shapiro
9d5db5ae24 Adds OpenStack settings to CMS environment 
and a comment and explaining why we import aws.* in the openstack settings.
 2017-02-02 09:27:22 +10:30
Andy Armstrong
1c6cfb0b04 Merge pull request #14441 from fghaas/color-default 
FEDX-300 Set !default on Sass colors
 2017-02-01 15:03:17 -05:00
Florian Haas
64fd392933 v1 Sass (CMS): set !default on all colors 
Colors should be overridable.
See https://openedx.atlassian.net/browse/PLAT-1181

This sets all color variables to !default for v1 (pre-Pattern Library)
Sass in Studio.
 2017-02-01 11:52:37 +01:00
Jesse Zoldak
83a451dc0b Revert "PLAT-1104 Import courses asynchronously" 2017-01-30 19:21:43 -05:00
Jeremy Bowman
576f6755f8 Merge pull request #14200 from edx/jmbowman/async_course_import 
PLAT-1104 Import courses asynchronously
 2017-01-30 16:50:55 -05:00
Jeremy Bowman
831cd4b85b PLAT-1104 Import courses asynchronously 2017-01-30 12:19:33 -05:00
jagonzalr
d112c0b81b show button new library in studio depending on flags and user staff status 
add flag DISABLE_LIBRARY_CREATION

add comma

use CourseCreatorRole to determine if user can create a library

add disable library creation feature flag

Conflicts:
	cms/djangoapps/contentstore/views/course.py

ENABLE_CONTENT_LIBRARIES flag

check for course creator role for library creation

Conflicts:
	cms/djangoapps/contentstore/views/course.py

add unit tests

make check of creation of library a true/false for forntend, add security in api call, clean tests

update tests

fix docstring of tests

fixed quality violation

fixed broken unit test and quality violations

Feedback changes and unit test to assert libraries are visible to non staff users too

fixed quality violation and feedback changes
 2017-01-30 12:51:35 +05:00
Renzo Lucioni
31f5c8ddcb Remove the program admin tool from Studio 
All programs are now managed using the Django admin on the catalog service. This is the first in a series of commits removing use of the old programs service from edx-platform.

ECOM-4422
 2017-01-27 19:33:06 -05:00
Clinton Blackburn
01d79c518e Merge pull request #14394 from edx/clintonb/fix-oauth-settings 
Corrected OAuth URL for Docker-base devstack
 2017-01-25 17:46:45 -05:00
Mike Dikan
de569e4522 Disable changes to course code in re-run form 
ECOM-6898

Disable (make read-only) the field for course code in the re-run form.  This will prevent creation of course runs with a different course code in the course key that are intended to stand for the same course in a program, which presents problems for the course catalog mapping process.
 2017-01-25 16:01:38 -05:00
Clinton Blackburn
bb7c5b3384 Corrected OAuth URL for Docker-base devstack 
ECOM-6634
 2017-01-25 13:13:50 -05:00
Clinton Blackburn
681cc1dc53 Set LMS_BASE setting for Studio 
This allows previews in LMS to work properly.

ECOM-6634
 2017-01-25 02:05:13 -05:00
Clinton Blackburn
e7c0ed77e5 Added settings for Docker-based devstack 
ECOM-6634
 2017-01-24 00:38:00 -05:00
Renzo Lucioni
12c595f80d Merge pull request #14353 from edx/renzo/waffle 
Reintroduce Waffle
 2017-01-20 17:15:35 -05:00
Renzo Lucioni
3f6d6cbf84 Reintroduce Waffle 
Waffle serves as a complement to config models. It's useful in feature rollout situations where you may not want to incur the overhead of creating and committing a migration (required for adding a field to a config model), and also handles gradual, percentage-based rollouts.

ECOM-4422
 2017-01-20 16:20:13 -05:00
Ned Batchelder
aadd48eb7b Update translations (autogenerated message) 2017-01-20 20:01:52 +00:00
Eric Fischer
507e621ccc Revert "Merge pull request #14324 from edx/efischer/revertins" 
This reverts commit c7d2d601b8, reversing
changes made to fb2173f43e.
 2017-01-18 10:56:13 -05:00
Muhammad Ammar
be28e5c441 Merge pull request #14314 from edx/ammar/log-videoid-and-status 
log video id and status along with message
 2017-01-17 19:49:35 +05:00
AsadAzam
6edd0af6aa Merge pull request #14294 from edx/asadazam/tnl-6046-empty-handouts 
Fixed Course handouts rejects deletion of all text
 2017-01-13 15:06:12 +05:00
Ned Batchelder
2b007e78c5 Update translations (autogenerated message) 2017-01-12 18:06:11 +00:00
muhammad-ammar
36dfc2c08d log video id and status along with message 2017-01-12 13:59:23 +05:00
Asad Azam
48bec75b80 Fixed Course handouts rejects deletion of all text 2017-01-12 12:33:21 +05:00
Sylvia Pearce
d6cf03b094 Update guidance in Studio Unit Location text 2017-01-10 16:29:08 -05:00
noraiz-anwar
b967538fee Merge pull request #14275 from edx/revert-14216-noraiz/TNL-6197 
Revert "Error while exporting course with too long filename"
 2017-01-10 16:01:55 +05:00
Ned Batchelder
e36cf4a596 Merge pull request #14272 from edx/ned/update-translations 
Update translations (autogenerated message)
 2017-01-05 15:13:49 -05:00
noraiz-anwar
7494e5e6c8 Revert "Error while exporting course with too long filename" 2017-01-05 23:07:56 +05:00
Ned Batchelder
bbef15625f Update translations (autogenerated message) 2017-01-05 16:57:06 +00:00
Kevin Falcone
ebe332fc2d Merge pull request #14260 from edx/jibsheet/export-docs 
It's always bugged me that the help strings were nonsensical
 2017-01-05 10:50:33 -05:00
noraiz-anwar
a637121d19 Merge pull request #14216 from edx/noraiz/TNL-6197 
Error while exporting course with too long filename
 2017-01-05 15:43:44 +05:00
noraiz-anwar
9c139a87a6 Error while exporting course with too long filename 2017-01-05 14:43:48 +05:00
Kevin Falcone
2902c3b968 It's always bugged me that the help strings were nonsensical 
While here, the one-line docstring also bothered me.
 2017-01-04 16:51:34 -05:00
Carol Tong
8a2daccca0 Merge pull request #14257 from edx/carol/DOC-3526 
DOC-3526 Clarify roles for cert activation
 2017-01-04 12:23:23 -05:00
Carol Tong
e29f55368d DOC-3526 Clarify roles for cert activation 2017-01-04 11:01:47 -05:00
muhammad-ammar
ab7f4140d1 Update error handling for Video Uploads 
Tnl-4777
 2017-01-04 18:15:37 +05:00
attiyaishaque
8eb81ea585 TNL-6203 Fix Duplicate button in Studio if user language is changed. 2016-12-22 15:56:44 +05:00
Mushtaq Ali
07c93a8ed5 Merge pull request #14140 from edx/mushtaq/video-upload-restrict 
Video upload restrictions
 2016-12-22 14:35:17 +05:00
Calen Pennington
04115bfe43 Revert "Merge pull request #13235 from edx/jia/MA-2684" 
This reverts commit bde0f7b2a7, reversing
changes made to 71693c3a12.
 2016-12-21 13:21:47 -05:00
Mushtaq Ali
2c7941d1ef Prevent files larger than 5 GB 
Prevent file containig containing non-ascii or special characters in file name
TNL-5855 TNL-5957
 2016-12-21 16:36:17 +05:00
Douglas Hall
934dcce148 Merge pull request #14170 from edx/douglashall/session_cookie_domain_override 
Allow for SiteConfiguration override of SESSION_COOKIE_DOMAIN setting in Studio
 2016-12-20 07:31:34 -05:00
Douglas Hall
65f0420500 Allow for SiteConfiguration override of SESSION_COOKIE_DOMAIN setting in Studio 2016-12-20 05:17:27 -05:00
Cliff Dyer
aa3d6e8791 Merge pull request #14092 from edx/cdyer/validate-capa-xml 
Use new XMLString field type for CAPA data field.
 2016-12-19 12:03:19 -05:00
Ari Rizzitano
1b06bdeec0 Merge pull request #14083 from edx/fix-unformatted-403 
fix unformatted html in studio error response
 2016-12-16 11:08:19 -05:00
Ari Rizzitano
311e6d7ffd [studio] fix unformatted html in connection error message (TNL-5818) 
display default error message for non-json responses (TNL-5818)

[studio] log ajax errors. (TNL-5818)

[studio] fix failing test (TNL-5818)

[cms-test] avoid circular error logging; stub Logger (TNL-5818)

[cms-test] fix logger dep in squire config (TNL-5818)

[cms-tests] fix logger import (TNL-5818)

[cms-test] stub the logger directly in the karma config. (TNL-5818)

[studio] didn't need Logger after all (TNL-5818)

[studio] ignore console.log (TNL-5818)
 2016-12-16 09:51:39 -05:00
J. Cliff Dyer
22ce30039b Use new XMLString type for CAPA data field. 
TNL-5245
 2016-12-15 15:35:44 -05:00