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

2171 Commits

Author SHA1 Message Date
Matt Drayer
bd08e46bd7 mattdrayer/microsite-jwt-auth: Access setting through microsites/theming framework 
* mattdrayer: Remove individual JWT settings
* mattdrayer: Add settings defaults to JWT_AUTH calls
 2016-05-12 16:00:28 -04:00
sanfordstudent
db52e0334f Merge pull request #12333 from edx/sstudent/MA-2252 
Sstudent/ma 2252
 2016-05-05 12:52:09 -04:00
Sanford Student
d4146e7a1d accordion emits event 2016-05-05 11:48:09 -04:00
Peter Fogg
4a417f2832 Merge pull request #12372 from edx/feature/catalog-admin 
Merge catalog admin into master.
 2016-05-05 10:29:13 -04:00
Peter Fogg
268cb2ea17 Correctly pull in API access email config. 2016-05-04 14:23:46 -04:00
Bill DeRusha
ffdacc9129 Use asymmetric key for signing JWTs 2016-05-02 11:17:32 -04:00
Christina Roberts
2497f0a0eb WIP: xblock pipeline work (#10176) 
[PERF-303] Integer XBlocks/XModules into the static asset pipeline.

This PR, based on hackathon work from Christina/Andy, implements a way to discover all installed XBlocks and XModules and to enumerate their public assets, then pulling them in during the collectstatic phase and hashing them.  In turn, the methods for generating URLs to resources will then returned the hashed name for assets, allowing them to be served from nginx/CDNs, and cached heavily.
 2016-04-29 10:52:42 -04:00
Ehtesham Kafeel
8cf89d3a8e Merge pull request #12289 from edx/mzfr/backbone-cleanup 
Replace backbone-min.js to backbone.js
 2016-04-29 16:53:02 +05:00
muzaffaryousaf
928d9a2694 Replace backbone-min to actual file. 2016-04-28 12:46:29 +05:00
Waheed Ahmed
b7b4e0b041 Added Kosovo in django country list. 
ECOM-4292
 2016-04-28 00:17:06 +05:00
Brian Jacobel
0f1366a7fb Merge pull request #12251 from edx/bjacobel/use-unminified-assets 
Use unminified picturefill in development
 2016-04-27 12:12:43 -04:00
John Eskew
0899871958 Merge pull request #11042 from edx/jeskew/xml_removal 
Remove XML modulestore code from most tests.
 2016-04-27 11:20:02 -04:00
Brian Jacobel
12d65f5801 Use unminified picturefill in development 2016-04-27 10:23:07 -04:00
muzaffaryousaf
e89a32d5c6 Upgrade backbone via npm. 
TNL-4335
 2016-04-27 12:48:45 +05:00
Brian Jacobel
90499e77f1 Merge pull request #12250 from edx/bjacobel/underscore.string-removal-v2 
remove usage of minifed Underscore.string
 2016-04-26 16:40:19 -04:00
Clinton Blackburn
6941fcd766 Updated access token view to return a JWT as an access token 
The JWT includes the user email and username, along with details pulled from the original access token (e.g. scope, expiration).

ECOM-4221
 2016-04-26 09:32:49 -04:00
Brian Jacobel
217ea5d074 remove usage of minifed Underscore.string 2016-04-25 16:24:51 -04:00
J. Clifford Dyer
001874c42e Update seq_* to edx.ui.lms.sequence.* format 
seq_next, seq_prev, and seq_goto events are all renamed, and maintain
legacy compatibility.

This PR also introduces new EventTransformer framework to shim events
based on name prefix.

MA-2221
 2016-04-22 13:38:41 -04:00
Edward Zarecor
9db6b04f2c Merge pull request #11983 from edx/e0d/cookie-updates 
Updating cookies settings
 2016-04-22 07:25:09 -04:00
Clinton Blackburn
5a7bc01986 JWT authentication updates 
- Using jwt_decode_handler from edx-drf-extensions
- Updated djangorestframework-jwt
- Removed feature flag around JWT auth

ECOM-4221
 2016-04-20 16:25:25 -04:00
Cliff Dyer
f1c4a44928 Merge pull request #12152 from edx/cdyer/oauth-toolkit-allow-inactive 
Fix django-oauth-toolkit email and inactive user issues
 2016-04-20 14:13:55 -04:00
J. Clifford Dyer
28ab627a50 Fix authentication issues with django-oauth-toolkit 
MA-2271
    Allow inactive users to authenticate.
MA-2273
    Provide custom authenticate method that allows users to provide email.
 2016-04-15 16:04:08 +00:00
Renzo Lucioni
5bb0e90878 Merge pull request #12156 from edx/renzo/merge-release-into-master 
Manually merge release into master
 2016-04-15 00:47:54 -04:00
Chris Rodriguez
df5520bdf9 Video player: adding Dragabilly to closed captions 
* tests for dragging
* icon location reference updates
* pattern library usage
 2016-04-14 15:29:38 -04:00
Renzo Lucioni
affee69296 Manually merge release into master 2016-04-14 14:23:06 -04:00
wajeeha-khalid
86e954f642 version-based mobile app upgrade 2016-04-14 15:43:34 +05:00
Bill DeRusha
bf37b4a028 Email notification 2016-04-13 15:59:30 -04:00
Matt Drayer
40c5c47791 Revert "Remove ThemingAware storage mixins and ComprehensiveThemeFinder." 
This reverts commit 266f593d2d.
 2016-04-12 16:22:34 -04:00
John Eskew
f9a85c4471 Remove XML modulestore code - discovery work 2016-04-12 11:49:32 -04:00
Matt Drayer
9a362d9033 Merge pull request #12116 from edx/mattdrayer/rc2016-04-12/revert-theming 
Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"
 2016-04-12 10:55:04 -04:00
Matt Drayer
392ee7d258 Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming" 
This reverts commit a796b56314.

Conflicts:
	lms/envs/common.py
	openedx/core/djangoapps/theming/models.py
	pavelib/assets.py
	pavelib/paver_tests/test_assets.py
 2016-04-12 08:22:14 -04:00
Simon Chen
498ab88794 Merge pull request #12044 from edx/schen/ECOM-3198 
ECOM-3198 Add banner image to the program listing program cards
 2016-04-11 16:00:03 -04:00
Clinton Blackburn
8f25c81a85 Added AWS_S3_CUSTOM_DOMAIN 
This setting is necessary to avoid django-storages applying a security token to S3 URLs.

ECOM-4081
 2016-04-11 15:34:29 -04:00
Simon Chen
149412d2c3 ECOM-3198 Add banner image to the program listing program cards 2016-04-11 14:58:33 -04:00
Clinton Blackburn
d6ba8839bf Stripping auth querystring from S3 URLs 
We use S3 for a number of uploads. Boto, by default, includes a auth querystring on the returned URLs. Since these uploads are public, there is no need for this querystring. Additionally, the long length URLs cause problems when API consumers need to store the URLs. This commit resolves this problem by removing the auth querystring.

- Updated to latest versions of boto and django-storages-redux packages
- Added AWS_QUERYSTRING_AUTH setting to remove the querystring values

ECOM-4081
 2016-04-11 12:20:37 -04:00
Andy Armstrong
9290c52b33 Introduce Pattern Library test pages (take two) 
FEDX-93

These are developer only pages, so can not be seen in production
environment. On devstack, you can access these pages in LMS and
Studio at:

    /template/ux/reference/pattern-library-test.html

This is the second attempt to enable the Pattern Library. The
first attempt broke Django Templates and didn't work correctly
with right-to-left styling.
 2016-04-11 00:45:31 -04:00
Brian Jacobel
4671970f86 Revert "Introduce Pattern Library test pages" 
This reverts commit 845e3708f3.
 2016-04-08 14:25:41 -04:00
Brian Jacobel
36917398c0 Revert "Introduce Pattern Library test pages" 
This reverts commit 845e3708f3.
 2016-04-08 11:41:04 -04:00
e0d
ae202dd54a fix CR nits 2016-04-08 06:08:41 -04:00
Edward Zarecor
f20f895903 Updating cookies settings 2016-04-08 06:00:31 -04:00
Clinton Blackburn
d2d38f9b2c Stripping auth querystring from S3 URLs 
We use S3 for a number of uploads. Boto, by default, includes a auth querystring on the returned URLs. Since these uploads are public, there is no need for this querystring. Additionally, the long length URLs cause problems when API consumers need to store the URLs. This commit resolves this problem by removing the auth querystring.

- Updated to latest versions of boto and django-storages-redux packages
- Added AWS_QUERYSTRING_AUTH setting to remove the querystring values

ECOM-4081
 2016-04-07 17:14:18 -04:00
Amir Qayyum Khan
60b368e22b Fixed unable to created ccx even if ccx_conn url is not set 2016-04-07 19:30:17 +05:00
Jim Abramson
e0ca1ecaef remove unused CERTIFICATES_ENABLED feature flag 
ECOM-4040
 2016-04-06 17:53:40 -04:00
Andy Armstrong
34cecaee77 Merge pull request #11957 from edx/andya/pattern-library-test-page 
Introduce Pattern Library test pages
 2016-04-05 15:36:11 -04:00
Andy Armstrong
845e3708f3 Introduce Pattern Library test pages 
FEDX-93

These are developer only pages, so can not be seen in production
environment. On devstack, you can access these pages in LMS and
Studio at:

    /template/ux/reference/pattern-library-test.html
 2016-04-05 09:22:14 -04:00
Renzo Lucioni
3cce6c1e46 Merge pull request #12034 from edx/renzo/discussion-topics 
Fix discussion category map for self-paced courses
 2016-04-05 08:29:49 -04:00
Peter Fogg
d86aff2866 Merge pull request #11982 from edx/peter-fogg/create-api-request 
Request API access.
 2016-04-04 22:56:49 -04:00
Renzo Lucioni
0e7247f2a7 Fix discussion category map for self-paced courses 
Prevents start date alone from being used to filter out categories in self-paced courses during construction of the category map. ECOM-4017.
 2016-04-04 21:15:26 -04:00
Peter Fogg
b340c2fd9c Allow users to request access to the Course Discovery API. 
ECOM-3940
 2016-04-04 20:29:19 -04:00
Brian Jacobel
24990272b1 Do not set up underscore.string globally. 2016-04-04 10:18:44 -04:00