Commit Graph

2717 Commits

Author SHA1 Message Date
Awais Jibran
05a1d61f5c quality 2018-03-28 16:41:34 +05:00
Awais Jibran
a681d91b46 fix js issue with video uploads 2018-03-28 14:41:27 +05:00
Ari Rizzitano
c5b199a1a2 fix linting errors and un-vendor backbone-associations
remove erroneous asset_index listing

remove indirect define

remove pageFactoryArguments index

max length seems excessive for this file

lintfix

un-vendor backbone associations
2018-03-06 15:35:47 -05:00
Calen Pennington
970bc6a50d Move the context course and sock into require_page compatible forms 2018-03-06 15:35:46 -05:00
Calen Pennington
52e7af4148 Move pattern-replacement file lists into a separate file
Move pattern-replacement file lists into a separate file

punt the react stuff for now
2018-03-06 15:35:23 -05:00
Rabia Iftikhar
3be942bf8f upgrade backbone-associations, fix tests
Merge pull request #17559 from edx/ri/EDUCATOR-2231-remove-enrollment-dates-references

EDUCATOR-2231 remove course run enrollment dates references from studio

add NoTextbooks component

make backbone-associations work

webpackify context course

test fixup
2018-03-06 15:30:56 -05: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
Bill DeRusha
d4b57bc218 Removed self-paced feature flag from code 2018-02-26 13:44:53 -05:00
edx-pipeline-bot
92ca38f489 Merge pull request #17535 from edx/release-mergeback-to-master
Merge release back to master
2018-02-22 18:32:36 -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
ayub-khan
523be08e56 updated translations 2018-02-22 15:06:35 +05:00
Calen Pennington
c906c186ce Move the context course and sock into require_page compatible forms 2018-02-21 10:29:41 -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
ayub-khan
eae37a2b45 updated-translations 2018-02-14 13:21:04 +05:00
ayub-khan
36a6240472 translations-6-feb 2018-02-06 14:13:05 +05:00
Calen Pennington
f2c3aed8e7 Merge pull request #17316 from cpennington/switch-cms-login-to-webpack
Migrate login.js to webpack
2018-01-30 14:24:08 -05:00
Calen Pennington
5772042199 Migrate login.js to webpack 2018-01-30 10:32:31 -05:00
ayub-khan
08863b3930 updated-translations-29-jan 2018-01-29 14:51:52 +05:00
ayub-khan
9a50e018f0 updated translations 2018-01-26 16:38:12 +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
ayub-khan
5033dbcd91 update translations 2018-01-17 19:26:02 +05:00
Mushtaq Ali
6af1215bcd Add delete js tests 2018-01-12 15:25:00 +05:00
Qubad786
55001ca81a Transcript delete on Video Upload Page - EDUCATOR-1961 2018-01-11 13:08:07 +05:00
Mushtaq Ali
9dcedaf82b Merge pull request #17138 from edx/mushtaq/improve-transcript-sorting
Sort transcript languages
2018-01-11 12:57:00 +05:00
Mushtaq Ali
c0d86360f0 Improve trancript sorting - EDUCATOR-2030 2018-01-10 17:02:21 +05:00
ayub-khan
9650c324bc updated-translations 2018-01-10 15:53:41 +05:00
Calen Pennington
fea4eef359 Merge pull request #17006 from cpennington/synchro-cms-static-base
Make module loading for cms/static/js/base.js sychronous to ease tran…
2018-01-09 22:55:08 -05:00
Mushtaq Ali
70fe33fc1e Change upload button text 2018-01-09 17:03:48 +05:00
Mushtaq Ali
f76d419bc7 Fix download transcript bug - EDUCATOR-2071 2018-01-09 17:03:48 +05:00
Mushtaq Ali
10d79b0047 Update user strings 2018-01-09 17:03:46 +05:00
Mushtaq Ali
00a86ccef8 Transcript file upload - EDUCATOR-2029 2018-01-09 17:03:46 +05:00
Qubad786
090e5dc534 Transcript upload backend for Video Upload Page – EDUCATOR-1854 2018-01-09 17:03:44 +05:00
Qubad786
c760c6a01b Download transcript on video upload page - EDUCATOR-1853 2018-01-09 17:03:44 +05:00
Mushtaq Ali
e601767329 Show transcripts on video uploads page - EDUCATOR-1662 2018-01-09 17:03:43 +05:00
Ari Rizzitano
a5ab620e3e convert course/library listing to use reactrenderer 2018-01-08 13:43:06 -05:00
ayub-khan
f50af67f15 updated translations 2017-12-27 16:38:58 +05:00
Calen Pennington
5e56c0a105 Make module loading for cms/static/js/base.js sychronous to ease transition to webpack 2017-12-22 14:05:09 -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
ayub-khan
fcac9ad1e9 updated translations 2017-12-20 17:03:51 +05:00
Eric Fischer
5bc6b31e29 eslint --fix 2017-12-08 14:38:41 -05:00
ayub-khan
96984aa3a4 updated translations 7 dec 2017-12-07 17:17:16 +05:00
ayub-khan
b9acdbb284 updated translations 2017-12-04 17:21:48 +05:00
sandroroux
3d616d7802 Changed references to Weekly Highlights Emails in UI elements. 'Learn More' link in studio opens in new tab. 2017-11-28 15:49:14 -05:00
Calen Pennington
64dd633fc9 Merge pull request #15846 from edx/ormsbee/decaffeinate_tests_2
WIP: Decaffeinate Test Files (Part 2)
2017-11-28 13:34:26 -05:00
Tyler Hallada
9f74e70589 Course Highlights Setting in Studio Course Outline
fixup! trying to "fix" underscore syntax error

add cancel modal test

Fix quality issues.

Apply Nimisha's suggestions for my quality fixes.

Skip test_drop_unit_in_collapsed_subsection

Fix quality error
2017-11-27 17:23:55 -05:00
ayub-khan
9e619e4244 Updated Translations 2017-11-23 16:02:47 +05:00
David Ormsbee
94614db46e CoffeeScript tests migration: Remove implicit returns 2017-11-22 15:39:50 -05:00
David Ormsbee
0880502f26 CoffeeScript tests migration: Decaffeinate files
This is running decaffeinate, with no additional cleanup.
2017-11-22 15:39:50 -05:00
David Ormsbee
5c64da2f63 CoffeeScript tests migration: Rename files
Step 1 in our migration steps is to rename the CoffeeScript files to
the JS files they will be replaced with, so that we can preserve file
history.
2017-11-22 15:39:50 -05:00