Commit Graph

222 Commits

Author SHA1 Message Date
Calen Pennington
a2137cec35 Merge pull request #2603 from cpennington/xblock-acid-resources-test
Add tests of local_resource_url
2014-02-25 16:46:10 -05:00
Calen Pennington
9126777ed7 Add test of local_resource_url in AcidBlock 2014-02-25 14:01:37 -05:00
Alexander Kryklia
25407ef3e7 BLD-642: Allow multiple transcripts with video. 2014-02-24 21:57:08 +02:00
Julia Hansbrough
552572694f Added middleware for handling language changes 2014-02-14 22:34:29 +00:00
Julia Hansbrough
7d81a510bc Moved UserPreferences to common 2014-02-14 10:32:11 -05:00
Julia Hansbrough
5131818153 Merge pull request #2597 from edx/release
Release
2014-02-13 15:17:38 -05:00
Calen Pennington
3a7b265c8a Add trailing commas to multiline lists, to prevent string concatenation bugs 2014-02-13 13:12:42 -05:00
Ali Reza Sharafat
85058ec460 Course short descriptions -- couple of more asserts and pep8 fixes 2014-02-12 20:24:26 +00:00
Frances Botsford
34ea03c887 fixed missing polyfill buttons, adjusted layout of number input in component editor
UX-381
2014-02-11 15:20:00 -05:00
Carson Gee
69097e7b4a Merge pull request #2032 from carsongee/cg/ssl-studio
More fully integrate and test ssl external auth in CMS
2014-02-04 09:54:17 -08:00
Carson Gee
8cbe263ca0 Rename of feature AUTH_USE_MIT_CERTIFICATES to AUTH_USE_CERTIFICATES across platform.
Caution! This is backwards incompatible
2014-02-04 10:50:48 -05:00
Calen Pennington
f5ffc94d16 Prep for initial language release 2014-02-03 13:35:56 -05:00
Julia Hansbrough
3aa80654cb Midcourse reverification: fixing broken tests
Also, refactored code representing ReverifyInfo
2014-01-31 22:08:09 +00:00
Julia Hansbrough
0b7594178b Moved reverification windows into common
Added verification sidebar, banner for major courseware sections, quality & test improvements
2014-01-31 22:08:08 +00:00
Chris Dodge
0d49305c4d add ability to have an optional password policy enforcement on account creation 2014-01-30 15:32:05 -05:00
Chris Dodge
8c60f2935a Add optional feature to lock out accounts after N failed login attempts. Lockouts will last M seconds.
add DB migration and fix earlier mistakes in student migration history

add tests and fix bugs that came out of those unit tests

remove unused import

pep8/pylint

address some PR feedback

fix tests

fix broken test

try to mock time

use freeze-gun to overload the system time to simulate the future
2014-01-29 16:54:28 -05:00
David Baumgold
b25b3e1bef Move doc_url function out of edxmako middleware 2014-01-29 14:52:43 -05:00
Calen Pennington
271fbdb40a Switch dark_lang to database backed configuration 2014-01-29 13:24:41 -05:00
Calen Pennington
d379b35fa9 Add config_model, a library for database backed configuration
ConfigurationModels can be managed using the admin site. They are
append-only, and track the user who is making the change, and the time
that the change was made. The configuration is stored in the database,
and cached for performance.

[LMS-1220]
2014-01-29 09:17:19 -05:00
Calen Pennington
881e3ba564 Add the ability to dark-launch languages
To mark a language as dark-launched, add it to the DARK_LANGUAGES
django conf setting. To activate a dark-launched language, set he
query parameter `preview-lang` to the language code on any url.

[LMS-2045]
[LMS-2077]
[LMS-2076]
2014-01-29 09:16:16 -05:00
Dave St.Germain
6d50ff7b61 Set the html language to the browser's specified language 2014-01-28 16:43:29 -05:00
Chris Dodge
fcefada2d7 add middleware to be able to expire inactive sessions after N seconds
configure middleware

add test for session inactive timeouts

add Studio inactive session timeout test

change login method used

add create_test_account to test

make sure the expected redirect URL is right

fix indenting problem

fix doc string since we moved from minutes to seconds

use utility methods rather than calling another test to set up and activate an account

clean up code violations

respond to PR feedback

use optional params to make code cleaner

pylint fix on test files
2014-01-24 10:36:21 -05:00
Don Mitchell
3885e6cf78 Merge branch 'release'
Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html
2014-01-16 12:51:22 -05:00
Don Mitchell
ad3140a6e6 Cleaned up modules to reflect centralizing auth 2014-01-14 17:04:44 -05:00
Don Mitchell
3ebac80778 Replace authz fns with roles.py ones
STUD-1006
2014-01-14 17:04:44 -05:00
Chris Dodge
a3211a7405 Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org
fix errorenous logic when running a microsite that could reside in a hosting environment with a marketing site in front of it

