Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
30,207 Commits 1 Branch 0 Tags
5cef287c5dfb2db7aa90ff0478587f1f12e505fd
Commit Graph

749 Commits

Author SHA1 Message Date
Brian Talbot
5e27bd229a Studio: removing manual Sass/CSS extend files needed for IE9 and below 2015-05-12 10:36:32 -04:00
Feanil Patel
6289b190d9 Fix pep8 and pylint. 2015-05-08 09:01:50 -04:00
Feanil Patel
4cc39abfa4 Update celery config for config files I missed. 2015-05-08 09:01:50 -04:00
Feanil Patel
27223ae80f Load celery for CMS as well. 2015-05-08 09:01:48 -04:00
Gabe Mulley
4a8b0c5ef5 Make user_track use eventtracking 2015-05-06 20:57:46 -04:00
cahrens
5fe384ca2b Add tags plugin. 
TNL-1924
 2015-05-04 16:00:18 -04:00
Nimisha Asthagiri
b124485ed6 MA-611, MA-613 Mobile Push Notification Studio Backend; Integration with Parse 2015-04-18 15:30:19 -04:00
muhammad-ammar
cfcb38c498 Update user message strings 2015-04-17 17:23:19 -04:00
Daniel Friedman
23f02d9492 Configurations for filesystem and s3 backends. 
TNL-1789
 2015-04-17 17:23:13 -04:00
Andy Armstrong
c898e4137b Add default profile images 
TNL-1796
 2015-04-17 17:23:12 -04:00
Andy Armstrong
650a9a9b85 Implement parental controls for user profiles 
TNL-1606
 2015-04-17 17:23:11 -04:00
Daniel Friedman
6f6fdbfb5f Integrate profile images into Accounts API 
TNL-1545
 2015-04-17 17:23:11 -04:00
Eugeny Kolpakov
b1765d0a69 Merge pull request #7641 from open-craft/eugeny/problem-type-search 
Capa problem type filtering using edx-search
 2015-04-17 18:43:04 +03:00
Braden MacDonald
513591f409 Bump problem builder version to latest edx-release build 2015-04-16 11:56:50 -07:00
E. Kolpakov
bd891c21db Added setting to enable/disable library indexing + moved is_index_enabled into search indexer classes 
Added task and signal to fire library reindex
 2015-04-14 12:40:05 +03:00
Matt Drayer
ffe30da7a5 Add course-specific URL overrides for social sharing icons on student dashboard 
- sharing enabled for custom URLs only if URL actually specified
 2015-04-13 13:14:43 -04:00
Davorin Sego
e37a98d1be Indexing moved to celery task. Reorganised indexing to always allow for full course reindex. Indexing code no longer needs to be in common, because it is triggered by signal instead of being called.g 2015-04-10 14:30:19 -04:00
louyihua
9d3b65282e Fix error when STUDIO_NAME uses non-ascii characters 
The replacement strings need to be unicode, so that when STUDIO_NAME contains non-ascii characters python can handle it correctly without raising exceptions.
Also, the value of STUDIO_SHORT_NAME can be read from cms.env.json.
 2015-03-28 21:47:59 +08:00
