Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,031 Commits 1 Branch 0 Tags
4e1826a5dd2c8fe930e79666995cd2c45f2bcb85
Commit Graph

8107 Commits

Author SHA1 Message Date
Anthony Mangano
07609e7d75 Add password_policy checks to login views 
LEARNER-4869
 2018-05-04 11:55:57 -04:00
Michael Roytman
085817f487 Merge pull request #18085 from edx/mroytman/pass-course-details-to-image-modal 
pass courseDetails to editImageModal
 2018-05-03 14:15:59 -04:00
Stu Young
7b76ab8a4d Merge pull request #18023 from edx/estute/TE-2427-reshard-lms4 
Reshard python unittests
 2018-05-03 11:53:32 -04:00
Stuart Young
1fd2167144 rebalance python unittests onto new shards 2018-05-03 11:16:05 -04:00
Ari Rizzitano
7489753638 add base factory into textbooks factory 2018-05-02 15:15:16 -04:00
Eric Fischer
2556864bfb Merge pull request #18106 from edx/efischer/is_it_this_easy 
Silence deprecation warnings
 2018-05-02 14:17:05 -04:00
Alex Dusenbery
2b48649a9e EDUCATOR-2771 | Adds an LMS API endpoint to retire a user account. 2018-05-02 13:10:03 -04:00
Eric Fischer
e18448e27d Silence deprecation warnings 
https://docs.djangoproject.com/en/1.11/releases/1.10/#using-user-is-authenticated-and-user-is-anonymous-as-methods
 2018-05-02 10:03:50 -04:00
Brian Mesick
2be587d32d Merge pull request #18014 from edx/bmedx/retirement_state_mgmt 
Add a management command and settings to populate RetirementState models
 2018-04-30 09:28:21 -04:00
Feanil Patel
49a2a5d1b7 Merge pull request #18072 from stvstnfrd/clean/virtual-universities 
Remove unused VIRTUAL_UNIVERSITIES setting
 2018-04-27 15:22:04 -04:00
Feanil Patel
ae8e525ba2 Merge pull request #18080 from edx/feanil/remove_flaky_handout_tests 
Remove these tests because they are flaky.
 2018-04-27 15:18:58 -04:00
sanfordstudent
965c462418 Merge pull request #18061 from edx/sstudent/grading-policy-stuff 
rate limit
 2018-04-27 15:12:21 -04:00
Michael Roytman
8e9e3dac2f pass courseDetails to editImageModal 2018-04-27 13:29:39 -04:00
Feanil Patel
2c7dd7b97c Remove these tests because they are flaky. 
They all rely on modifying the handout which can sometimes fail.
 2018-04-27 10:48:04 -04:00
stv
3cc9d78ca8 Remove unused VIRTUAL_UNIVERSITIES setting 
It looks like this was part of the original rollout of the microsites
feature back in December 2013 [1], but was quickly removed in February
2014 [2]. These references have been orphaned ever since.
I can find no other references to it in the platform, save these.

[1] a3211a7405
[2] aa43689a93
 2018-04-26 20:03:14 -07:00
Giulio Gratta
1a7110f0e0 Get MKTG_URL_LINK_MAP from ENV_TOKENS in CMS 2018-04-26 16:57:07 -07:00
Ned Batchelder
c346b6423e Merge pull request #17748 from open-craft/jill/swift_content_length_from_fd_master 
Set SWIFT_CONTENT_LENGTH_FROM_FD=False
 2018-04-26 17:03:31 -04:00
Sanford Student
3f91238564 rate limit 2018-04-26 15:06:29 -04:00
Ned Batchelder
a8e0d81f0f Merge pull request #18001 from edx/nedbat/release-line-meta-tag 
Report the RELEASE_LINE in a meta tag
 2018-04-23 17:43:06 -04:00
irfanuddinahmad
0195e9720d added admin site settings 2018-04-23 19:47:40 +05:00
Michael Roytman
ecab1286a6 Merge pull request #18006 from edx/mroytman/add-accessibility-image-best-practice-doc-link 
add image accessibility best practice documentation URL and pass thro…
 2018-04-20 16:08:59 -04:00
bmedx
c68fac160b Add default retirement states to settings 2018-04-20 14:11:47 -04:00
Michael Roytman
b6e90f4dff prevent loading both production and development CSS from the studio-frontend container 2018-04-20 13:39:03 -04:00
Michael Roytman
03a9e85272 add image accessibility best practice documentation URL and pass through to studio-frontend edit image modal 2018-04-20 13:38:15 -04:00
Ibrahim Ahmed
5e1cc755d5 Merge pull request #17936 from edx/ibrahimahmed443/WL-1519-duplicate-course-fix 
catch duplicate course error
 2018-04-20 14:03:59 +05:00
Ned Batchelder
55d823da15 Report the RELEASE_LINE in a meta tag 2018-04-19 17:36:42 -04:00
Jeremy Bowman
1f3f0e2fb9 TE-2547 Add dependency analysis scripts 2018-04-19 13:48:08 -04:00
Jeremy Bowman
28d291dce7 TE-2527 Move test and dev dependencies out of base.in 2018-04-18 14:44:31 -04:00
Michael Youngstrom
2e108357b5 Remove failing js test 2018-04-17 14:17:33 -04:00
Mushtaq Ali
5a9477af30 Import video transcripts - EDUCATOR-2173 2018-04-16 12:05:44 +05:00
J Eskew
0269d4a536 Merge pull request #17868 from edx/jeskew/check_for_retired_username 
Reject acct creation when using a retired username.
 2018-04-13 15:15:10 -04:00
John Eskew
338d4551ab Reject acct creation when using a retired username. 
Change from specifying a retired username/email format to specifying
  a retired username prefix and a retired email prefix/domain,
  preventing possible config errors due to unexpected/bad formats.
 2018-04-13 14:27:21 -04:00
Michael Terry
a34c8c8233 Drop remaining coffee use 
This basically commits the transpiled CoffeeScript JS (with minor
cleanup) and removes coffee build support.

A tiny amount of support for xblocks exists, because external users
may have xblocks with coffee. But no coffee in our tree anyway.
 2018-04-13 14:10:40 -04:00
J. Cliff Dyer
964c20252b Add DISABLE_START_DATES setting to CMS 2018-04-13 14:05:45 -04:00
Ibrahim
a7e1ddf729 catch duplicate course error 2018-04-13 17:34:27 +05:00
Farhanah Sheets
b613494a0a Merge pull request #17907 from edx/fsheets/tinymce-align 
Add alignment options to the TinyMCE platform plugin
 2018-04-12 13:16:15 -04:00
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
irfanuddinahmad
3e426aca91 New command to migrate transcripts to S3 2018-04-12 16:57:23 +05:00
Farhanah Sheets
d8d7e33879 Merge pull request #17905 from edx/fsheets/sfe-search-cleanup 
Remove Studio Assets Search Waffle & Add test
 2018-04-10 17:14:21 -04:00
Farhanah Sheets
752cf12938 Add align buttons to test check 2018-04-10 17:10:05 -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
Douglas Hall
fb5904f776 Remove uses of the course_structure API. 2018-04-09 12:39:13 -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
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
Jillian Vogel
8a579d9236 Set SWIFT_CONTENT_LENGTH_FROM_FD=False 
Works around a bug with Django SWIFT storage uploads in edx-platform, cf
https://github.com/dennisv/django-storage-swift/pull/100

Also adds SWIFT_LAZY_CONNECT to cms.envs.openstack, to balance with the lms settings.
 2018-04-03 00:42:29 +09:30
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