Commit Graph

1774 Commits

Author SHA1 Message Date
Adam Palay
c9c8116da7 Revert "Merge pull request #11324 from edx/ahsan/rc-add-service-user-in-cms"
This reverts commit a84b81113b, reversing
changes made to 0d1765e190.
2016-01-25 12:45:07 -05:00
Ahsan Ulhaq
31ec8ef708 Add service username in cms settings 2016-01-25 20:04:10 +05:00
Zia Fazal
c0648ab164 moved IS_EDX_DOMAIN dependent feature to edx.org theme 2016-01-22 15:32:19 -05:00
Awais Jibran
c2255ef0d6 Merge pull request #11226 from edx/aj/ecom3384-course-image-breaking
Studio - Schedule & Details tab broken
2016-01-22 18:56:15 +05:00
Ahsan Ulhaq
46df454536 Merge pull request #11241 from edx/feature/credentials-phase-1
Feature/credentials phase 1
2016-01-22 18:39:53 +05:00
Awais Jibran
8a6699a46d Studio breaks DEFAULT_COURSE_ABOUT_IMAGE_URL is not set in settings in cms
ECOM-3384
2016-01-22 16:49:57 +05:00
Piotr Mitros
3b2e0ddb83 Merge pull request #11229 from edx/pmitros/minor-studio-settings-cleanup
Minor cleanup of Studio settings
2016-01-21 14:38:24 -05:00
Braden MacDonald
5e3cc70783 Merge pull request #10943 from open-craft/email-authorized-list-master
Allow each instance to configure restrictions on allowed email addresses
2016-01-20 14:51:29 -08:00
Braden MacDonald
110714ee81 Allow each instance to configure restrictions on allowed email addresses 2016-01-20 11:03:30 -08:00
Giovanni Di Milia
bb36ab013f Added CCXCon app
The CCXCon app is used to push course updated to the CCXCon
 externale service.
2016-01-20 10:47:37 -05:00
Ahsan Ulhaq
8798ee0f53 Add credentials service user 2016-01-20 12:51:48 +05:00
Ahsan Ulhaq
6f8727a285 Create placeholder django apps for credentials
ECOM-3057
2016-01-20 12:50:29 +05:00
Jim Abramson
adb70e44b7 Merge pull request #11218 from edx/jsa/studio-id-token-expiration
Set default id token expiration to 5m for Studio
2016-01-15 11:37:47 -05:00
Piotr Mitros
6b6248b44a Minor cleanup of Studio settings: removing extra indirection, and advanced components list 2016-01-15 11:21:52 -05:00
Felipe Montoya
4742e661f4 Creating a settings object that is aware of the microsite settings.
Adding the declaration of the settings object to openedx.conf to be able to import it from a nicer location

Resolving quality violations

Merging dicts with the settings definition when they exist in the microsite configuration

Using a cache to improve the perfomance of quering any dictionary in the microsite definition

Ignoring the invalid-name pylint warning since the names must be kept thsi way to stay the same as the ones in django.
Removing the default dict argument as per https://docs.python.org/2/tutorial/controlflow.html#default-argument-values

Extracting the implementation of the microsite to a selectable backend.

Leaving the function startup.enable_microsites for backwards compatibilityy

Adding a database backend

Using a cache to improve the perfomance of quering any dictionary in the microsite definition.
Changed the database backend so that it extends the settings file backend and removed all the unnecessary methods.

Using the backend provider for the get_dict function

some tweeks and some initial unit tests

Using getattr as a function insteal of calling the underlying __getattr__ directly

Adding an ModelAdmin object for the microsite model in the django-admin panel

refactor enable_microsites()

consolidate/refactor some shared code

add config to aws.py and add migration files

fix tests

Changes to get the backends to run after the refactor

add archiving capabilities to microsites. Also make a few notes about performance improvements to make

fix tests

Making the query to find if microsites exist in the database faster

add ORG to microsite mapping tables and some performance improvements

allow for Mako templates to be pulled from the database

fix tests

For the database template backend the uri of the template does not use the filesystem relative path

Fixing pylint violations

Added caching of the templates stored in the database

Fixing pylint errors

fix pylint

Clearing the cache on model save

Fixing pylint errors

rebased and added test coverage

rebased cdodge/microsite-improvements branch with master and added test
coverage

added missing migration

fix quality violations

add more test coverage

mattdrayer: Add microsite_configuration to cms.INSTALLED_APPS

added microsite settings to cms/envs/test.py

run session cookie tests only in LMS

fixed broken tests

putting middleware changes back

Preventing the template_backend to be called on requests which have no microsite

changes to address feedback from mjfrey

changed BaseMicrositeBackend to AbstractBaseMicrositeBackend

changes after feedback from mattdrayer

fixed broken tests and quality violations

Allowing the backend to handle the enable_pre_startup routine

Typos and docstrings

Adressing feedback

Fixing python tests

