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

68 Commits

Author SHA1 Message Date
Michael Terry
a34c8c8233 Drop remaining coffee use 
This basically commits the transpiled CoffeeScript JS (with minor
cleanup) and removes coffee build support.

A tiny amount of support for xblocks exists, because external users
may have xblocks with coffee. But no coffee in our tree anyway.
 2018-04-13 14:10:40 -04:00
Calen Pennington
c45de5c32b Revert "Revert "Revert "Merge pull request #17325 from cpennington/switch-ass…" 2018-02-28 11:06:39 -05:00
Calen Pennington
b1c9ad175d Revert "Revert "Merge pull request #17325 from cpennington/switch-asset-index-factory-to-webpack"" 
This reverts commit 67177ac72d.

The original PR cause a breakage on production due to webpack building two different
copies of the asset_index.js bundle. However, it is unclear whether that was a
transitory issue or not. This commit restores the original PR to validate whether
the problem is reproducible.
 2018-02-27 16:18:27 -05:00
Calen Pennington
67177ac72d Revert "Merge pull request #17325 from cpennington/switch-asset-index-factory-to-webpack" 
This reverts commit 1c46bd89c3, reversing
changes made to eb6064e333.
 2018-02-22 14:12:32 -05:00
Calen Pennington
569066edf5 Convert cms/static/js/factories/asset_index.js to be bundled using webpack 2018-02-21 10:29:41 -05:00
Calen Pennington
5772042199 Migrate login.js to webpack 2018-01-30 10:32:31 -05:00
Calen Pennington
58bb7167c1 Convert cms login.html to the require_page pattern in preparation for webpack 2018-01-18 13:49:44 -05:00
Mushtaq Ali
e601767329 Show transcripts on video uploads page - EDUCATOR-1662 2018-01-09 17:03:43 +05:00
David Ormsbee
4e7fffa70f Remove cms/static/coffee/fixtures symlink. 
FEDX-458. Part of the static files symlink cleanup.
 2017-12-21 16:40:18 -05:00
Eric Fischer
5bc6b31e29 eslint --fix 2017-12-08 14:38:41 -05:00
Mushtaq Ali
ec399645f3 Course video settings UI - EDUCATOR-1063 2017-10-16 19:22:41 +05:00
cahrens
21bcf02d97 Remove unneeded mustache references. 2017-07-11 12:06:27 -04:00
muhammad-ammar
763f0051bd video thumbnail ui 2017-07-06 12:35:04 +05:00
Andy Armstrong
4ed9776a4b Handle issues with JQuery in Studio and LMS 
LEARNER-1341
 2017-06-13 20:53:29 -04:00
Kyle McCormick
3c470e6b9d Upgrade MathJax references from 2.7.0 to 2.7.1 2017-06-02 15:29:47 -04:00
Simon Chen
0271b4479c Update CMS jquery config to remove script evaluation from ajax call 2017-05-19 13:26:53 -04:00
Brian Jacobel
9c6d94ada0 Require and Webpack can eat the same files 2017-05-12 14:40:31 -04:00
Brian Jacobel
480a3ca60b Move course import JS to Webpack 2017-05-12 14:40:31 -04:00
muhammad-ammar
6f2a2b445f add HLS playback support in video player 
TNL-6513
 2017-04-13 14:20:47 +05:00
Dennis Jen
f90b80da62 Update mathjax CDN to cloudflare. 2017-04-10 19:52:35 +00:00
Mushtaq Ali
e9b8e17fc8 Enable disable move - TNL-6063 2017-03-01 19:27:01 +05:00
Mushtaq Ali
e856f07b87 Move and undo move XBlock 
- TNL-6062
- TNL-6229
 2017-03-01 19:27:00 +05:00
muhammad-ammar
c7dc83c378 Move modal show course outline with breadcrumb 
TNL-6060
 2017-03-01 19:25:57 +05:00
