Commit Graph

202 Commits

Author SHA1 Message Date
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
e0d
5adf524ad6 removing redundant default. 2013-10-21 09:55:27 -04:00
cahrens
a8ad56fa0e Remove pipeline config not needed with RequireJS.
Was re-introduced in a bad merge.
2013-10-18 15:57:50 -04:00
e0d
6700a3ec14 Fixes for the AWS environment config. 2013-10-18 15:56:15 -04:00
brianhw
f831a0adcb Merge pull request #1406 from edx/post-release-2013-10-17-master
Post release 2013 10 17 master
2013-10-18 11:16:24 -07:00
Brian Wilson
aa172272f3 Update master with hotfixes from release-2013-10-17. 2013-10-18 11:50:42 -04:00
Gabe Mulley
d2b03e28fb add course_id to event context 2013-10-17 17:44:01 -04:00
Adam Palay
1fc993ce18 add functionality to disable users
add middleware to detect students with disabled accounts

add tests
2013-10-16 16:57:11 -04:00
David Baumgold
cbaa3089ba Updated comment 2013-10-09 15:54:01 -04:00
David Baumgold
16ca0252b3 Clarify USE_I18N settings
@jzoldak showed me that setting `USE_I18N = DEBUG` didn't actually accomplish
what I had hoped it would -- changing DEBUG didn't also change USE_I18N.
This pull request accomplishes what I was trying to accomplish, without being
quite so clever about it.
2013-10-09 09:04:12 -04:00
David Baumgold
4879b06c2a Merge pull request #1235 from edx/db/tie-i18n-to-debug
Tie the USE_I18N setting to DEBUG setting
2013-10-09 05:45:20 -07:00
David Baumgold
fd7e8baccb Tie the USE_I18N setting to DEBUG setting
We want USE_I18N to be on in development, but off in production. Tying
this setting to the DEBUG setting accomplishes that neatly.
2013-10-07 15:04:15 -04:00
Julian Arni
57b38969e5 Move import-related js to import.js 2013-10-07 09:57:20 -04:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
Calen Pennington
d77491e46a Pull XModule attributes out into a mixin that can be applied to xblocks 2013-09-27 13:11:05 -04:00
Greg Price
7275f85232 Merge branch 'release' 2013-09-24 15:27:18 -04:00
cahrens
ab6af2b586 Put assets JavaScript code back in something that goes through pipelining. 2013-09-24 11:49:54 -04:00
Julian Arni
e5c90d33fc Fix middleware order in CMS.
And include Don's fix for partial course_id lookup.
2013-09-23 15:11:06 -04:00
cahrens
01d7d48f8f Create backbone models/views for assets.
cleanup

Updates.

Testing changes.

Testing changes.

asset-index progress state cleanjup.

cleanup
2013-09-20 10:44:54 -04:00
Gabe Mulley
761a4dcc97 Make URL patterns to exclude from tracking configurable
* Add unit test coverage for this "exclusion from tracking" logic
* Exclude based on regex match instead of raw string comparison
* Exclude heartbeat requests from tracking
2013-09-13 11:24:51 -04:00
Carlos Andrés Rocha
87fcf1ab9e Merge pull request #905 from rocha/datadog-statsd
Remove dogstatsd-python in favor of dogapi
2013-09-12 06:53:02 -07:00