add comment to explain why we need enable_microsites_pre_startup()
2016-01-15 14:52:36 +05:00
jsa
08cb9fc03f Set default id token expiration to 5m for Studio 2016-01-13 17:30:17 -05:00
Piotr Mitros
e87fabe45e Merge pull request #8289 from edx/danielli/pyfs_xblocks
Add setting for pyfs xblock service to devstack.py
2016-01-06 17:21:30 -05:00
AlasdairSwan
f25d8a16ee ECOM-3319 loading edx-icons fonts in studio programming author tool 2016-01-06 12:08:47 -05:00
swdanielli
ac66b4a8cd Add setting for pyfs xblock service 2016-01-05 23:09:09 +00:00
arbabnazar
49d8ec3543 DEVOPS-3388 Remove unused setting from edxapp configuration 2016-01-01 12:50:42 +05:00
Usman Khalid
5e972b2a66 Merge pull request #11022 from edx/bookmarking
Bookmarking
2015-12-22 18:25:48 +05:00
Sarina Canelake
2bc7b954ab Remove the graphical slider tool 2015-12-17 13:24:00 -05:00
Usman Khalid
4304c66c54 Performance optimizations and cache to keep the bookmarks info updated.
The cache uses the bookmarks.XBlockCache model.

TNL-1945
2015-12-17 22:07:34 +05:00
Diana Huang
ba526f4f39 Merge pull request #11008 from edx/release
Release
2015-12-16 12:05:20 -05:00
Renzo Lucioni
23c582d01d Delete dead SUBDOMAIN_BRANDING setting. 2015-12-15 14:42:09 -05:00
Sven Marnach
d35effc8d2 Add the ActiveTable and Vector Draw XBlocks to ADVANCED_COMPONENT_TYPES. 2015-12-15 13:58:06 +01:00
Sarina Canelake
21e4c90c3f Keep 'peergrading' and 'combinedopenended' defined as deprecated 2015-12-11 16:16:08 -05:00
Sarina Canelake
c6c5230941 Create sample deprecated blocks for bok choy tests 2015-12-11 15:07:12 -05:00
Sarina Canelake
27cb3080c2 Remove final CMS references to 'peergrading' and 'combinedopenended' 2015-12-11 15:07:10 -05:00
Sarina Canelake
f691b7b664 Remove all references to open_ended and s3 interfaces (ORA1) 2015-12-11 15:05:00 -05:00
Sarina Canelake
d887c0fef1 Remove 'open_ended_grading' djangoapp & URLs (ORA1) 2015-12-11 15:04:59 -05:00
Zia Fazal
2cb2233dde initial change set. add org autocomplete
added unit tests and fixed JS tests

added bok choy tests

fixed broken botchoy tests

fixed course discovery broken test

removed monkey patch at class level

changes after feedback from matte
2015-12-11 18:39:55 +05:00
Sarina Canelake
8928e9ef19 Remove CallStackManager (PLAT-931) 2015-12-08 10:21:55 -05:00
David Baumgold
58daa365cd re-enable edx.org comprehensive theme 2015-12-03 17:18:55 -05:00
Douglas Hall
63bee2a8ad Merge pull request #10600 from edx/task/douglashall/PHX-201/xblock_lti_consumer
Sprint Solutions:Zug PHX-200 PHX-201 Adding LTI consumer XBlock to requirements
2015-11-30 16:18:14 -05:00
Douglas Hall
74c19c2854 Adding LTI consumer XBlock to requirements; Updating xblock-utils requirement 2015-11-30 11:58:51 -05:00
Renzo Lucioni
70d57327eb Add Programs tab to Studio
Extends the Programs ConfigurationModel, cleans up Programs-related utilities and corresponding tests, and corrects caching. Uses the Programs API to list programs within Studio. ECOM-2769.
2015-11-25 14:56:50 -05:00
Ned Batchelder
e16fad3540 Add the Microsoft Office Mix XBlock 2015-11-24 09:04:12 -05:00
Ned Batchelder
f5d0f3ff55 Remove useless pylint suppressions 2015-11-22 07:41:19 -05:00
Usman Khalid
dc7b57f459 Cleanup some settings. 2015-11-20 18:18:32 +05:00
Ned Batchelder
ccc6e5077d Make sure Studio has a secret key 2015-11-13 12:30:54 -05:00
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
2015-11-10 15:00:19 -05:00
David Baumgold
792c3d93c1 Remove legacy MITX_FEATURES reference 2015-11-03 15:37:41 -05:00
chrisndodge
7868067879 Merge pull request #9744 from edx/cdodge/timed-exams
Timed Exams
2015-10-30 11:03:59 -04:00
Muhammad Shoaib
9476898df0 Add Timed Exams as a feature to edx-platform 2015-10-30 08:44:33 -04:00
Peter Fogg
5ffa06bed1 Responding to review comments. 2015-10-28 16:44:36 -04:00
Peter Fogg
0107525d41 Enable self-paced courses behind a feature flag. 2015-10-28 14:33:11 -04:00
Jim Abramson
edf09d84e9 Merge pull request #10350 from edx/jsa/ecom-2657
Programs: added platform support package and configuration model.
2015-10-27 09:10:23 -04:00
Piotr Mitros
da709bbcb6 Merge pull request #8597 from edx/pmitros/RateXBlock
XBlock for rating course content
2015-10-26 10:06:36 -04:00
jsa
1bb29289f2 Programs: added platform support package and configuration model.
ECOM-2657
2015-10-25 21:30:26 -04:00