muhammad-ammar
1b011af7e2 move dialog 
TNL-6047
 2017-03-01 19:21:38 +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
muhammad-ammar
ab7f4140d1 Update error handling for Video Uploads 
Tnl-4777
 2017-01-04 18:15:37 +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
Eric Fischer
33273eed4e rectify old require.js hackery 2016-11-30 12:48:21 -05:00
Andy Armstrong
746e310088 Clean up npm-installed packages 2016-11-22 17:51:09 -05:00
Mushtaq Ali
0e8dacc72a Revert "format xml before displaying" 2016-11-03 12:01:30 +05:00
Ned Batchelder
53f8516b8e Merge pull request #13825 from edx/release 
Release
 2016-10-24 19:33:39 -04:00
Robert Raposa
13222adf05 Upgrade MathJax to 2.7. 2016-10-20 10:53:04 -04:00
Greg Martin
4ddda443b8 Implement localized datetimes in browser 
moment-timezone require config

jasmine test fix, duplicate req. cleanup
 2016-10-14 15:25:38 -04:00
Ehtesham
1b960e3e17 requiring codemirror compressed with all addons included 2016-09-02 21:40:20 +05:00
Brian Jacobel
d43e915dab Run eslint autofixer on /cms 2016-08-08 15:04:06 -04:00
Brian Jacobel
a32fd27d60 Replace JSHint ignore directives with ESLint ones 2016-08-04 16:22:59 -04:00
Simon Chen
9424930fbd Try to fix program editor in studio for stage 2016-07-25 14:49:46 -04:00
Andy Armstrong
51bb4d4e00 Merge pull request #12795 from eduNEXT/fmo/coffee_to_js_cms_main 
Convert cms/coffee/src/main to js
 2016-07-20 15:16:48 -04:00
Simon Chen
1d768cde7a ECOM-4904 Move the program editor backbone app to Studio (#12962) 2016-07-19 19:09:51 -04:00
Felipe Montoya
c32b30ba94 Relocating inside the cms namespace 
Addressing feedback
 2016-07-18 18:07:35 -05:00
alisan617
95b2bfbbee Remove edx-icons usage in studio - TNL-4815 
Remove edx-icons from edx-platform - TNL-4813
Remove edx-icons from LMS - TNL-4952
comment out baseline screenshot Bokchoy assertion tests
SOL-1937 Temporarily comment out baseline screenshot Bokchoy assertion tests
 2016-07-13 19:43:59 -04:00
Felipe Montoya
27d4e4bdc2 Compiling cms/coffee/src/main into a js file and fixing the references 
Linting
 2016-06-23 16:43:18 -05:00
Felipe Montoya
82db66d945 Converting the module_edit coffee file to a js file 
Converting to js and fixing references

Linting the generated code
 2016-06-22 15:49:48 -05:00
Andy Armstrong
fff88151d2 Convert XBlock runtime code to JavaScript 2016-06-19 12:55:20 -04:00
Ehtesham
b31ba9d041 upgrade Pagingcollection to edx-ui-toolkit's PagingCollection 2016-05-27 04:35:44 +05:00
Brian Jacobel
f4bede6c5b Fix library load paths (incl. jquery.scrollTo) 
Simplify paths in karma_cms_squire require paths
 2016-05-24 16:53:59 -04:00
Daniel Friedman
230f252bad Fix the way jquery and jquery-migrate are loaded 
Don't use symlinks to include node_modules
 2016-05-24 16:53:51 -04:00
Daniel Friedman
15f148141f Upgrade jQuery 1.7.2 to 2.2.0 
FEDX-25
 2016-05-24 16:52:50 -04:00
muzaffaryousaf
928d9a2694 Replace backbone-min to actual file. 2016-04-28 12:46:29 +05:00
muzaffaryousaf
e89a32d5c6 Upgrade backbone via npm. 
TNL-4335
 2016-04-27 12:48:45 +05:00