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

24411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarina Canelake
fba7bb91bd Merge pull request #3718 from jazkarta/idde-bugfix 
Fix a bug in Individual Due Date Extensions (IDDE).
 2014-07-16 11:30:10 -04:00
Don Mitchell
347b660623 Merge pull request #4413 from edx/remove-loc-mapper 
Remove LocMapperStore
 2014-07-16 11:09:24 -04:00
Don Mitchell
9f2fa7e105 sql migrations cannot use loc mapper 2014-07-16 09:21:25 -04:00
Don Mitchell
a9695828ab Remove LocMapperStore 
LMS-2918
 2014-07-16 09:21:25 -04:00
muhammad-ammar
a71919efa7 Merge pull request #4422 from edx/ammar/fix-handout-tests 
Add promise to ensure unit visibility is changed
 2014-07-16 12:25:48 +05:00
Andy Armstrong
cd2315c1fb Merge pull request #4435 from edx/christina/stud-1963 
Disable test that is leaving modal open.
 2014-07-15 17:48:11 -04:00
Feanil Patel
a5330052c8 Merge pull request #4430 from edx/feanil/fix_bokchoy 
Feanil/fix bokchoy
 2014-07-15 17:05:09 -04:00
cahrens
8a484b64d3 Disable test that is leaving modal open. 
STUD-1963
 2014-07-15 16:52:52 -04:00
Jason Bau
fb39111af3 Merge pull request #4417 from edx/jbau/event-responsetype 
Change answer <-> response matching in capa.get_submission_metadata
 2014-07-15 16:51:42 -04:00
Sarina Canelake
666f563ee6 Merge pull request #4418 from Stanford-Online/dcadams/make_registration_button_conditional 
Make text on register button on About page conditional.
 2014-07-15 16:37:00 -04:00
Chris Rossi
700504c52f Fix a bug in Individual Due Date Extensions (IDDE). 
The IDDE implementation relied on a StudentModule being created for a
particular block in order to set the extended due date on that block.
Since StudentModules seem to be created on demand whenever data is
written to an attribute with Scope.user_state, it meant that if a
homework problem hadn't yet been touched by a student it was possible
that the due date extension wouldn't take effect for that problem, even
if the due date extension was successfully set for the parent unit.

This patch fixes this problem by creating new StudentModules as
necessary in order to make sure extended due dates propogate properly to
all problems in a unit.
 2014-07-15 15:54:55 -04:00
David Adams
aa1b623904 Make text on register button on About page conditional. 
Added a new advanced setting; invitation_only

 If invitation_only display "Enrollment in this course is by invitation only"
 Otherwise, if outside of enrollment period display "Enrollment is Closed"

 This issue is logged at LMS-2670

 Also fixed in this PR is issue LMS-2717; even though the Register button was greyed out,
 clicking it sent one to the registration page.
 2014-07-15 12:51:12 -07:00
Alison Hodges
9c929104c7 Merge pull request #4372 from edx/ahodges/documentation/discussionoverview 
New chapter on discussion features for all users
 2014-07-15 15:19:59 -04:00
Feanil Patel
22b97338c9 Create the test database if it doesn't exist. 
There is a bootstrapping case where the test DB doesn't exist which causes reset_db to fail.
 2014-07-15 13:55:18 -04:00
Feanil Patel
c9a63657f6 Check to make sure that the mysql service is running. 2014-07-15 13:54:25 -04:00
Calen Pennington
4986a61877 Merge pull request #4414 from cpennington/fix-get-module-calls 
Fix calls to get_module to not pass course ids as positions
 2014-07-15 12:55:12 -04:00
Alison Hodges
b96658c85e New chapter on discussion features for all users 2014-07-15 12:48:09 -04:00
Calen Pennington
4ded4be700 Fix calls to get_module to not pass course ids as positions 2014-07-15 09:22:04 -04:00
Sarina Canelake
d1891542df Merge pull request #4420 from Stanford-Online/kluo/fix-name-changes-template 
Fix pending name changes template
 2014-07-15 09:03:10 -04:00
Will Daly
f86b031a20 Merge pull request #4416 from edx/will/timepicker-css-in-unit-editor 
Add JQuery timepicker CSS to the unit and container templates
 2014-07-15 07:59:41 -04:00
Tim Babych
b79fe85fd0 Merge pull request #4423 from edx/tim/group-conf-course-key-pattern 
Update (optional) Group Configuration urls to use settings.COURSE_KEY_PATTERN
 2014-07-15 12:40:56 +03:00
Tim Babych
d7b396a98b Update (optional) Group Configuration urls to use settings.COURSE_KEY_PATTERN. 2014-07-15 12:28:37 +03:00
Muhammad Ammar
b2e08ddc72 Add promise to ensure unit visibility is changed 2014-07-15 07:10:01 +00:00
Tim Babych
246e0e6f66 Merge pull request #4411 from edx/anton/group-experiments 
Create new group configurations page
 2014-07-15 08:19:34 +03:00
