Commit Graph

6583 Commits

Author SHA1 Message Date
Peter Desjardins
d6a76125c9 Merge pull request #11401 from edx/pdesjardins/PHX-248
Edited wording of UI labels for configuring subsection prerequisites …
2016-02-02 10:05:47 -05:00
Peter Desjardins
2a5b6c9aa3 Edited wording of UI labels for configuring subsection prerequisites (gating) 2016-02-01 17:32:48 -05:00
Diana Huang
4b1a37ef02 Merge pull request #11370 from edx/diana/static-i18n-compiled-files
Complete static i18n PR
2016-02-01 17:13:43 -05:00
Diana Huang
1e1f5abe10 Check in new static i18n JS files. 2016-02-01 15:54:14 -05:00
Diana Huang
cd0bb4c7e0 Add ability to generate static i18n files. 2016-02-01 15:54:10 -05:00
Douglas Hall
7c923355b2 Remove gating api import from course xmodule to avoid importing django related code into non-django related code 2016-01-29 18:42:04 -05:00
Douglas Hall
dce3d9ca81 Merge pull request #11014 from edx/douglashall/PHX-219/subsection_gating
PHX-219 Subsection Gating
2016-01-29 11:05:39 -05:00
Matjaz Gregoric
3259df5412 Merge pull request #11315 from open-craft/comprehensive-theme-on-django-templates
Make comprehensive theme work with django templates.
2016-01-29 08:17:23 +01:00
Douglas Hall
37a7fdc0f2 Added subsection gating feature 2016-01-28 14:05:20 -05:00
Ahsan Ulhaq
0c55f17d81 Merge pull request #11347 from edx/ahsan/credentials-feature-changes
Credentials Feature changes reverted in release
2016-01-28 15:28:49 +05:00
Awais Jibran
fc3511d7e4 Merge pull request #11335 from edx/aj/tnl4049-studio-dashbord-update-2
Render CMS course listing Using CourseSummary for user with org access role
2016-01-28 14:35:23 +05:00
Ahsan Ulhaq
70eaf18936 caching for requests to credentials service
ECOM-3278
2016-01-28 13:05:50 +05:00
Ahsan Ulhaq
5181513629 Show message for earned programs credentials
ECOM-3015
2016-01-28 13:05:50 +05:00
Ahsan Ulhaq
b11e312d2c Create placeholder django apps for credentials
ECOM-3057
2016-01-28 13:05:49 +05:00
Cliff Dyer
6595dfc2aa Merge pull request #11360 from edx/cdyer/track-push
Track push notification activity in analytics
2016-01-27 16:52:22 -05:00
Nimisha Asthagiri
08a2bc9620 Merge pull request #11358 from edx/release
Hotfix for MA-1981 and safe sessions
2016-01-27 15:53:20 -05:00
J. Cliff Dyer
90493ac3a2 Track push notification activity in analytics
When a course is updated, track whether or not a push notification is
sent.
2016-01-27 20:33:21 +00:00
Toby Lawrence
531347b463 Merge pull request #11277 from edx/PERF-251
Add the basis of configuring a cache TTL for course assets.
2016-01-27 08:38:16 -05:00
Awais Jibran
793f916712 TNL-4049
Specific user cannot access studio.edge.edx.org/home
2016-01-27 14:12:26 +05:00
Toby Lawrence
01a9ad2369 Add support to enhance the cacheability of course assets.
This introduces a mechanism to control the time-to-live for an unlocked
course asset, which will allow browsers and intermediate proxies/caches
to cache these course assets, determinstically.

Locked assets, with their nature of requiring authorization, are not
eligible for caching.
2016-01-26 21:09:18 -05:00
Nimisha Asthagiri
f3cb692472 Safe Session Cookies Middleware 2016-01-26 17:23:03 -05:00
Adam Palay
c37715a7c7 Merge remote-tracking branch 'origin/release' into merge-release-into-master
Conflicts:
	requirements/edx/base.txt
	requirements/edx/github.txt
2016-01-26 11:25:41 -05:00
Adam
5a5b5e8026 Merge pull request #11279 from edx/remove-old-mgmnt-commands
remove old  management commands
2016-01-26 09:23:25 -05:00
Adam Palay
bb2d75d80e Revert "Merge pull request #11241 from edx/feature/credentials-phase-1"
This reverts commit 46df454536, reversing
changes made to 039e6cdfe6.
2016-01-25 12:46:57 -05:00
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
Matjaz Gregoric
9b89bd3245 Make comprehensive theme work with django templates.
Comprehensive theming did not work with django templates (used by course wiki).

The reason it didn't work was that in order for the theme to work, theme template folder
has to be added to django template dirs setting *before* django startup.
After django startup, modifying `settings.DEFAULT_TEMPLATE_ENGINE['DIRS']` has no effect,
because at that point the template engine is already initialized with a copy of the
template dirs list.

Instead of running the theme startup code as an autostartup hook, we manually run it
*before* `django.setup()`. This is fine because theme startup code doesn't have to do
anything else besides modifying some settings and doesn't actually need django to be
initialized.
2016-01-25 08:45:52 +01:00
Zia Fazal
c0648ab164 moved IS_EDX_DOMAIN dependent feature to edx.org theme 2016-01-22 15:32:19 -05:00
Saleem Latif
2d83449240 Remove microsite_configuration/microsite.py references from individual templates
* mattdrayer: Updated get_themed_template_path
2016-01-22 14:27:58 -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
Peter Pinch
02a7d6eb47 Merge pull request #10931 from mitocw/gdm_push_ccx_info_to_connector_#128
Added CCXCon app and CCXCon URL in course advanced settings
2016-01-20 14:28:48 -05:00
Adam Palay
9981c86718 remove old management commands 2016-01-20 14:11:54 -05: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
Mushtaq Ali
d8b902ad58 Merge pull request #11200 from edx/mushtaq/ecom2082-fix-enrollment-msg
Escape Course Name in enrolment message
2016-01-20 20:04:23 +05:00
Mushtaq Ali
8f76f3385a Fix enrollment message 2016-01-20 15:59:27 +05:00
Ahsan Ulhaq
8798ee0f53 Add credentials service user 2016-01-20 12:51:48 +05:00
Ahsan Ulhaq
8fb998fee7 caching for requests to credentials service
ECOM-3278
2016-01-20 12:51:28 +05:00
Ahsan Ulhaq
4ce58a6f67 Show message for earned programs credentials
ECOM-3015
2016-01-20 12:50:30 +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
Matt Drayer
9bcb1166a1 Merge pull request #11073 from edx/ziafazal/WL-245
Ziafazal/wl-245: multiple backend support for microsite
2016-01-15 10:10:27 -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
Toby Lawrence
2c40454db0 Merge pull request #11223 from edx/perf/crush-all-the-imgs
Crush down images.
2016-01-14 09:42:17 -05:00
Toby Lawrence
944725e35b Adding optimized images in batches [01/19] 2016-01-13 20:37:48 -05:00