Commit Graph

99 Commits

Author SHA1 Message Date
David Baumgold
fc5148438d Merge pull request #4730 from edx-solutions/secure-cookies
secure-cookies: Allow to use secure HTTPS cookies (Django setting)
2014-10-09 10:24:34 -04:00
Piotr Mitros
af12acc904 Clean up conventions for underscores vs. dashes in config setting. 2014-09-12 11:52:11 -04:00
Piotr Mitros
31176aeb37 AWS settings for XBlocks to have filesystem-like storage
Upgrades to latest pyfs to support auth not through environment variables
2014-09-08 10:46:18 -04:00
Ben Patterson
fe85223f73 Revert "AWS settings for XBlocks to have filesystem-like storage" 2014-09-02 11:29:59 -04:00
Piotr Mitros
ce2e51384f AWS settings for XBlocks to have filesystem-like storage 2014-09-02 10:39:01 -04:00
Ben McMorran
098c1d59cd Add bokchoy tests for course reruns 2014-08-22 17:41:41 -04:00
Xavier Antoviaque
e8259b8234 secure-cookies: Allow to use secure HTTPS cookies (Django setting)
Cf https://docs.djangoproject.com/en/1.4/ref/settings/#std:setting-SESSION_COOKIE_SECURE
2014-08-07 09:30:51 +02:00
David Adams
9e45e8f982 Refactor ADVANCED_COMPONENT_TYPES
Modified to a setting in CMS common.py and aws.py
    Also factored out are: ADVANCED_PROBLEM_TYPES

    This enables third parties to add XBlocks to their system
    without having to make a code change.

    Code also added to ensure that a component should exist in both
    ADVANCED_COMPONENT_TYPES and the course advanced module list
    in order for it to be enabled in the course.
2014-08-04 12:17:45 -07:00
John Jarvis
5b686f9bdf removing syslog_addr
This is not currently being used in production and will not
be used moving forward since logs are remoted using splunk
2014-07-25 10:43:58 -04:00
zubair-arbi
cfa873cc1d ignore MAC meta files on import and also remove any such files from the course
STUD-1725
2014-07-21 13:16:00 +05:00
Nimisha Asthagiri
7503cc2473 reverting back to migrating the settings in the env files 2014-07-14 11:59:40 -04:00
Nimisha Asthagiri
4859eee23b Move modulestore django settings migration code down into the modulestore layer so it works for all django-based callers. 2014-07-14 11:59:40 -04:00
Nimisha Asthagiri
a9213509c3 Enable Mixed Modulestore STUD-1540
Refactor get_parent_locations STUD-1663
2014-06-26 18:00:11 -04:00
Carson Gee
faefba9182 Add ADDL_INSTALLED_APPS to studio for parity with lms 2014-05-14 10:20:21 -04:00
Gabe Mulley
36269bd5a8 Integrate event-tracking in to the LMS
Support incremental conversion of events from the old API to the new, in order to ensure the new system is working, enrollment events have been modified to make use of the new API.
2014-05-01 14:04:35 -04:00
Chris Dodge
d5bb1b5cca Add some optional policies around password resets, such as password reuse, forced password resets, allowed frequency of password resets 2014-03-31 10:30:58 -04:00
Nimisha Asthagiri
3bcf619f0d Merge pull request #2910 from edx/frances/feature/studio-nav-manipulation2
Frances/feature/studio nav manipulation2
2014-03-21 15:13:22 -04:00
Nimisha Asthagiri
e86b4a12dc Changes for viewing built-in tabs in studio
Changed "Status Page" -> "Page".

UX:
    support for displaying built-in tabs
    restored drag and drop on Studio Pages
    additional styling for fixed state on Studio Pages
    add a new page action added to bottom of Studio Pages

Dev
    changes for viewing tabs in studio,
    refactored the tab code,
    decoupled the code from django layer.
    is_hideable flag on tabs
    get_discussion method is needed to continue to support
external_discussion links for now since used by 6.00x course.
    override the __eq__ operator to support comparing with
dict-type tabs.

Test
    moved test code to common,
    added acceptance test for built-in pages
    added additional unit tests for tabs.
    changed test_split_modulestore test to support serializing objects
that are fields in a Course.

Env:
    updated environment configuration settings so they are
    consistent for both cms and lms.
