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

1416 Commits

Author SHA1 Message Date
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
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
Adam Palay
89795191cb Merge remote-tracking branch 'origin/release' 
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
 2014-02-27 17:33:40 -05:00
chrisndodge
7884e49955 Merge pull request #2711 from edx/cdodge/throttle-forgot-password 
add some rate limiting to the password reset functionality
 2014-02-27 14:47:21 -05:00
Chris Dodge
46fa943fc2 fix method name to actually make sense 2014-02-27 13:56:58 -05:00
Jay Zoldak
1fe453a3a7 Update schema for bok-choy database 
Finalize tests for embargo middleware app
 2014-02-27 10:27:29 -05:00
Sarina Canelake
e71bbeb1e2 Tests for embargo middleware feature 2014-02-27 09:33:17 -05:00
Sarina Canelake
fe85a1eec1 Django-admin for Embargo feature 
Allows specification of countries to embargo, what course(s) should
apply embargo restrictions, and whitelist/blacklist capability for
specific individual IP addresses.
 2014-02-27 08:38:05 -05:00
Julia Hansbrough
a7ae152d9b Embargo Middleware feature 
Adds configurable middleware in common/djangoapps/embargo that
allows specific courses to comply with US Export regulations by
embargoing students from specific countries, whilst simultaneously
allowing other courses to be freely open to all.
 2014-02-27 08:37:58 -05:00
chrisndodge
38e55a4eb9 Merge pull request #2668 from edx/cdodge/no-pii-in-logs 
add new feature to make sure we aren't writing PII into the application ...
 2014-02-26 16:04:12 -05:00
Chris Dodge
9431318467 add some rate limiting to the password reset functionality 2014-02-26 16:02:42 -05:00
Jim Abramson
9c791a952c Merge pull request #2706 from edx/jsa/forum-delete-comments-acceptance 
Add acceptance tests for forums comment deletion.
 2014-02-26 11:19:20 -05:00
jsa
bea463d950 Add acceptance tests for forums comment deletion. 
JIRA: FOR-472
 2014-02-26 10:31:02 -05:00
jsa
7be356b390 auto_auth: add ability to configure forum roles and scrape user id. 2014-02-26 10:30:55 -05:00
Waheed Ahmed
cb4d3dd327 Merge pull request #2671 from edx/waheed/lms1479-front-end-validation-for-username-email 
Added validation for username and email max length.
 2014-02-26 19:42:04 +05:00
Waheed Ahmed
874d7360c1 Added validation for username and email max length. 
LMS-1479
 2014-02-26 16:25:37 +05:00
zubiar-arbi
cf47b6b670 assign default forum role 'Student' to user on course recreate with same name STUD-1140 
STUD-1140
 2014-02-26 15:40:44 +05:00
Calen Pennington
a2137cec35 Merge pull request #2603 from cpennington/xblock-acid-resources-test 
Add tests of local_resource_url
 2014-02-25 16:46:10 -05:00
Chris Dodge
fe3ebca1c5 add new feature to make sure we aren't writing PII into the application logs. So far we're aware of doing so regarding Auth use-cases 2014-02-25 00:14:19 -05:00
Don Mitchell
0b262e7cea Merge pull request #2660 from edx/dbarch/parse_course_id 
Dbarch/parse course
 2014-02-24 13:24:00 -05:00
Don Mitchell
81a92e4bfc Consolidate course_id triple parsing 2014-02-24 11:45:59 -05:00
Jay Zoldak
e4b6fe2c68 Merge pull request #2695 from edx/will/revert-paver-again 
Revert "Fix sys.path manipulation in pavement.py, with detailed comment"
 2014-02-24 11:31:26 -05:00
Will Daly
812e71bbbb Revert "Fix sys.path manipulation in pavement.py, with detailed comment" 
This reverts commit 544616be4b.
 2014-02-24 11:30:40 -05:00
Ned Batchelder
b21473f976 Make fake_ugettext et al more usable elsewhere. 2014-02-24 10:06:13 -05:00
Will Daly
38d403f6c9 Merge pull request #2615 from edx/will/paver-attempt-2 
Paver (Part 1) -- Attempt 2
 2014-02-24 07:51:05 -05:00