Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,772 Commits 1 Branch 0 Tags
e7cdcb9b71faab9ce751a8fcfca0ddf82bb35024
Commit Graph

7013 Commits

Author SHA1 Message Date
Renzo Lucioni
e7cdcb9b71 Merge pull request #12954 from edx/renzo/extract-token-generation 
Unify JWT generation code
 2016-07-11 15:37:14 -04:00
Christina Roberts
6d7a545276 Merge pull request #12932 from edx/christina/deprecated-components 
Move deprecating of XBlocks to new XBlockConfiguration model
 2016-07-08 15:05:42 -04:00
Ned Batchelder
9132b7d555 Update translations (autogenerated message) 2016-07-07 21:02:43 -04:00
Amir Qayyum Khan
0d3f96d4b5 Fixed CCX coach dashboard access issues. 2016-07-08 04:24:19 +05:00
Renzo Lucioni
f6d7371dd1 Unify JWT generation code 
These changes unify four different approaches to JWT creation, moving the core of the AccessTokenView to a general-purpose JwtBuilder class. This utility class defaults to using the system's JWT configuration, but it will allow overriding of the signing key and audience claim to support those clients which still require this. Part of ECOM-4566.
 2016-07-07 16:38:39 -04:00
Braden MacDonald
7c3d902ff6 Merge pull request #11286 from open-craft/omar/remove-s3 
Add OpenStack Swift support
 2016-07-07 11:05:28 -07:00
Chris Rodriguez
4cf0e19af2 AC-520 fixing section ignores 2016-07-06 15:01:44 -04:00
cahrens
25bfd0a7d8 Get Studio deprecation list from XBlockConfiguration. 
Replaces settings value.
TNL-4669
 2016-07-06 11:05:52 -04:00
Toby Lawrence
bc990d5d75 Merge pull request #12911 from edx/PERF-344 
[PERF-344] Add versioning of cached course assets to allow graceful cache invalidation
 2016-07-05 19:34:27 -04:00
Toby Lawrence
4e22affb24 [PERF-344] Add versioning of cached course assets to allow graceful cache invalidation 
When releasing the versioned assets work, we stumbled on a problem with old pickled
versions of the StaticContent objects residing in cache, which triggered a bug in the
code. Not wanting to blow away all cached items, we ended up having to revert and add
in some backwards-compatible helper code to ease the transition.

With this, we'll now utilize the version argument that Django's caching interface
allows, in conjunction with a constant value that can be modified when breaking changes
are being made, to let us gracefully ignore older cached course assets.
 2016-07-05 15:15:47 -04:00
Omar Khan
2faab97eea Add OpenStack Swift support 
Refactor all S3 code to use the django storage API and add swift
settings for openstack deployments
 2016-07-05 17:31:59 +03:00
Ned Batchelder
1cb07a911c Update translations (autogenerated message) 2016-06-30 18:31:37 -04:00
Ned Batchelder
3b863de459 Update translations (autogenerated message) 2016-06-30 18:31:37 -04:00
Matt Drayer
68312bdd2d Revert "Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"" 
2. Update COMPREHNSIVE_THEME_DIR to COMPREHENSIVE_THEME_DIRS
3. Update paver commands to support multi theme dirs
4. Updating template loaders
5. Add ENABLE_COMPREHENSIVE_THEMING flag to enable or disable theming via settings
6. Update tests
7. Add backward compatibility for COMPREHEHNSIVE_THEME_DIR
 2016-06-30 15:19:51 +05:00
Jillian Vogel
e19fb06e9d Merge pull request #12582 from open-craft/feature/discussion_xblock 
Convert Discussion Module to XBlock
 2016-06-29 20:49:35 +12:00
E. Kolpakov
33b3dfcc92 Converts Discussion XModule to Discussion XBlock 
* Renames discussion_module to discussion_xblock
* Moves common/lib/xmodule/xmodule_discussion to openedx/core/lib/xblock_builtin/xblock_discussion
 2016-06-29 06:47:04 +12:00
Jeremy Bowman
225768ac2d Merge remote-tracking branch 'origin/release' into release-2016-06-28-conflict 2016-06-28 13:04:26 -04:00
Andy Armstrong
0488f077dc Fix discussion bundling in Studio 2016-06-28 06:05:39 -04:00
Sylvia Pearce
8b1f28d317 Account registration and activation text string revisions 2016-06-27 13:32:53 -04:00
Ned Batchelder
35267e4777 Merge pull request #12835 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-06-24 16:38:29 -04:00
Chris Rodriguez
f9b8865367 Hiding focus outline on programmatically focusable els 2016-06-24 12:50:33 -04:00
Nimisha Asthagiri
74a3665289 Update query and mongo counts 2016-06-23 20:22:32 -04:00
Toby Lawrence
bb29ad5f30 Revert "Revert "[PERF-325] Add versioned course asset URLs when canonicalizing asset paths."" 
This reverts commit 9967b6fd58.
 2016-06-23 13:27:15 -04:00
