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

376 Commits

Author SHA1 Message Date
Gabe Mulley
4a8b0c5ef5 Make user_track use eventtracking 2015-05-06 20:57:46 -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
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
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
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
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
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
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
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
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
Will Daly
1f2b155746 Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS" 
This reverts commit 1d6fceda50.
 2015-01-21 17:13:27 -05:00
Will Daly
1eaf84a443 Merge pull request #6544 from edx/will/requirejs-optimizer-lms 
Add RequireJS and RequireJS Optimizer configuration to the LMS
 2015-01-21 15:23:35 -05:00
David Baumgold
e6e443c712 Merge pull request #6674 from edx/disable-pylint-name-errors-on-settings 
Ignore invalid-name errors for settings files
 2015-01-21 10:40:05 -05:00
Will Daly
1d6fceda50 Add RequireJS and RequireJS Optimizer configuration to the LMS 
Respond to review comments:

- Rename build and config files for consistency between lms/studio.
- Fix merge conflicts with lms require config.
- Devstack uses optimized pipeline to skip require JS optimizer step
- Add tests for render_require_js_path_overrides
 2015-01-20 14:27:23 -05:00
Martyn James
9ac7176b8f Merge pull request #6223 from edx/feature/SOL-20 
Merge feature SOL-20
 2015-01-16 12:54:45 -05:00
Martyn James
dcc8e95648 Implements SOL-20. Filtering for assets table by asset type 2015-01-16 12:53:24 -05:00
David Baumgold
ef43840a79 Ignore invalid-name errors for settings files 
path.py objects report themselves as class objects, which confuses the heck out of
pylint. It tries to match variable names using the class-rgx regular expression
instead of the constant-rgx regular expression, and it doesn't match, so it
throws an error. Not sure how to fix pylint, so we'll just ignore these errors.
 2015-01-16 11:37:28 -05:00
Matt Drayer
3c669e3838 New feature contribution: Entrance Exams 2015-01-15 20:35:24 -05:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17:38 -05:00
Andy Armstrong
21a9873757 Don't allow visibility editing in content libraries 2015-01-15 10:33:48 -05:00
Andy Armstrong
4fa33e25ed Studio support for cohorted courseware 
TNL-652
 2015-01-15 10:33:45 -05:00
Tim Babych
dbfc12ce01 Merge pull request #6321 from edx/feature/edxnotes 
TNL-213: Student Notes
 2015-01-15 02:02:13 +02:00
polesye
c7153be040 TNL-213: Let Students Add Personal Notes to Course Content. 
Co-Authored-By: Jean-Michel Claus <jmc@edx.org>
Co-Authored-By: Brian Talbot <btalbot@edx.org>
Co-Authored-By: Tim Babych <tim@edx.org>
Co-Authored-By: Oleg Marshev <oleg@edx.org>
Co-Authored-By: Chris Rodriguez <crodriguez@edx.org>
 2015-01-14 23:34:11 +02:00
David Baumgold
f9d8198ef3 Merge pull request #6576 from edx/db/configure-tender-domain 
Make Tender optional and configurable
 2015-01-14 15:02:09 -05:00
David Baumgold
4d323271ee Make Tender optional and configurable 2015-01-14 11:25:55 -05:00
Braden MacDonald
6be35e0fc1 Merge pull request #6459 from edx/content-libraries 
Content libraries MVP
 2015-01-13 11:20:20 -08:00
Adam
8dd7b78065 Merge pull request #6501 from edx/adam/update-copy-date 
update copyright dates
 2015-01-12 10:59:11 -05:00
Braden MacDonald
eddf44d853 Library Content XModule 2015-01-12 13:37:56 +03:00
Dennis Jen
d2660e530f Merge branch 'release' 
Conflicts:
	lms/templates/verify_student/make_payment_step.underscore
 2015-01-08 15:02:26 -05:00
Adam Palay
8fa00ea54c update studio footer copyright date 2015-01-08 14:45:53 -05:00
David Baumgold
1b02ed5d95 Merge pull request #6252 from edx/studio-move-branded 
Placeholder image for Open edX Studio logo, when not running on edx.org
 2015-01-08 12:42:40 -05:00