Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sarina Canelake
242f3ce533 Merge pull request #4428 from edx/sarina/revert-i18n-change 
Revert "Pull out edX into variables in password reset email"
 2014-07-15 11:13:20 -04:00
Sarina Canelake
df8f3bd39e Revert "Pull out edX into variables in password reset email" 
This reverts commit 3a2276b537.
 2014-07-15 10:20: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
Usman Khalid
682e3108a8 Use /tmp/mako_lms and /tmp/mako_cms for compiled mako templates. 
Currently a new temp directory is created for every process via
mkdtemp_clean() which cleans it on process exit.

However, this is not compatible with using --preload option of
gunicorn. With this option the tmp directory is created on gunicorn
start and is shared by all the workers. But when a worker exits it
deletes the directory. And so on the next requent the tmp directory
needs to be recreated and the templates need to be recompiled.

LMS-6507
 2014-07-15 17:37:23 +05: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
louyihua
7f1c784629 Add defininition of window.location.origin in both CMS/LMS 
The same bug in studio was fixed in #3893, and as TinyMCE is also used in LMS, it should be also fixed in LMS.
Here a common javascript file called 'ie_shim.js' is added, so that in the future it can be used for other IE compatibility purposes too.
 2014-07-15 11:34:52 +08: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
chrisndodge
e8d14b207b Merge pull request #4415 from edx/cdodge/enhanced_registration_fields 
add ability for microsites to define additional profile fields to be cap...
 2014-07-14 15:50:18 -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
Stephen Sanchez
930ba01bc2 Updating release tag for July 14th, 2014 2014-07-14 10:52:15 -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
Chris Dodge
8516c0dbff add ability for microsites to define additional profile fields to be captured in an overriden signup form - register.html- and then store additional profile in the profile's 'meta' field as JSON blob 
fix broken unit test

add some unit tests
 2014-07-14 09:36:28 -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