2014-03-21 13:58:01 -04:00
Carson Gee
ccbb909b0d Adding ability to give an attribute callback for CAS 2014-03-14 13:22:14 -04:00
Carson Gee
4099fc9af0 Correct misaligned django-cas integration 2014-03-04 09:35:08 -05:00
Chris Dodge
aa43689a93 This PR addresses the open feedback on the Microsites feature 2014-02-28 16:27:12 -05:00
Chris Dodge
fce30825df allow the prevention of the LMS/CMS from being renderable in an iframe 2014-02-28 14:21:07 -05:00
Carson Gee
f02c074db9 Push To LMS updates
Added tests
Converted scripts to django commands
Removed advanced module requirement
Generalized to platform
Switched to subprocess for shell commands
Beefed up resiliency and error checking.
Refactored since #1910 removed get_location_and_verify_access
Added settings to aws for export directory and reworked test setup and teardown
Several review based fixes
Added line to Changelog
Changed URL handler to be accepting and moved git bare repo inside of test_root/data
Added exception logging to help trace issues
Added output in exception logging
Made the branch to commit to explicit instead of implicit
Skipping git identity test on condition of global configuration set
2014-02-13 10:21:18 -05:00
Feanil Patel
2aab8f89f2 Pull THEME_NAME from envs tokens if it's there.
If the FEATURES['USE_CUSTOM_THEME'] flag is set but the
'THEME_NAME' is not set.  We get a compilation error during
cms gather assets.
2014-02-05 18:40:03 -05:00
Chris Dodge
7cd343e031 wire in env settings into aws.py 2014-01-30 16:38:43 -05:00
chrisndodge
5951eb8dae Merge pull request #2379 from edx/chrisndodge/lock-accounts-after-failed-attempts
Add AWS.py configuration hooks to tie in login failure lockout parameters
2014-01-30 13:08:48 -08:00
Chris Dodge
cdf8b7cf16 add aws.py hooks 2014-01-30 15:38:02 -05:00
Chris Dodge
0d49305c4d add ability to have an optional password policy enforcement on account creation 2014-01-30 15:32:05 -05:00
Calen Pennington
271fbdb40a Switch dark_lang to database backed configuration 2014-01-29 13:24:41 -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
David Ormsbee
6e6a1d5021 Only create loc_cache CACHE entry if it doesn't exist in ENV_TOKENS config. 2014-01-28 12:30:38 -05:00
David Ormsbee
ee5ee92b37 Create local memory caching entry for location mapping. 2014-01-28 10:57:15 -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
Bertrand Marron
ddff90c1cb Fix auth email configuration
Fix bug introduced by #1919: usage of not-yet-defined AUTH_TOKENS dict.
2013-12-13 17:02:50 +01:00
Bertrand Marron
f576673a87 Add email configuration to cms/envs/aws.py
This allows emails to be sent by Studio.
2013-12-11 16:11:23 +01:00
Will Daly
e0fe8bcdc7 Removed extra trailing slash from STATIC_URL in devstack
Let staticfiles determine the footer URLs
2013-12-05 13:47:10 -05:00
David Baumgold
79815acc6e Fall back on MITX_FEATURES env variable if FEATURES isn't found
For a smoother transition to the new world
2013-12-03 16:29:48 -05:00
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
Feanil Patel
729f2e3bfa Merge pull request #1637 from edx/feanil/aws_creds
Set empty aws credentials to None.
2013-11-20 07:57:16 -08:00
John Jarvis
693cfdea50 'ignore' shouldn't be use for ascii conversion
The input string is not expected to contain any unicode characters
2013-11-19 14:34:06 -05:00
John Jarvis
71184220e6 convert STATIC_URL to ascii 2013-11-19 12:25:59 -05:00
John Jarvis
0e6b21ef71 adding slash 2013-11-19 11:40:31 -05:00
John Jarvis
54bb55fa52 fixes issue where STATIC_URL was overwritten without git.revision
fixes this commit - 5ec77010e3
2013-11-19 11:35:45 -05:00
John Jarvis
399df1141e resolving merge conflicts 2013-11-18 11:52:26 -05:00
John Jarvis
f5a772135d adding override for GITHUB_REPO_ROOT
This is the base directory for course data
2013-11-18 11:24:45 -05:00
John Jarvis
5ec77010e3 allow override for STATIC_URL 2013-11-18 10:54:12 -05:00
Feanil Patel
9dd182800b Set empty aws credentials to None. 2013-11-08 12:22:09 -05:00
John Jarvis
68d31b9808 adding STATIC_ROOT_BASE to lms/envs/aws.py 2013-10-23 10:30:05 -04:00
John Jarvis
25c6f9455b fixes static_root override 2013-10-23 10:28:09 -04:00
John Jarvis
1ac732abb4 adding git.revision for cms 2013-10-22 12:08:48 -04:00