Will Daly
4c842409f7
Add ignore patterns for staticfiles to avoid processing symlink dirs
2013-12-12 10:33:38 -05:00
e0d
7be524d769
Removing duplicated initialization code.
2013-12-11 12:59:07 -05:00
Bertrand Marron
f576673a87
Add email configuration to cms/envs/aws.py
...
This allows emails to be sent by Studio.
2013-12-11 16:11:23 +01:00
Bertrand Marron
4e641b946d
Add default email settings
...
These are the django default settings.
2013-12-11 16:11:23 +01:00
cahrens
ec55d8c1a9
Create explicit Locations.
...
STUD-1030
2013-12-11 10:03:34 -05:00
David Baumgold
2bc4198760
Merge pull request #1853 from edx/db/update-comments
...
Updating comments and docs for MITx -> edX transition
2013-12-10 11:10:37 -08:00
David Baumgold
fb13bed947
Updating comments and docs for MITx -> edX transition
2013-12-10 13:21:18 -05:00
Will Daly
4d6c8ccae9
Disable failing JS tests
2013-12-10 13:04:52 -05:00
David Baumgold
28f22393bf
whitespace-only changes
2013-12-10 11:45:49 -05:00
Calen Pennington
137c54b2c7
Add debug logging of exceptions that happen during rending of studio_view or student_view in Studio
2013-12-09 16:27:49 -05:00
Frances Botsford
089a61c6af
studio outline test fixes
2013-12-09 15:21:57 -05:00
Frances Botsford
a2d5500f9e
FED clean up of studio outline page
2013-12-09 15:21:57 -05:00
David Baumgold
b784979976
Merge pull request #1792 from edx/man2life-i18n-no-forums
...
i18n (no forums)
2013-12-09 11:28:18 -08:00
Don Mitchell
0684f6a40a
Merge pull request #1878 from edx/dhm/pymongo_client
...
Upgrade pymongo usage from deprecated connection to client
2013-12-06 13:14:28 -08:00
Will Daly
fa1acae80d
Disabled AJAX Errors Course Overview JS test
2013-12-06 13:55:49 -05:00
Christina Roberts
95c86248bd
Merge pull request #1869 from edx/christina/export-error
...
On export error, handle quotes within string.
2013-12-06 09:54:25 -08:00
cahrens
bbeded71ec
On export error, handle quotes within string.
...
STUD-1013
2013-12-06 12:02:02 -05:00
David Baumgold
03c8c0e1e7
Merge pull request #1880 from edx/db/mitx-edx-locmem
...
update LocMemCache location to use edx instead of mitx
2013-12-06 08:30:07 -08:00
David Baumgold
1134b88415
update LocMemCache location to use edx instead of mitx
2013-12-06 11:22:26 -05:00
David Baumgold
2666b96976
Change mitx.db to edx.db for dev sqlite
2013-12-06 11:21:19 -05:00
Don Mitchell
b5691cd4d1
Upgrade pymongo usage from deprecated connection to client
...
LMS-1551
2013-12-06 10:47:06 -05:00
David Baumgold
f747c762d8
Merge pull request #1772 from edx/db/locator-refactor-textbooks
...
Refactor textbooks to use locator URLs
2013-12-05 13:25:14 -08:00
David Baumgold
03d7d0e952
more i18n work
2013-12-05 14:03:02 -05:00
Will Daly
e0fe8bcdc7
Removed extra trailing slash from STATIC_URL in devstack
...
Let staticfiles determine the footer URLs
2013-12-05 13:47:10 -05:00
David Baumgold
d8103d4377
course.save() is no longer necessary
2013-12-05 13:21:55 -05:00
David Baumgold
c93198235e
Pass PDF textbooks to template separately
2013-12-05 13:19:00 -05:00
David Baumgold
06f400191f
Use window.course instead of window.section
2013-12-05 13:17:39 -05:00
David Baumgold
0d3490374e
Refactor textbooks to use locator URLs
...
STUD-945
2013-12-05 13:13:28 -05:00
polesye
b4f82b3837
BLD-438: Fix clear and download buttons.
2013-12-05 11:43:29 +02:00
David Baumgold
bbcd8affa9
Merge pull request #1839 from edx/db/mitx-root-url
...
MITX_ROOT_URL => EDX_ROOT_URL
2013-12-04 12:17:13 -08:00
David Baumgold
b32f2bc170
MITX_ROOT_URL => EDX_ROOT_URL
2013-12-04 12:59:35 -05:00
Brian Talbot
d95b46dd19
Studio: adding back in links (and supporting styling) to ToS and Privacy Policy to footer and sign up UI
...
STUD-151
2013-12-04 12:03:25 -05:00
David Baumgold
d1f3e3a6b5
Merge pull request #1827 from edx/db/remove-mitx-from-features
...
settings.MITX_FEATURES => settings.FEATURES
2013-12-04 07:13:19 -08:00
Christina Roberts
2682a14d43
Merge pull request #1790 from edx/christina/transcripts
...
Change video transcripts to use locators instead of locations.
2013-12-04 06:41:44 -08:00
David Baumgold
79815acc6e
Fall back on MITX_FEATURES env variable if FEATURES isn't found
...
For a smoother transition to the new world
2013-12-03 16:29:48 -05:00
David Baumgold
f3f4af8087
settings.MITX_FEATURES => settings.FEATURES
2013-12-03 15:34:55 -05:00
David Baumgold
69899e24df
Merge pull request #1823 from edx/db/mitxmako-edxmako
...
mitxmako => edxmako
2013-12-03 11:36:50 -08:00
David Baumgold
8eff442752
mitxmako => edxmako
2013-12-03 14:15:09 -05:00
Don Mitchell
9dc68b03a0
Improve auth handling of Locators
...
Ensure user admin screen gets the union of all possibly matching group names.
Smarter default group naming.
STUD-1003
2013-12-02 15:28:22 -05:00
Valera Rozuvan
d75b580f8f
Enabled back turned off Video acceptance tests.
...
Updated comments.
BLD-537
2013-11-29 10:53:31 +02:00
Ned Batchelder
c8a7b259ff
Resolve conflicts merging master to rc/2013-11-21
2013-11-27 11:55:44 -05:00
Jay Zoldak
341875bb18
Remove code related to Pearson Testing Centers
2013-11-26 17:04:19 -05:00
cahrens
5fdfc60957
Change video transcripts to use locators instead of locations.
...
Part of STUD-870
2013-11-26 16:52:56 -05:00
Calen Pennington
6d613f9d4e
Enable un-authenticated handler urls
...
Updates to depend on the latest version of XBlock, which includes
support for service-to-service (thirdparty) handler urls, which aren't
authenticated with a user (unlike handler requests coming from the
xblock client-side javascript).
Co-author: Ned Batchelder <ned@edx.org >
2013-11-26 16:29:34 -05:00
Will Daly
761699bf74
Disabled another video test that failed in master
2013-11-26 14:01:58 -05:00
Brian Talbot
bff94de284
Studio: adding basic italicize text styling into xmodule/block preview UI
...
STUD-963
2013-11-26 12:21:55 -05:00
Brian Talbot
5a5c8c0eb5
Merge pull request #1779 from edx/talbs/fix-studio-notificationsie
...
Studio: FIX - correcting hiding state of notification UI for < IE9
2013-11-26 09:09:17 -08:00
Will Daly
d00e5a4503
Disabled video caption tests that failed in master
2013-11-26 12:07:04 -05:00
Andy Armstrong
957175e3da
Merge pull request #1773 from edx/andy/unitidentifier
...
Changed unit identifier to be readonly, not disabled
2013-11-26 08:23:27 -08:00
Don Mitchell
7f91ce40ae
Restful api for course advanced settings
...
STUD-948
2013-11-26 10:17:52 -05:00
