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

2540 Commits

Author SHA1 Message Date
Ned Batchelder
7d7f17a3b3 Merge pull request #14663 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-03-09 14:03:09 -05:00
Ned Batchelder
9d9266f1c5 Update translations (autogenerated message) 2017-03-09 16:17:10 +00:00
Ned Batchelder
15a4fc420a Update translations (autogenerated message) 2017-03-09 12:08:25 +00:00
Albert St. Aubin
86e202c5ab Update to Studio style for recent capa action bar style changes 2017-03-08 14:23:19 -05:00
Qubad786
f064e991bf duplicate video id in basic tab 2017-03-07 15:33:33 +05:00
Ned Batchelder
6c44eee00e Update translations (autogenerated message) 2017-03-02 19:25:59 +00:00
Zia Fazal
9041ed1400 removed statement which updates xblock in preview handler 
added test to support changes

moved aside xblock data save logic int component_handler

changes after feedback

fixed typo
 2017-03-01 11:45:52 +05:00
Jeremy Bowman
c8f7587f6b Merge pull request #14552 from edx/jmbowman/async_course_import 
PLAT-1104 Import courses asynchronously
 2017-02-27 12:01:06 -05:00
Ned Batchelder
7b27f94962 Update translations (autogenerated message) 2017-02-23 17:04:30 +00:00
Jeremy Bowman
d3b873c7e9 PLAT-1104 Import courses asynchronously 2017-02-22 15:06:34 -05:00
Ned Batchelder
9614b6eb07 Update translations (autogenerated message) 2017-02-16 16:51:11 +00:00
Ned Batchelder
318ae7b869 Update translations (autogenerated message) 2017-02-16 16:08:24 +00: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
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
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
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
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
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
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
Asad Azam
48bec75b80 Fixed Course handouts rejects deletion of all text 2017-01-12 12:33:21 +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
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
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
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
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
Ned Batchelder
b56faaff34 Update translations (autogenerated message) 2016-12-15 12:40:38 +00:00
Mushtaq Ali
2968e3551b Prevent non-video file formats - TNL-5956 2016-12-09 17:05:06 +05:00
Marco Morales
1b5597afe9 Merge pull request #14070 from edx/marco/certificates-activate-role 
Allows course team to directly activate / disable web certificates
 2016-12-08 17:05:24 -05:00
Ned Batchelder
95563dc661 Update translations (autogenerated message) 2016-12-08 18:31:44 +00:00
marcotuts
2f4a4083bb removed global staff check 2016-12-02 17:40:54 +00:00
Ned Batchelder
7c46a850c0 Update translations (autogenerated message) 2016-12-01 16:12:20 +00:00
Eric Fischer
33273eed4e rectify old require.js hackery 2016-11-30 12:48:21 -05:00
Brian Jacobel
f47ab54905 Merge pull request #14017 from edx/bjacobel/susy-reup 
Susy performance fixes in Platform, take 2
 2016-11-29 15:57:06 -05:00
Brian Jacobel
ae5953a231 Fix for new program page not rendering full-width 2016-11-29 13:10:21 -05:00
Simon Chen
664920b930 Update the Javascript to remove JWT token auth 
ECOM-6396
 2016-11-29 10:25:22 -05:00
Andy Armstrong
3fb7134efc Merge pull request #14020 from edx/andya/update-gemnasium-libraries 
Clean up npm-installed packages
 2016-11-23 14:02:29 -05:00
Andy Armstrong
746e310088 Clean up npm-installed packages 2016-11-22 17:51:09 -05:00
Ned Batchelder
bb8db567a3 Update translations (autogenerated message) 2016-11-22 16:26:49 +00:00
muhammad-ammar
dd45991926 soft delete video from video uploads page 
TNL-5899
 2016-11-21 15:14:57 +05:00
Muzaffar yousaf
8cee15b6a1 Merge pull request #13916 from edx/mushtaq/tnl-5797-duplicate-functionality 
Add duplicate functionality for unit, sub-section and section
 2016-11-21 15:08:00 +05:00