Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,708 Commits 1 Branch 0 Tags
47e21ca5b09b60da22ea080da31ada1ece734f28
Commit Graph

7263 Commits

Author SHA1 Message Date
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
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
Ned Batchelder
486dae94a2 Merge pull request #14154 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-12-15 10:16:18 -05:00
Ned Batchelder
b56faaff34 Update translations (autogenerated message) 2016-12-15 12:40:38 +00:00
wajeeha-khalid
11356965b5 MA-2684: return correct marketing url for course about 2016-12-15 16:19:44 +05:00
noraiz-anwar
5207e2fc91 Remove access for inactive users 2016-12-14 14:26:11 +05:00
Mushtaq Ali
da5f840e74 Merge pull request #14063 from edx/mushtaq/prevent-non-video-formats 
Prevent non-video file formats
 2016-12-14 12:00:01 +05:00
Carol Tong
b9afdd2e7b Update sidebar text re Activate permissions 2016-12-09 11:49:41 -05: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
Eric Fischer
3994615d2d Merge pull request #14090 from edx/efischer/alt_queues 
Get alternate queues from ENV_TOKENS
 2016-12-05 12:51:59 -05:00
Brandon DeRosier
097b6417e1 Merge pull request #13958 from edx/bdero/celery-broker-tls 
Allow configuring TLS for celery broker
 2016-12-03 12:18:25 -05:00
marcotuts
2f4a4083bb removed global staff check 2016-12-02 17:40:54 +00:00
Calen Pennington
b24c22804e Merge pull request #14047 from cpennington/safer-opaque-keys 
Safer opaque keys
 2016-12-02 10:44:36 -05:00
Eric Fischer
b610215e08 Get alternate queues from ENV_TOKENS 2016-12-02 10:32:00 -05:00
Calen Pennington
fd0d69594a Upgrade to the latest version of opaque-keys 2016-12-01 13:04:31 -05: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
Mushtaq Ali
a31a728a95 Add duplicate functionality for unit, sub-section and section - TNL-5797, TNL-5798 2016-11-18 12:39:35 +05:00
Brian Jacobel
b1776946b8 Revert "Revert "Update to UXPL 0.17 (grids compilation performance work)"" 
This reverts commit d39f7197c3.
 2016-11-17 13:07:53 -05:00
Eric Fischer
01cc136217 Allow CELERY_QUEUES to be overriden using ENV_TOKENS 2016-11-17 12:56:07 -05:00
Brian Jacobel
09947ab094 Revert "Update to UXPL 0.17 (grids compilation performance work)" 2016-11-10 18:35:51 -05:00
Brian Jacobel
d39f7197c3 Revert "Update to UXPL 0.17 (grids compilation performance work)" 2016-11-10 15:49:33 -05:00
Hasnain
4454899821 WL-615 | Fix the preview certificate link. 2016-11-10 14:15:03 +00:00
Ned Batchelder
496aaa5455 Merge pull request #13959 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-11-09 18:18:37 -05:00
Ned Batchelder
8a1825a4d0 Update translations (autogenerated message) 2016-11-09 22:24:10 +00:00
Ned Batchelder
6bf2c37144 Update translations (autogenerated message) 2016-11-09 21:47:55 +00:00
Jeremy Bowman
f05899b2ba Merge pull request #13930 from edx/PLAT-1074 
PLAT-1074 Add support for django-user-tasks
 2016-11-09 15:11:26 -05:00
Jeremy Bowman
3ee8fc130c PLAT-1074 Add support for django-user-tasks 2016-11-09 14:12:09 -05:00
Brandon DeRosier
8c9aa7d3f3 Allow configuring TLS for celery broker 2016-11-09 12:14:42 -05:00
Ned Batchelder
a0c5cc7e4f Update translations (autogenerated message) 2016-11-09 15:55:41 +00:00
Brian Jacobel
f796cf7262 Merge pull request #13860 from edx/bjacobel/susy 
Update to UXPL 0.17 (grids compilation performance work)
 2016-11-08 15:15:45 -05:00
John Eskew
cd522358f2 Merge pull request #13706 from edx/jeskew/move_embargo_out_of_common 
Move embargo from common to openedx/core/djangoapps.
 2016-11-08 14:38:24 -05:00
Brian Jacobel
697ec3402d Migrate Discussions, Certificates and Programs to susy-less grids 2016-11-07 17:13:58 -05:00
John Eskew
e3cb462d18 Move embargo from common to openedx/core/djangoapps. 2016-11-07 08:47:36 -05:00
attiyaishaque
0ffde1a620 ECOM-5281 Adding retries and celery task for sending activation email. 2016-11-07 11:23:43 +05:00