Commit Graph

5589 Commits

Author SHA1 Message Date
Calen Pennington
c54972e855 Fix bad interaction between pluggable InputTypes and Microsites
Pluggable InputTypes use edxmako.paths.add_lookup to inject new
mako template directories. Those were getting clobbered by microsites
(and by theming), which were completely rebuilding the mako template
lookup list from scratch.

This commit switches those two features to use the same add_lookup
function as pluggable InputTypes.

[LMS-2489]
2014-04-01 16:49:15 -04:00
Calen Pennington
9bcbba6750 Emit datadog events for all course enrollments, not just those outside of verified courses 2014-04-01 13:02:29 -04:00
Chris Dodge
ff8a0c6891 password history: just limit the result set range to simplify iteration logic 2014-03-31 10:30:58 -04:00
Chris Dodge
d5bb1b5cca Add some optional policies around password resets, such as password reuse, forced password resets, allowed frequency of password resets 2014-03-31 10:30:58 -04:00
Calen Pennington
81a038cbaf Add datadog metrics logging for django model creates, updates, and deletes 2014-03-28 14:45:59 -04:00
Usman Khalid
e1afbe5011 Merge pull request #3058 from edx/usman/lms2429-unicode-error-fixes
Unicode support fixes
2014-03-28 20:08:27 +05:00
Valera Rozuvan
3f41aae9f7 Make YouTube mocked server serve YouTube API
1.) Making YouTube mock server serve YouTube API.
2.) Adding ability to block YouTube API from YouTube mock server.
3.) Adding acceptance tests that check YouTube mock server for availability of YouTube API, and for it's ability to block YouTube API.

Part of BLD-939.
2014-03-28 10:34:34 +02:00
Valera Rozuvan
b35994f12e Merge pull request #3090 from edx/valera/update_youtube_stub_server_doc
Update doc string for YouTube stub server.
2014-03-28 09:15:35 +02:00
Dave St.Germain
a6bde7cc9e Fix broken test due to refactoring. 2014-03-27 16:44:07 -04:00
Dave St.Germain
0501775d64 Add an option to prevent multiple logins of the same user. 2014-03-27 16:05:25 -04:00
Valera Rozuvan
f03a94b0f2 Update doc string for YouTube stub server.
Included information on how to launch the server
on its own.
EOF
2014-03-27 21:21:38 +02:00
Usman Khalid
7323341a4b Changed str->unicode in common/djangoapps/utils/.
LMS-2436
2014-03-25 20:43:12 +05:00
Will Daly
44dad41ede Switch from Rake to Paver 2014-03-25 11:32:19 -04:00
Jay Zoldak
c5a7911b87 Fix pylint disable pragmas that were pep8 violations 2014-03-20 10:18:40 -04:00
Valera Rozuvan
2e8fe6a41c Move loading of YouTube API to video module.
The availability of the YouTube API will be stored in student's settings.
The YouTube API is loaded asynchronously now, so no need to pass a
parameter to the front-end telling it if YouTube API should not be loaded
because of it's unavailability.

Removing loading of YouTube API from Studio RequireJS config. Now loading
of YouTube API is handled by Video module.

BLD-531.
2014-03-19 19:30:45 +02:00
jsa
fb57ffb80a in create_user mgmt command, use settings.LANGUAGE_CODE instead of en-us.
Fixes the create_user admin command, which was creating user accounts
with a potentially invalid language preference.

JIRA: FOR-532
2014-03-18 15:28:07 -04:00
Calen Pennington
58f05f3687 Merge pull request #2840 from ionis-education-group/double-edxmako-startup
Add method to clear mako template lookups
2014-03-18 14:31:13 -04:00
Jim Abramson
32fd073760 Merge pull request #2957 from edx/jsa/forum-user-sync
Ensure account creation succeeds before creating comments service user
2014-03-18 14:07:44 -04:00
jsa
b20c8f9248 Ensure account creation succeeds before creating comments service user
Also improves handling in cases where account creation did succeed, but
comments service user creation did not.

Depends on commit 88abdd8a0b20bc9816f487b25abdea1953f5661d in https://github.com/edx/cs_comments_service

