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

20784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Alexander Kryklia
4234daeb46 Merge pull request #2353 from edx/alex/no_error_on_empty_answer_to_master 
Alex/no error on empty answer to master
 2014-01-29 07:05:40 -08:00
Calen Pennington
c0470008ba Make i18n dummy dummy-ify all source english strings (rather than a static list) 2014-01-29 09:57:56 -05:00
polesye
642c239a01 Fix speed persistence per video. 2014-01-29 16:49:39 +02:00
Mark Hoeber
5728518b7d Fixed link 2014-01-29 09:39:22 -05:00
Calen Pennington
8424f610d5 Merge pull request #2171 from cpennington/pylint-cleanup 
Fix pylint violations from #2129
 2014-01-29 06:38:17 -08:00
Mark Hoeber
f72e9d29d5 Fixed link 2014-01-29 09:35:20 -05:00
Will Daly
021bece881 Merge pull request #2239 from edx/will/ora-ai-and-peer-tests 
ORA AI and Peer acceptance tests
 2014-01-29 06:28:39 -08:00
Mark Hoeber
735b84039c First draft 1-29-14 release notes 2014-01-29 09:27:42 -05:00
Calen Pennington
d379b35fa9 Add config_model, a library for database backed configuration 
ConfigurationModels can be managed using the admin site. They are
append-only, and track the user who is making the change, and the time
that the change was made. The configuration is stored in the database,
and cached for performance.

[LMS-1220]
 2014-01-29 09:17:19 -05:00