Ned Batchelder
dd9139374f Update translations (autogenerated message) 2016-06-23 15:29:59 +00:00
Andy Armstrong
caedc92d67 Merge pull request #12796 from eduNEXT/fmo/coffee_to_js_module_edit 
Converting cms module_edit.coffee to js
 2016-06-22 18:20:41 -04:00
Felipe Montoya
82db66d945 Converting the module_edit coffee file to a js file 
Converting to js and fixing references

Linting the generated code
 2016-06-22 15:49:48 -05:00
Kevin Falcone
2c41d79c6d Merge pull request #12827 from edx/release 
Release -> Master after revert
 2016-06-22 15:37:27 -04:00
Kevin Falcone
9967b6fd58 Revert "[PERF-325] Add versioned course asset URLs when canonicalizing asset paths." 
We're seeing errors in NR from objects read out of the cache lacking the
'StaticContent' object has no attribute 'content_digest'
File "/edx/app/edxapp/edx-platform/common/djangoapps/contentserver/middleware.py",
    line 70, in process_request

This reverts commit 849ebc5f22.
 2016-06-22 12:11:35 -04:00
Sofiya Semenova
08aeb27d94 Merge pull request #12803 from edx/ssemenova/disabledstates 
Got rid of aria-disabled states
 2016-06-22 09:47:25 -04:00
Muddasser
ce665e3b4c Conversion of cms/component.feature into bokchoy tests 2016-06-22 11:20:48 +00:00
ssemenova
ea81090293 fixed aria-disabled states 
TNL-4805
 2016-06-21 14:07:20 -04:00
Andy Armstrong
d462c73fd8 Use the UI Toolkit's spec helpers. 2016-06-21 10:16:00 -04:00
Andy Armstrong
fff88151d2 Convert XBlock runtime code to JavaScript 2016-06-19 12:55:20 -04:00
Andy Armstrong
df399de186 Merge pull request #12781 from eduNEXT/fmo/coffee_to_js_tabs 
Converting views/tabs.coffee in the cms to js
 2016-06-17 12:56:49 -07:00
Gregory Martin
f701058296 Merge pull request #12764 from edx/yro-add_val_duplicate_video 
Add VAL "Duplicate" status
 2016-06-17 14:49:14 -04:00
Felipe Montoya
43ea4e21bb Converting views/tabs.coffee in the cms to js 
Linting the compiled file
 2016-06-16 18:35:34 -07:00
Eric Fischer
fdc6d91588 update_in_cache on lms worker (#12689) 
This commit "undoes"a previous hotfix, and allows a cms course_publish
signal to trigger a block_structure update_course_in_cache task, which
is run on an lms worker queue.

Changes:
    -exposes ALTERNATE_QUEUE_ENVS
    -adds routing layer in celery.py
    -moves prior dev_with_worker settings file to devstack_with_worker
    -moves course_block api functionality into openedx/core/djangoapps/content/block_structure
 2016-06-16 18:01:06 -04:00
Ned Batchelder
25c195d48a Update translations (autogenerated message) 2016-06-16 14:48:20 +00:00
estute
d5c0e25a19 Merge pull request #12765 from edx/release 
Merge Release to Master
 2016-06-15 15:58:30 -04:00
Clinton Blackburn
8fa3bf327f Merge pull request #12651 from edx/clintonb/single-logout 
Added support for OpenID Connect single logout
 2016-06-15 12:56:50 -04:00
Greg Martin
d20af4a2ba Add VAL "Duplicate" status 
Added duplicate video failed status for VAL.
 2016-06-15 11:47:38 -04:00
Clinton Blackburn
3f19cc0265 Updated logout view 
In addition to logging the user out of LMS, the logout view also logs users out of the IDAs to which they previously authenticated.

ECOM-4610
 2016-06-15 11:11:49 -04:00
Toby Lawrence
9abce102ff Merge pull request #12573 from edx/PERF-325 
[PERF-325] Add versioned course asset URLs when canonicalizing asset paths.
 2016-06-15 09:05:13 -04:00
Toby Lawrence
849ebc5f22 [PERF-325] Add versioned course asset URLs when canonicalizing asset paths. 2016-06-15 08:04:52 -04:00
Chris Rodriguez
fbcf334a67 AC-472 removing outline from main 2016-06-14 14:29:00 -04:00
cahrens
ffb1ec97bd Don't hide spans within ui-btn-non class. 
TNL-4799
 2016-06-14 13:01:01 -04:00
Awais Jibran
1e67ec66cd Merge pull request #12702 from edx/aj/PLAT-1032-fix-export 
Fix course export on edge
 2016-06-13 18:46:56 +05:00
Awais Jibran
ba6ef624c2 PLAT-1032 2016-06-10 11:38:20 +05:00
Ned Batchelder
b4248d28e1 Merge pull request #12707 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-06-09 14:25:09 -04:00
Ned Batchelder
78f2d9e1eb Update translations (autogenerated message) 
Update translations (autogenerated message)
 2016-06-09 12:00:04 -04:00