JIRA: FOR-522
2014-03-18 13:24:30 -04:00
Sef Kloninger
397f383313 missing themed embargo page fails safely to unthemed 2014-03-18 09:00:23 -07:00
zubiar-arbi
714da6ab23 Enable/disable unicodes in course id's 2014-03-17 20:24:59 +05:00
Julia Hansbrough
08939b64dc Fixed confusing docstring 2014-03-13 22:09:29 +00:00
David Baumgold
5be58fc157 Merge pull request #2883 from edx/db/fix-import
Fix undefined references to pytz, and update tests
2014-03-11 16:41:20 -04:00
David Baumgold
f25a7870a5 fix tests 2014-03-11 14:48:03 -04:00
Anton Stupak
d64049c4c3 Merge pull request #2901 from edx/anton/fix-video-in-flash-mode
Video: Fix issues related to videos that have separate YouTube IDs for the different video speeds.
2014-03-11 20:32:12 +02:00
Greg Price
654239dc2c Merge pull request #2890 from edx/gprice/user-api-with-prefs
Augment user API to allow easier access to user preferences
2014-03-11 13:37:50 -04:00
Greg Price
bbd6f788ad Add endpoint to get user list for a preference
The endpoint includes the key of the desired preference in the URL and
returns the list of users for whom the preference is set (regardless of
the value).
2014-03-11 12:03:33 -04:00
polesye
43c16bd093 BLD-915: Fix issues with different videoIDs. 2014-03-11 17:38:29 +02:00
Greg Price
8f01756c6c Include preferences in users returned by user API 2014-03-11 11:17:13 -04:00
Sarina Canelake
5c1c96923a Put language modal in alphabetical order LMS-2302 2014-03-11 10:20:21 -04:00
David Baumgold
2f3d2ecac0 Fix undefined references to pytz 2014-03-10 16:19:10 -04:00
Greg Price
08ed1c5439 Merge pull request #2832 from edx/gprice/create-account-lang-pref
Save language preference on account creation
2014-03-10 15:13:15 -04:00
Greg Price
fa29a35ab8 Save language preference on account creation
This is necessary to allow non-browser-based services (e.g. notifier)
to know a user's preferred language even if the user has not explicitly
selected one.
2014-03-10 13:28:12 -04:00
Sarina Canelake
cdfb5c0c07 Put language modal in alphabetical order LMS-2302 2014-03-10 11:07:13 -04:00
Ned Batchelder
13c076e628 Merge pull request #2736 from johncox-google/johncox/feature/auth
Add auth module
2014-03-07 14:28:41 -05:00
John Cox
8ecfa8679a Add common/djangoapps/third_party_auth; update pylintrc to allow test_* names.
third_party_auth contains a working settings mechanism, the start of the provider interface + 3 implementations (Google, Mozilla Persona, LinkedIn), and a stub for the auth pipeline. Modified existing lms settings files to use but deactivate the module.
2014-03-06 17:20:58 -08:00
Sarina Canelake
29be1288ba Clean up quality violations in split_test module 2014-03-06 18:42:59 -05:00
Han Su Kim
0db4a899f4 Merge branch 'release' 2014-03-06 16:57:06 -05:00
Han Su Kim
bdfd81d2f3 Merge remote-tracking branch 'origin/master' into release, conflicts resolved
Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt
2014-03-06 16:56:16 -05:00
Carson Gee
b0af8ff421 Merge pull request #2702 from carsongee/cg/cas_fixes
Correct misaligned django-cas integration
2014-03-06 16:17:13 -05:00
Bertrand Marron
efa8bd6755 Add method to clear mako template lookups
Quick and dirty fix (edxapp.startup.run is called twice, once before
loading the configuration, so the paths defined in lms.startup are
basically ignored).
2014-03-06 17:09:40 +01:00
Sef Kloninger
f484807419 make embargo template theme-able
Use "Stanford-style" theming to enable you to put your own embargo
notice up.
2014-03-05 15:22:22 -08:00
Diana Huang
bce7d9e43d Add tests and clean up A/B testing
Also fixes STUD-1351
2014-03-05 13:46:03 -05:00
Calen Pennington
d101933617 Add course tags to all events where a course-id can be extracted from the url
[LMS-2105]
2014-03-05 13:45:08 -05:00
Victor Shnayder
281ad63d2b split testing support in the LMS.
Adds a split_test_module XModule, that can choose one of its children
to display, based on a get_condition_for_user API added to the runtime.

To test, add something like this to an xml course, or make equivalent
 tweaks in mongo.

 <vertical url_name="split_test_vert">
    <split_test url_name="split1" experiment_id="0" condition_id_to_child='{"0": "i4x://MITx/6.00x/html/split_test_cond0", "1": "i4x://MITx/6.00x/html/split_test_cond1"}'>
       <html url_name="split_test_cond0">condition 0</html>
       <html url_name="split_test_cond1">condition 1</html>
    </split_test>
  </vertical>

Also needs an experiment configured in the course policy json: e.g.

        "user_partitions": [{"id": 0,
                                      "name": "Experiment 0",
                                      "description": "Unicorns?",
                                      "version": 1,
                                      "groups": [{"id": 0,
                                                        "name": "group 0",
                                                        "version": 1},
                                                        {"id": 1,
                                                        "name": "group 1",
                                                        "version": 1}]}]

(This particular snippet will work inside a course with org MITx
 and course name 6.00x)

Co-Author: Sarina Canelake <sarina@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Diana Huang <diana@edx.org>
Co-Author: Calen Pennington <cale@edx.org>

[LMS-2095]
2014-03-05 13:45:08 -05:00
Bertrand Marron
10688f99f4 Add translator comments for 'other' and 'none' strings 2014-03-04 16:40:27 +01:00
Carson Gee
4099fc9af0 Correct misaligned django-cas integration 2014-03-04 09:35:08 -05:00
Bertrand Marron
6cb458b46a Translate gender and education level from user profile 2014-03-04 11:22:32 +01:00
Sarina Canelake
f79cefe19a Add logging to embargo middleware 2014-03-02 18:27:18 -05:00
Chris Dodge
aa43689a93 This PR addresses the open feedback on the Microsites feature 2014-02-28 16:27:12 -05:00