Kevin Luo
adc7c13f45 Fix pending name changes template 
- Strings marked for translation need to be wrapped in quotes to be
string type.
- Update old post function call
- Remove extra close brackets in function definitions
- Wrap href attribute in quotes
- Move square bracket outside of translated text
 2014-07-14 17:04:42 -07:00
Nimisha Asthagiri
851fe47a95 Merge pull request #4370 from edx/nimisha/split-drop-database-2952 
Implement close_connections and drop_database on modulestores.
 2014-07-14 18:17:48 -04:00
Jason Bau
faff8c577e Change answer <-> response matching in capa.get_submission_metadata 2014-07-14 17:09:06 -04:00
Christina Roberts
afa3e0d2d5 Merge pull request #4402 from edx/christina/staff-lock 
Add "visible_to_staff_only" field to support staff locking in Studio.
 2014-07-14 16:34:33 -04:00
Nimisha Asthagiri
d7cf8b7fa0 Implement close_connections and drop_database on modulestores. 2014-07-14 16:01:10 -04:00
cahrens
66173ab9e6 Add "visible_to_staff_only" field to support staff locking in Studio. 
STUD-1875
 2014-07-14 14:46:40 -04:00
Sarina Canelake
f358f859b6 Merge pull request #4410 from edx/sarina/update-deprecation-warnings 
Update opaque-keys library
 2014-07-14 14:44:06 -04:00
Will Daly
0c90b04ecd Add JQuery timepicker CSS to the unit and container templates 2014-07-14 14:07:39 -04:00
Nimisha Asthagiri
bc03fb0881 Merge pull request #4380 from edx/nimisha/mongo-bwc-config 
auto-migrate old mongo to draft modulestore
 2014-07-14 13:46:00 -04:00
Carson Gee
95dd2aad0b Merge pull request #3836 from mitocw/cg/add_default_logging 
Adding django default log handlers into logging configuration
 2014-07-14 13:08:05 -04:00
Sarina Canelake
88a3bac947 Update opaque-keys library 2014-07-14 13:04:13 -04:00
Don Mitchell
57ec402433 Merge pull request #4397 from edx/split-migrator/lms-2936-ok 
Refactor split migrator
 2014-07-14 12:10:42 -04:00
Stephen Sanchez
86f80c2532 Merge pull request #4407 from edx/ora2/release-2014-07-14T13.17 
Updating release tag for July 14th, 2014
 2014-07-14 12:02:05 -04:00
Nimisha Asthagiri
23c5febc17 Added deprecation warnings. 2014-07-14 11:59:40 -04:00
Nimisha Asthagiri
7503cc2473 reverting back to migrating the settings in the env files 2014-07-14 11:59:40 -04:00
Nimisha Asthagiri
4859eee23b Move modulestore django settings migration code down into the modulestore layer so it works for all django-based callers. 2014-07-14 11:59:40 -04:00
Nimisha Asthagiri
a218e66d2e auto-migrate old mongo to draft modulestore 2014-07-14 11:58:40 -04:00
Alison Hodges
2c83dc3f09 Merge pull request #4401 from edx/ahodges/dosumentation/DOC719 
Ahodges/dosumentation/doc719
 2014-07-14 11:53:17 -04:00
Alison Hodges
85df351cac Revising policy key names to match new UI 2014-07-14 11:52:48 -04:00
Ned Batchelder
c36b17260d Merge pull request #4405 from pdpinch/fix-calc-definition-of-T 
Fixing calculator hint to display correct definition of the constant T
 2014-07-14 11:33:23 -04:00
Tim Babych
d30e986abc Merge pull request #4290 from edx/anton/create-new-configurations 
Create new group configurations page.
 2014-07-14 18:25:09 +03:00
Don Mitchell
639658913d Refactor split migrator 
LMS-2936

Also, a bunch of ancillary cleanups.

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_publish.py

Conflicts:
	cms/djangoapps/contentstore/management/commands/migrate_to_split.py
	cms/djangoapps/contentstore/management/commands/tests/test_rollback_split_course.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/mixed.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	common/lib/xmodule/xmodule/modulestore/split_migrator.py
	common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
	common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py
	common/lib/xmodule/xmodule/modulestore/tests/test_split_w_old_mongo.py
 2014-07-14 11:20:29 -04:00
polesye
205d24f5cf BLD-1121: Create new group configurations page. 2014-07-14 17:44:48 +03:00
Greg Price
36352fa501 Merge pull request #4383 from mlkwaqas/waqas/for156-anonymous-posts-labels-user-roles 
Fix anonymous posts appear are labeled with the logged in user's role
 2014-07-14 10:43:25 -04:00
Stephen Sanchez
a41d04e65b Updating release tag for July 14th, 2014 2014-07-14 10:23:14 -04:00
Stephen Sanchez
0a73d403d7 Merge pull request #4238 from edx/sanchez/TIM-645-File-Upload-Service 
Updating settings and requirements for platform to support file upload
 2014-07-14 09:22:40 -04:00