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

8038 Commits

Author SHA1 Message Date
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
Calen Pennington
569066edf5 Convert cms/static/js/factories/asset_index.js to be bundled using webpack 2018-02-21 10:29:41 -05:00
Jillian Vogel
d10eb500b7 Updates tests: adding middleware increased the number of CMS database queries by 1 2018-02-21 11:44:39 +10:30
Ned Batchelder
59ba4a51b5 Merge pull request #17502 from stvstnfrd/up/loosen-contentstore-test 
Loosen login lockout text check
 2018-02-20 16:42:03 -05:00
Jillian Vogel
ea0c79c7e3 Adds redirect middleware to Studio 2018-02-20 16:38:42 +10:30
stv
7a0baa5578 Loosen login lockout text check 
On our fork at Stanford, we override the template for the login lockout
to provide additional information. This means that the second sentence
here, `Try again later.` does not immediately follow the first in our
rendering. As a result, this test fails for us.

Instead, by checking for the most important part of the message
(the first sentence), we're able to ensure that:
- the user is still locked out
- the lockout message is shown on the template
- the test does not fail unnecessarily
 2018-02-16 10:34:56 -08:00
Qubad786
c90aa33cb8 Integrate with the updated VAL api utils. 2018-02-16 19:06:44 +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
Hasnain
4c10874b34 WL-1444 | Added optional argument "start date" in management command. 2018-02-15 16:20:55 +05:00
Alex Dusenbery
7e51f02884 Get edx-platform working with external completion lib, add integration tests. 2018-02-14 15:54:27 -05:00
ayub-khan
eae37a2b45 updated-translations 2018-02-14 13:21:04 +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
Gregory Martin
4e7a602e67 Merge pull request #17406 from edx/yro/EDUCATOR-2230_code 
Swap out exception class
 2018-02-07 15:14:35 -05:00
Hasnain Naveed
51b3949d79 Merge pull request #17394 from edx/hasnain-naveed/create_course_change 
Adding the new argument "name" (course_display_name) in create_course…
 2018-02-07 18:10:01 +05:00
Nimisha Asthagiri
51dcb5a536 Merge pull request #17392 from mitodl/hack18_bookmarks_django_plugin 
Changed 'bookmarks' django app to follow plugin pattern
 2018-02-06 14:21:38 -05:00
Jeremy Bowman
378287fbc0 Merge pull request #17404 from edx/jmbowman/PLAT-1942 
PLAT-1942 Handle xmodule_django field deprecations
 2018-02-06 13:23:04 -05:00
Hasnain
62969bc317 Adding the new argument "name" (course_display_name) in create_course management command. 2018-02-06 16:55:29 +05:00
ayub-khan
36a6240472 translations-6-feb 2018-02-06 14:13:05 +05:00
Gregory Martin
c1a4184acd Swap out exception class 2018-02-05 16:45:17 -05:00
Jeremy Bowman
bf86b3da98 PLAT-1942 Handle xmodule_django field deprecations 2018-02-05 15:05:54 -05:00