Ned Batchelder
a84735057d Move common/lib/*.py to openedx/core/lib 
This makes these files importable, and puts them into the new best guess
as to where files should live.
 2015-03-23 12:40:24 -04:00
David Baumgold
c6992688ac Merge pull request #7314 from edx/load-tender-js-from-tenderapp-subdomain 
Define TENDER_SUBDOMAIN so that we can still use vanity URLs
 2015-03-16 10:44:00 -04:00
stv
83fec5d092 Fix Pylint: W0109(duplicate-key) 2015-03-13 20:20:04 -07:00
David Baumgold
cfb1ec115a Define TENDER_SUBDOMAIN to that we can still use vanity URLs 2015-03-11 16:36:55 -04:00
Greg Price
f0322b9662 Merge branch 'release' 2015-03-11 11:14:48 -04:00
Kelketek
b4c6211e4a Merge pull request #7235 from open-craft/enable-content-libraries 
Enable content libraries by default
 2015-03-11 09:42:47 -05:00
Will Daly
3359d6e333 Merge pull request #7243 from edx/will/csrf-enrollment-api 
Cross-domain CSRF cookies
 2015-03-10 15:39:59 -04:00
Greg Price
d5b870e7b2 Merge pull request #7276 from edx/gprice/oauth-exchange 
Add an endpoint to exchange OAuth access tokens
 2015-03-09 15:30:19 -04:00
Greg Price
e85eb91e06 Add an endpoint to exchange OAuth access tokens 
This allows the holder of a third-party access token (e.g. from Google
or Facebook) to get a first-party access token for the edX account
linked to the given access token.
 2015-03-09 14:12:18 -04:00
Will Daly
cbdc269b47 Cross-domain CSRF cookies 
When configured, set an additional cookie with the CSRF
token for use by subdomains.

The cookie can have a different name than the default
CSRF cookie, preventing conflicts between cookies
from different domains (e.g. ".edx.org", "courses.edx.org",
and "edge.edx.org").

The new cookie is included only on the enrollment API
views so that the scope of this change is limited
to the end-points that require cross-domain POST requests.
 2015-03-09 12:32:49 -04:00
E. Kolpakov
c225d86e83 SettingsService for accessing server-wide settings from XBlock 2015-03-05 18:24:47 +03:00
Jonathan Piacenti
5e731f784a Enable content libraries by default 2015-03-05 15:23:23 +00:00
Carson Gee
da9154d10e Add Staff Graded Assignments XBlock to edx-platform 2015-03-04 10:35:54 -05:00
Will Daly
7bad603978 Merge pull request #7076 from edx/will/deprecate-embargo 
Deprecate old embargo implementation.
 2015-03-03 15:54:41 -05:00
Calen Pennington
8e93c1891f Merge pull request #6016 from cpennington/django-toolbar-upgrade 
Upgrade django-debug-toolbar to 1.2.2
 2015-02-27 10:39:32 -05:00
Braden MacDonald
88747024b5 Upgrade django-debug-toolbar to 1.2.2 
This is compatible with Django > 1.5, and allows us to re-enable the ProfilingDebugPanel
 2015-02-26 15:57:03 -05:00
Daniel Friedman
fa968c6218 Backport dummy SECRET_KEYs from django 1.5 upgrade 2015-02-26 11:54:37 -05:00
Martyn James
b2b56d067b Adds google drive components to whitelist, and imports xblock-google-drive and xblock-utils 2015-02-25 10:35:51 -05:00
Will Daly
ae8ddc8aee Deprecate old embargo implementation. 
The new "country access" implementation replaces the old
implementation.  Middleware and tests have been updated
accordingly, but deprecated models are preserved
for backwards compatibility.
 2015-02-23 15:48:04 -05:00
Xavier Antoviaque
05c857478b xblock-external-ui: Adds support for CORS headers (cross-domain request) 
xblock-external-ui: Alternate referer check for CORS requests
xblock-external-ui: Allow to disable httponly on session cookies
xblock-external-ui: Add a unit test for CorsCSRFMiddleware
 2015-02-17 10:24:27 +01:00
Clinton Blackburn
052fa8eafc Merge pull request #6935 from edx/clintonb/course-structure 
Generating Course Structure Asynchronously on Course Publish
 2015-02-13 13:37:05 -05:00
cahrens
0d2969909f Enable course reruns by default. 
TNL-1380
 2015-02-11 17:16:52 -05:00
David Ormsbee
24fcab7f24 Very rough cut at generating a course outline after publishing. 2015-02-11 16:13:10 -05:00
cahrens
9e6249ddd6 Enable split for new courses. 2015-02-09 09:26:04 -05:00
Bertrand Marron
4789c5c9d0 Use HTTP_X_FORWARDED_PROTO header in studio 2015-02-02 16:54:26 +01:00
Martyn James
1b769b53cd Default search engine to None, so that all search/indexing operations are disabled until enabled 2015-01-30 16:40:03 -05:00
Davorin Sego
e09d47b122 Courseware Search integration 2015-01-28 21:34:58 -05:00
Will Daly
b467ae8cde Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS" 
This reverts commit b8184d188f.
 2015-01-28 17:26:46 -05:00
Chris Rodriguez
9e2494b21d Video player branding addition for XuetangX 2015-01-28 06:39:21 -05:00
Will Daly
b8184d188f Add RequireJS and RequireJS Optimizer configuration to the LMS 
[second attempt which addresses bug building Studio]
 2015-01-27 17:56:29 -05:00
Carlos Andrés Rocha
78375b797b Merge pull request #6738 from edx/rc/2015-01-20 
Rc/2015 01 20
 2015-01-23 16:10:28 -05:00
David Baumgold
f2d549b619 Proxy TENDER_DOMAIN variable from environment to Studio settings 2015-01-22 10:56:30 -05:00