Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ These are notable changes in edx-platform. This is a rolling list of changes,
in roughly chronological order, most recent first. Add your entries at or near
the top. Include a label indicating the component affected.

Common: Switch from mitx.db to edx.db for sqlite databases. This will effectively
reset state for local instances of the code, unless you manually rename your
mitx.db file to edx.db.

Blades: Video Transcripts: Fix clear and download buttons. BLD-438.

Common: Switch over from MITX_FEATURES to just FEATURES. To override items in
Expand Down
2 changes: 1 addition & 1 deletion cms/envs/dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': ENV_ROOT / "db" / "mitx.db",
'NAME': ENV_ROOT / "db" / "edx.db",
}
}

Expand Down
2 changes: 1 addition & 1 deletion common/djangoapps/terrain/browser.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def initial_setup(server):
def reset_data(scenario):
"""
Clean out the django test database defined in the
envs/acceptance.py file: mitx_all/db/test_mitx.db
envs/acceptance.py file: edx-platform/db/test_edx.db
"""
LOGGER.debug("Flushing the test database...")
call_command('flush', interactive=False, verbosity=0)
Expand Down
2 changes: 1 addition & 1 deletion lms/envs/dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': ENV_ROOT / "db" / "mitx.db",
'NAME': ENV_ROOT / "db" / "edx.db",
}
}

Expand Down
2 changes: 1 addition & 1 deletion lms/envs/static.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': ENV_ROOT / "db" / "mitx.db",
'NAME': ENV_ROOT / "db" / "edx.db",
}
}

Expand Down
2 changes: 1 addition & 1 deletion lms/envs/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': TEST_ROOT / 'db' / 'mitx.db'
'NAME': TEST_ROOT / 'db' / 'edx.db'
},

}
Expand Down