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

8062 Commits

Author SHA1 Message Date
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
bmedx
b26d7913f5 Add some common functionality for retiring users 
- Methods for getting hashed retired users and usernames
- A DRF permission for retiring users
 2018-04-02 13:48:52 -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
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
Tyler Hallada
04279bf5af Refer to new sfe file names in templates 2018-03-27 15:17:58 -04:00
J. Cliff Dyer
f3be0ad775 Send all update_aggregators task to LMS. 2018-03-22 10:41:43 -04:00
Alex Dusenbery
924dd18f2b Remove flaky page re-ordering lettuce tests. 
Remove the right thing.
 2018-03-16 10:11:44 -04:00
muhammad-ammar
f6315483cd update get_transcript util 2018-03-15 15:15:20 +05:00
Michael Youngstrom
eea527e896 Merge pull request #17673 from edx/youngstrom/test-improvements 
Bokchoy test fixes for firefox upgrade
 2018-03-14 09:51:53 -04:00
Stuart Young
53fe34615e Test fixes to prepare for firefox upgrade on jenkins 2018-03-12 15:40:25 -04:00
Farhanah Sheets
34a96fb58d Remove NewAssets config model & create migration file 2018-03-12 13:21:16 -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
Troy Sankey
3f1f524953 Revert "PLAT-1957 Better memory leak diagnostic tooling" 
This reverts commit a022461891.

Reverts edx/edx-platform#17486
 2018-03-08 13:16:34 -05:00
Farhanah Sheets
8dd967448f Remove old assets page from mako template, tests, & config model references 2018-03-08 12:05:08 -05:00
M. Rehan
f02ba65983 Merge pull request #17550 from edx/rehan-ammar/transcript-util 
transcript util
 2018-03-08 17:35:08 +05:00
Jeremy Bowman
a022461891 PLAT-1957 Better memory leak diagnostic tooling 2018-03-07 16:31:26 -05:00
muhammad-ammar
a01ba7621e transcript util 
EDUCATOR-2131
 2018-03-07 23:02:15 +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
Ari Rizzitano
6998b311fe fix page_bundle 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
rabia23
f65195c0ed EDUCATOR-2231 remove course run enrollment dates references from studio 2018-03-05 11:27:22 +00:00
Jeremy Bowman
b3ac2b1b06 PLAT-1976 Add waffle switch to block auth_user write attempts 2018-02-28 13:13:06 -05:00
Calen Pennington
49790d2dd3 Merge pull request #17576 from edx/revert-17565-re-add-asset-index-changes 
Revert "Revert "Revert "Merge pull request #17325 from cpennington/switch-ass…"
 2018-02-28 12:09:18 -05:00
Farhanah Sheets
d088e584e1 Merge pull request #17546 from edx/mroytman/bok-choy-sfe-assets 
Bok Choy tests for studio-frontend assets page
 2018-02-28 12:03:09 -05:00
Calen Pennington
c45de5c32b Revert "Revert "Revert "Merge pull request #17325 from cpennington/switch-ass…" 2018-02-28 11:06:39 -05:00
Michael Roytman
90bcd273a0 add ConfigurationModelFixture for Studio Frontend Assets Page and add Bok Choy tests for Studio Frontend Assets Page 2018-02-28 10:48:27 -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
071594392b Merge pull request #17384 from edx/bderusha/zendesk-plugin 
zendesk proxy plugin
 2018-02-26 17:06:56 -05:00
Bill DeRusha
9abec119fc Merge pull request #17503 from edx/bderusha/sp-cleanup 
Removed self-paced feature flag from code
 2018-02-26 14:42:53 -05:00
Bill DeRusha
9611284df0 zendesk proxy plugin 2018-02-26 14:20:32 -05:00
Bill DeRusha
d4b57bc218 Removed self-paced feature flag from code 2018-02-26 13:44:53 -05:00
Bill DeRusha
1aca252e19 Merge pull request #17383 from edx/bderusha/disc-plugin 
Convert discussion to plugin
 2018-02-26 13:18:10 -05:00
John Eskew
b292bb43eb Merge pull request #17446 from mitodl/upstream/fix_error_page_themes 
Fixed unthemed error pages in Studio and LMS
 2018-02-23 13:25:08 -05:00
Bill DeRusha
4fba472139 Discssions as a plugin 2018-02-23 09:23: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
Gavin Sidebottom
67442c2641 Fixed unthemed error pages in Studio and LMS 2018-02-22 16:49:06 -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
John Eskew
99f66a40b7 Merge pull request #17507 from open-craft/jill/studio-redirect-middleware 
Adds redirect middleware to Studio
 2018-02-22 11:29:52 -05:00
Dennis Jen
b9d6ead3a3 Merge pull request #17522 from edx/dsjen/rename-accessibility-switch 
Renamed contentstore waffle namespace to "studio"
 2018-02-22 11:10:57 -05:00
ayub-khan
523be08e56 updated translations 2018-02-22 15:06:35 +05:00
Dennis Jen
354abd09c8 Renamed contentstore waffle namespace to "studio" 2018-02-21 17:26:05 -05:00
Calen Pennington
c906c186ce Move the context course and sock into require_page compatible forms 2018-02-21 10:29:41 -05:00