Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

2262 Commits

Author SHA1 Message Date
Jeff LaJoie
c3bb21c714 Merge pull request #17904 from edx/jlajoie/LEARNER-4578 
LEARNER-4578: Adds in JQuery password validation on Studio
 2018-04-12 12:12:56 -04:00
Jeff LaJoie
aeb85c59d3 LEARNER-4578: Adds in password validation on Studio 2018-04-09 15:26:12 -04:00
Farhanah Sheets
facb03ebd3 Remove search settings and add test to validate search visibility 2018-04-09 14:38:35 -04:00
Tyler Hallada
71e74949e9 Change in-context waffle switch to a flag 
Also update studio-frontend to version 1.7.1
 2018-04-05 16:47:42 -04:00
Tyler Hallada
d31249ba20 Studio-frontend in-context image selection modal 
Open edit image modal via a custom signal

Send img tag attributes in open signal

Send natural image dimensions if no attr specified

Add new modal button in addition to old button

Also load built CSS when waffle switch on

Swap out TinyMCE toolbar button on waffle switch

Pass LANGUAGE_CODE from Django to template to studio-frontend

Define request.LANGUAGE_CODE in test_container_page.py
 2018-04-04 15:48:36 -04:00
Michael Roytman
c9c97e58c5 Merge pull request #17700 from edx/mroytman/studio-link-to-lms 
Link to LMS from Studio footer
 2018-03-28 16:14:28 -04:00
Michael Roytman
a0ed8fa38d Add a link to the LMS from Studio footer. 2018-03-28 14:10:30 -04:00
Tyler Hallada
04279bf5af Refer to new sfe file names in templates 2018-03-27 15:17:58 -04:00
Farhanah Sheets
b6469642fd Merge pull request #17599 from edx/fsheets/EDUCATOR-2324 
Clean up old Studio Assets Page
 2018-03-08 14:06:02 -05:00
Farhanah Sheets
8dd967448f Remove old assets page from mako template, tests, & config model references 2018-03-08 12:05:08 -05:00
Calen Pennington
970bc6a50d Move the context course and sock into require_page compatible forms 2018-03-06 15:35:46 -05:00
Ari Rizzitano
6998b311fe fix page_bundle 2018-03-06 15:35:46 -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
7f6c101284 Merge pull request #17565 from edx/re-add-asset-index-changes 
Revert "Revert "Merge pull request #17325 from cpennington/switch-ass…
 2018-02-27 21:28:02 -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
Dennis Jen
6da648899f Merge pull request #17530 from edx/dsjen/assets-search-waffle 
Added waffle switch for files & uploads search UI
 2018-02-27 14:56:10 -05:00
Eric Fischer
2717ef5b80 Provide i18n data to SFE in DOM 
EDUCATOR-1613, edx-platform changes
 2018-02-27 10:17:35 -05:00
Bill DeRusha
d4b57bc218 Removed self-paced feature flag from code 2018-02-26 13:44:53 -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
Dennis Jen
bcb8cfeffd Added waffle switch for files & uploads search UI 2018-02-22 11:54:53 -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
Tyler Hallada
6707f8d428 Add class=SFE to AccessibilityPage root div 2018-02-15 13:20:19 -05:00
Tyler Hallada
682365a1dd Remove loading spinner in new assets page 2018-02-15 13:20:19 -05:00
Tyler Hallada
3578a72d0f Fix waffle flag switch on old assets JS block 2018-02-15 13:20:19 -05:00
Tyler Hallada
3e7a742177 Fix integration of accessibility policy page 2018-02-15 13:20:18 -05:00
Tyler Hallada
73cffad5ce Dev in sfe container & prod use /dist of sfe 2018-02-15 13:20:18 -05:00
Michael Roytman
3496bb9a0a pass language to mako template 2018-02-12 15:44:20 -05:00
Ned Batchelder
60a4e6d864 Merge pull request #17339 from caesar2164/make-studio-sock-links-themable 
Define Studio sock links in separate themable file
 2018-02-08 15:20:22 -05:00
Giulio Gratta
2fbe81b666 Move extra links import into new file 2018-01-31 13:11:59 -08:00
Giulio Gratta
9e96e29979 Clean up link list coalescence 2018-01-30 16:27:36 -08: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
b701ad77c8 Rename require_page to invoke_page_bundle 2018-01-30 10:32:31 -05:00
Calen Pennington
5772042199 Migrate login.js to webpack 2018-01-30 10:32:31 -05:00
Giulio Gratta
4cbcc5ed52 Add file to allow simple extension of sock links 2018-01-29 13:26:08 -08:00
Giulio Gratta
156b501e47 Define Studio sock links in separate themable file 2018-01-29 11:56:20 -08:00
Ned Batchelder
921ea67cac Merge pull request #17312 from caesar2164/allow-theming-files-uploads-header 
Allows insertion of content above Files & Uploads
 2018-01-26 15:38:12 -05:00
Giulio Gratta
5b0344d87f Allows insertion of content above Files & Uploads 2018-01-25 13:11:55 -08:00
Giulio Gratta
794630824e Extends <head> in Studio course outline 
- Can add meta, link, and script tags
- Adds to rather than replaces edX tags
 2018-01-25 11:28:06 -08:00
Calen Pennington
974f099835 Teach the xss_linter about the require_page tag 2018-01-23 15:58: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
Calen Pennington
bacd4334ed Add a form of static:require_module that assumes that the factory is self-initializing 2018-01-18 10:10:30 -05:00
Tyler Hallada
8dcba2737a If SFE enabled, hide sidebar and upload button 2018-01-17 15:34:02 -05:00
Jeremy Bowman
113e8dde61 PLAT-1885 Stop using deprecated BlockUsageLocator properties 2018-01-12 16:40:21 -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
c0d86360f0 Improve trancript sorting - EDUCATOR-2030 2018-01-10 17:02:21 +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