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

20793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diana Huang
5cfb42fc0f Change the from address for LinkedIn emails 2014-01-30 11:58:28 -05:00
Brian Talbot
43b4cd405d Merge pull request #2359 from edx/talbs/lms-fix-oldhomepage 
LMS: Quick Clean Up of Old Index
 2014-01-30 07:57:46 -08:00
chrisndodge
1b7e144beb Merge pull request #2331 from edx/chrisndodge/lock-accounts-after-failed-attempts 
Ability to lock out accounts for N seconds after M failed login attempts
 2014-01-30 07:34:06 -08:00
Chris Dodge
3554c52a20 update test to reflect that the non-microsite homepage has been changed to remove all the partnership content 2014-01-30 10:26:13 -05:00
Brian Talbot
26eefc94c5 LMS: removes broken home header image and replaces with basic gradient background 
LMS-2121
 2014-01-30 10:26:13 -05:00
Brian Talbot
9f8f80b5e9 LMS: removes unused and broken university partner images from old homepage UI 
LMS-2121
 2014-01-30 10:26:12 -05:00
Christina Roberts
088a713788 Merge pull request #2330 from edx/christina/export-commands 
Export conversion script
 2014-01-30 06:59:22 -08:00
David Baumgold
08fb49506a Merge pull request #2302 from edx/db/django-command-migrate-to-split 
Django command for migrating courses to split-mongo (and deleting)
 2014-01-30 06:51:27 -08:00
cahrens
2ee964345f Convert between export formats. 
STUD-1196
 2014-01-30 09:22:43 -05:00
Oleg Marshev
31593699e5 Merge pull request #2080 from edx/oleg/lti_add_roles 
Add role parameter to LTI. BLD-583.
 2014-01-30 05:13:06 -08:00
Oleg Marshev
13c19c98e2 Add role parameter to LTI. BLD-583. 2014-01-30 14:37:33 +02:00
Waheed Ahmed
c21e012d8b Merge pull request #2241 from edx/waheed/ora256-reflected-xss-in-ora-submissions-fix 
Fixed allowing for execution of arbitrary Javascript in student response
 2014-01-30 04:14:28 -08:00
Waheed Ahmed
d12e7e8877 Fixed allowing for execution of arbitrary Javascript in student response. 
ORA-256
 2014-01-30 16:17:48 +05:00
Anton Stupak
a077dc815c Merge pull request #2352 from edx/anton/fix-persist-speed-per-video 
Video: Fix speed persistence per video.
 2014-01-30 00:04:31 -08:00
Valera Rozuvan
ec8a86f2a2 Merge pull request #2347 from edx/valera/update_docs_mongodb 
Updated internal documentation on MongoDB.
 2014-01-29 19:18:59 -08:00
David Baumgold
dd627edae4 add logging for auditing when split-mongo courses are deleted 2014-01-29 16:57:23 -05:00
David Baumgold
7cbee5e817 rename locator_string to package_id 2014-01-29 16:57:01 -05:00
Chris Dodge
8c60f2935a Add optional feature to lock out accounts after N failed login attempts. Lockouts will last M seconds. 
add DB migration and fix earlier mistakes in student migration history

add tests and fix bugs that came out of those unit tests

remove unused import

pep8/pylint

address some PR feedback

fix tests

fix broken test

try to mock time

use freeze-gun to overload the system time to simulate the future
 2014-01-29 16:54:28 -05:00
Matt Drayer
d35667384a Merge branch 'release' 
Conflicts:
	requirements/edx/base.txt
 2014-01-29 16:19:30 -05:00
David Baumgold
a0bc10a1c3 Merge pull request #2357 from edx/db/move-doc-url-func 
Move doc_url function out of edxmako middleware
 2014-01-29 12:59:31 -08:00
