Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

9424 Commits

Author SHA1 Message Date
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
Jeremy Bowman
2bd0c3d9a1 PLAT-1917 Stop using deprecated Location and AssetLocation 2018-02-03 00:31:59 -05:00
Jeremy Bowman
11e134c552 PLAT-1916 Ignore existing usage of deprecated field_data 2018-02-02 16:12:00 -05:00
Awais Jibran
5ddcfc5607 Merge pull request #17343 from edx/aj/validate-course-team-user 
Course team Validation
 2018-02-02 14:32:39 +05:00
Gavin Sidebottom
7f3ffcc047 Changed 'bookmarks' django app to follow plugin pattern 2018-02-01 15:30:06 -05:00
Gregory Martin
61306c8f10 Merge pull request #17377 from edx/fysheets/EDUCATOR-2230 
Update video record handling defensiveness
 2018-02-01 14:10:36 -05:00
Feanil Patel
bc790400a9 Merge pull request #17374 from edx/feanil/hackathon_logging 
Make the logging config easier to read.
 2018-02-01 11:14:16 -05:00
Feanil Patel
de80ab751a Remove the debug override. 2018-02-01 10:08:40 -05:00
Awais Jibran
1e16bfd936 On course run create request, validate course team user and raise validation error 2018-02-01 14:17:35 +05:00
Jeremy Bowman
5289c7e828 PLAT-1915 Stop using deprecated BaseException.message 2018-01-31 17:22:01 -05:00
Gregory Martin
61b8bd4d7a Update video record handling defensiveness 2018-01-31 16:58:51 -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