pep8/pylint fixes

address PR feedback, remove underscore from test hostname

more pep8/pylint cleanup. Skip test_microsites test, it works on localdev, not on Jenkins. Need to talk with QA team

manually add Ned's single-to-double quote fix

change aws.py runtimes so that the microsite_dir that is read from configuration is changed to a python path

Conflicts:
	lms/templates/help_modal.html
2014-01-14 14:36:01 -05:00
Calen Pennington
417fe21d05 Enable pure XBlocks, but behind a feature flag
[LMS-226]
[LMS-2013]
2014-01-10 11:40:03 -05:00
Calen Pennington
aa57481ecc Add handler_url usable by descriptors
[LMS-1614]
2013-12-20 14:05:53 -05:00
Will Daly
1081786c6f Merge pull request #1965 from edx/will/fake-server-refactor
Stub Server Port Conflicts and Refactor
2013-12-19 06:55:24 -08:00
Will Daly
0fd03cfb02 Moved stub servers to terrain
Refactored stub services for style and DRY

Added unit tests for stub implementations

Updated acceptance tests that depend on stubs.

Updated Studio acceptance tests to use YouTube stub server; fixed failing tests in devstack.
2013-12-19 09:12:41 -05:00
Don Mitchell
5f2517978d Move default DOC_STORE_CONFIG to common 2013-12-17 13:09:38 -05:00
Will Daly
7bf68907f3 Merge pull request #1935 from edx/will/ignore-symlink-staticfiles
Add ignore patterns for staticfiles to avoid processing symlink dirs
2013-12-16 09:01:17 -08:00
Will Daly
4c842409f7 Add ignore patterns for staticfiles to avoid processing symlink dirs 2013-12-12 10:33:38 -05:00
Bertrand Marron
4e641b946d Add default email settings
These are the django default settings.
2013-12-11 16:11:23 +01:00
David Baumgold
fb13bed947 Updating comments and docs for MITx -> edX transition 2013-12-10 13:21:18 -05:00
David Baumgold
bbcd8affa9 Merge pull request #1839 from edx/db/mitx-root-url
MITX_ROOT_URL => EDX_ROOT_URL
2013-12-04 12:17:13 -08:00
David Baumgold
b32f2bc170 MITX_ROOT_URL => EDX_ROOT_URL 2013-12-04 12:59:35 -05:00
Brian Talbot
d95b46dd19 Studio: adding back in links (and supporting styling) to ToS and Privacy Policy to footer and sign up UI
STUD-151
2013-12-04 12:03:25 -05:00
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
David Baumgold
8eff442752 mitxmako => edxmako 2013-12-03 14:15:09 -05:00
Gabe Mulley
9ad435a8b8 fix emission of enrollment events from the CMS
I suspect there are very few circumstances that an enrollment event is emitted from the CMS, but if it ever were to happen, it would bomb out because the "crum" middleware is not used in that app.  We are hoping to replace this request caching hack in the near future, but for now it is the best option we could come up with.

I noticed the stack appear when I created a new course in my dev environment.  Presumably the course author is automatically enrolled in the course, which, causes the tracking code to bomb out.  Luckily we catch the error and just log it, but we really should be capturing this type of enrollment event.
2013-11-18 08:48:46 -05:00
Brian Talbot
cb92b75343 Merge pull request #1647 from edx/talbs/fix-studio-notificationsie
Studio: Resolves Notifications UI showing in IE9 + CSS Split
2013-11-14 13:05:47 -08:00
Will Daly
b7dab70628 Added devstack settings
Fixed pep8/pylint violations

Added email feature flags; use full names for pylint disables
2013-11-12 13:48:29 -05:00
Brian Talbot
722ddb62d3 Studio: resolves IE notifications display issue and abstracts CSS to avoid IE selector/rule limit
STUD-815
2013-11-12 13:00:22 -05:00
Calen Pennington
da26ae2529 Remove lms/lib from sys.path in favore of using it as the module lms.lib 2013-11-08 11:08:48 -05:00
Adam
98b3d18edc Merge pull request #1492 from edx/adam/remove-@edx
remove instances of @edx.org email addresses in our default settings (Bug: LMS-1363)
2013-11-04 08:02:08 -08:00
Brian Talbot
95dd21738c Studio: revises CSS reference/pipeline architecture for better organization, reduced redundancy, and to handle IE9 selector limits 2013-10-26 21:26:53 -04:00
Adam Palay
6b6e568063 remove instances of @edx.org email addresses in our default settings
Bug: LMS-1363
2013-10-24 17:02:15 -04:00
Anton Stupak
aecc20af6b Add Timed Transcripts Editor. 2013-10-22 21:45:03 +03:00
e0d
fb62f0c52a Merge pull request #1417 from edx/e0d/config-fix
E0d/config fix
2013-10-21 07:29:52 -07:00