David Baumgold
e7c5e62da7 Read from doc url mapping file at load time, rather than once per request 2014-01-29 15:28:40 -05:00
David Baumgold
e10e47d8ab Add test for specifying locator to migrate_to_split command 2014-01-29 15:11:05 -05:00
David Baumgold
cfdc5b5e96 fix docstrings 2014-01-29 15:11:05 -05:00
David Baumgold
e0c1abc11f check for old mongo course 2014-01-29 15:11:05 -05:00
David Baumgold
e18507f188 fix pep8/pylint issues 2014-01-29 15:11:04 -05:00
David Baumgold
692502c0fb Don't cache falsy values 2014-01-29 15:11:04 -05:00
David Baumgold
3eee65892b Added command to delete split-mongo course 2014-01-29 15:11:04 -05:00
David Baumgold
c3b8d52dcd move user-finding logic out of command 2014-01-29 15:11:04 -05:00
David Baumgold
096088cc75 fix test failures: clear loc_mapper cache 2014-01-29 15:11:03 -05:00
David Baumgold
dcc1d201ce Can't use UserFactory in CMS tests :( 2014-01-29 15:11:03 -05:00
David Baumgold
de96a47eac happy path unit test 2014-01-29 15:11:03 -05:00
David Baumgold
f08dc42802 Add some dummy arg parsing tests 2014-01-29 15:11:03 -05:00
David Baumgold
bbec626651 first pass on a migrate_to_split Django command 2014-01-29 15:11:03 -05:00
David Baumgold
9e8be1bbc3 make SplitMigrator take a User object, rather than a user ID 2014-01-29 15:11:02 -05:00
David Baumgold
b25b3e1bef Move doc_url function out of edxmako middleware 2014-01-29 14:52:43 -05:00
Jim Abramson
74067b80e3 Merge pull request #2266 from edx/jsa/forums-response-button 
add "Add A Response" button to thread views in discussion tab / inline
 2014-01-29 11:48:32 -08:00
Jim Abramson
707f6388f4 Merge pull request #2344 from edx/jsa/forums-new-thread-attrs 
Allow new response pagination parameters to pass through thread model.
 2014-01-29 11:48:12 -08:00
Mark Hoeber
bf1b75f5c1 Merge pull request #2355 from edx/markhoeber/documentation/release-notes-1-28-14 
Markhoeber/documentation/release notes 1 28 14
 2014-01-29 11:02:45 -08:00
Valera Rozuvan
e64145cfaf Updated internal documentation on MongoDB. 
Provided several suggestions what to do if MongoDB
daemon doesn't start.
 2014-01-29 20:52:12 +02:00
Calen Pennington
ce19f2887c Merge pull request #2294 from cpennington/language-dark-launch 
Add the ability to dark-launch languages
 2014-01-29 10:52:06 -08:00
Calen Pennington
271fbdb40a Switch dark_lang to database backed configuration 2014-01-29 13:24:41 -05:00
Mark Hoeber
7a78a16d1a Added doc links 2014-01-29 13:17:22 -05:00
Mark Hoeber
9c6a7a3e86 Merge pull request #2342 from edx/markhoeber/documentation/stud-1191 
Component Duplicate Documentation
 2014-01-29 10:07:04 -08:00
Mark Hoeber
1596af2ac8 Merge pull request #2354 from edx/markhoeber/documentation/LMS-1601 
Markhoeber/documentation/lms 1601
 2014-01-29 10:05:17 -08:00
jorr-at-google
87aa71c450 Merge pull request #2309 from edx/jorr/feature/use-xblock-publish-api 
Use the publish() api from xblock.runtime.Runtime
 2014-01-29 09:25:33 -08:00
Mark Hoeber
f8cfdf0d83 Copy edit 
From Alison’s input
 2014-01-29 11:56:14 -05:00
Sylvia Pearce
c79aee1350 Add more information to release notes 
Add info to release notes. Also add bookmark in Advanced Video Settings section so release notes can link to it.
 2014-01-29 11:48:15 -05:00
Calen Pennington
c712668b05 Merge pull request #2292 from edx/sarina/make-dummy-executable 
Convert i18n/make_dummy.py to a standalone script
 2014-01-29 08:18:39 -08:00
chrisndodge
7162aa66f3 Merge pull request #2285 from antoviaque/registration-extra-fields 
Registration extra fields: Selectively require/hide registration fields & add optional country/city fields
 2014-01-29 08:09:53 -08:00
Will Daly
b60487c85c Pin subunit and testtools libraries to prevent test failures after release of these libraries on 1/29/14 2014-01-29 11:01:14 -05:00