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

24387 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Sarina Canelake
8e8f6127e6 Merge pull request #4406 from edx/sarina/071414-language-update 
Sarina/071414 language update
 2014-07-14 09:19:57 -04:00
Sarina Canelake
980016b59f Update translations (autogenerated message) 2014-07-14 09:19:25 -04:00
Sarina Canelake
5edcd969c8 Add new Transifex languages 
Filipino, Marathi, Serbian, Telugu, Uzbek
 2014-07-14 09:19:24 -04:00
clytwynec
1807948f2e Merge pull request #4391 from edx/clytwynec/clean_up_lettuce_output 
Clytwynec/clean up lettuce output
 2014-07-14 09:09:25 -04:00
Waqas Khalid
f1df9a1093 Fix anonymous posts appear are labeled with the logged in user's role 
FOR-156
 2014-07-14 17:01:23 +05:00
chrisndodge
6131177891 Merge pull request #4403 from edx/asadiqbal08/usersignupsource_model_updation_for_user_id 
(WIP) Updated the user_id_id field of UserSignUpSource model
 2014-07-14 07:21:37 -04:00
asadiqbal08
ce7e625c3b Update the UserSignUpSource model 2014-07-14 12:36:00 +05:00
Peter Pinch
2c8f82f03d Fixing calculator hint to display correct definition of the constant T 2014-07-13 17:35:52 -04:00
Don Mitchell
9cf082e727 Merge pull request #4369 from edx/bug/stud-1962 
Bug/stud 1962
 2014-07-11 16:57:00 -04:00
Mathew Peterson
cec09be006 Merge pull request #4225 from edx/mathewpeterson/lms-opaque-keys-bugs 
Testing for bugs off master for opaque-keys deprecation
LMS-2753
 2014-07-11 16:53:23 -04:00
Sarina Canelake
152b84432e Merge pull request #4396 from Stanford-Online/kluo/theme_password_reset 
Pull out edX into variables in password reset email
 2014-07-11 16:02:51 -04:00
Mat Peterson
cd82abae6c More test fixes 
Fix opaque key TODOs left over from split-migrator changes and fixed test_image_import to use the correct course

Reset get_location_from_path to pre deprecated opaque-keys

Fix CMS acceptance test

Fixed usage key reassignment in item.py
 2014-07-11 15:40:09 -04:00
Mat Peterson
98649072bd skipping test_clone_course 2014-07-11 15:40:09 -04:00
Sarina Canelake
b2867a694d Quality cleanup 2014-07-11 15:40:09 -04:00
Diana Huang
96420f30f1 Minor cleanups 
Remove unnecessary check.
Fix merge conflict
 2014-07-11 15:40:09 -04:00
Diana Huang
97331d4c16 Fix merge conflict 2014-07-11 15:40:09 -04:00
Sarina Canelake
cfb7f99c8e Add filter to ignore deprecation warnings by default 
Add filter to only show first occurance of DepWarning
 2014-07-11 15:40:09 -04:00
Mat Peterson
df1a9304c1 Made fill_in_run public in mongo and added fill_in_run to mixed which funnels to mongo 2014-07-11 15:40:09 -04:00
Mat Peterson
b2ae827fa4 Old style location urls removed from CourseFixture and CoursePage 2014-07-11 15:40:09 -04:00
Sarina Canelake
ff2822cf48 Fix cms tests 2014-07-11 15:40:09 -04:00
Diana Huang
ad7e0f94fb Update opaque-keys hash 2014-07-11 15:40:09 -04:00
Diana Huang
c21977326c Fix test_import and unicode issues. 
Handle unicode in get_course_index
 2014-07-11 15:40:08 -04:00
Mat Peterson
638a1aaec4 Fixed test that hardcoded url to deprecated format 2014-07-11 15:40:08 -04:00
Diana Huang
f82a950f7b Skip tests for location mapper 
Since we're trying to get rid of location mapper,
skip these tests until we get rid of it entirely.
 2014-07-11 15:40:08 -04:00