Chris Dodge
fbbae44988
Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master
...
Conflicts:
cms/djangoapps/contentstore/views/course.py
lms/djangoapps/django_comment_client/base/views.py
lms/djangoapps/django_comment_client/management/commands/show_permissions.py
lms/djangoapps/django_comment_client/models.py
lms/djangoapps/django_comment_client/tests/test_utils.py
lms/envs/common.py
2013-05-20 10:22:36 -04:00
Greg Price
372084e0b6
Merge branch 'drupal-new'
...
Conflicts:
lms/envs/common.py
2013-05-17 16:17:35 -04:00
Carlos Andrés Rocha
35bd38d677
Add status app with simple view to check celery workers
2013-05-17 11:33:14 -04:00
Carlos Andrés Rocha
c05efbc31e
Added base Celery settings
2013-05-17 11:33:14 -04:00
Diana Huang
1c2175304e
Merge branch 'master' into drupal-new
2013-05-16 16:27:36 -04:00
cahrens
235ecff28b
In progress.
2013-05-16 10:40:48 -04:00
Chris Dodge
cbe205328a
Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master
...
Conflicts:
cms/djangoapps/contentstore/views.py
2013-05-13 15:47:33 -04:00
Jason Bau
408e26a0c1
parameterizes CMS email settings
2013-05-10 13:42:28 -07:00
Chris Dodge
3858f1b706
update cms envs
2013-05-06 16:02:13 -04:00
Diana Huang
182d69e36c
Add cookie name to the cms settings so we don't error out
...
while looking for it
2013-05-02 17:21:49 -04:00
Calen Pennington
dfd369b9e9
Make ordering of js bundles during jasmine tests consistant
2013-04-30 14:09:17 -04:00
Calen Pennington
9d94adbd1f
Merge pull request #1871 from MITx/feature/cale/fast-dev-server
...
Speed up local development
2013-04-24 12:12:05 -07:00
Steve Strassmann
8baddc0645
Merge branch 'master' of https://github.com/MITx/mitx into feature/i18n
2013-04-24 10:41:09 -04:00
Steve Strassmann
6f10348836
addressed comments from pull request
2013-04-23 10:07:51 -04:00
Calen Pennington
729daf5cbf
Move xmodule asset gathering out of server startup
...
This allows us to a) compile the coffeescript and sass from xmodules
using the new out-of-band method and b) reload xmodule static content
whenever it changes, which should make devs much happier.
2013-04-18 15:19:19 -04:00
Calen Pennington
346aee8863
Make django-pipeline only work with raw js and css
2013-04-18 07:18:36 -04:00
Steve Strassmann
6e34c668bb
introduce i18n
2013-04-17 11:30:29 -04:00
Chris Dodge
6d6b3a59fe
violation fixes
2013-04-12 15:27:36 -04:00
Mark L. Chang
2e9bf4ac0e
Merge remote-tracking branch 'origin/master' into feature/markchang/studio-analytics
...
Conflicts:
cms/envs/common.py
2013-04-04 16:11:22 -04:00
ichuang
2e852d16ac
Merge remote-tracking branch 'edx-mitx/master' into feature/ichuang/staff-email-for-course-creation
...
Conflicts:
cms/envs/common.py
2013-04-04 17:34:52 +00:00
Mark L. Chang
8439013f64
studio: added segment.io tracking
2013-04-04 01:51:14 -04:00
Mark L. Chang
43f6f0ce8f
put survey behind MITX_FEATURES flag
2013-04-03 00:28:08 -04:00
ichuang
1969a6633e
if user course creation is disabled & if staff email given, add link to request course creation by email
2013-03-31 16:05:09 +00:00
Chris Dodge
b609a96902
ummm. forgot to commit stuff
2013-03-27 22:51:52 -04:00
ichuang
4f33f7ffbc
turn on tracking (helps with debugging)
2013-02-24 05:07:23 +00:00
Ned Batchelder
c3b571bf9b
Make sure temp directories are properly cleaned up so running tests doesn't leave them behind.
2013-02-21 11:38:45 -05:00
Don Mitchell
cfa13922f5
Change url for login from login to signin.
2013-02-15 17:30:24 -05:00
Calen Pennington
33a3d5dbb7
Make it so that cms doesn't try to run collectstatic on course content
2013-02-08 10:49:43 -05:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
Calen Pennington
2551243dfa
Install the static_replace app for the management command
2013-02-05 11:06:46 -05:00
Victor Shnayder
6847779f22
Merge remote-tracking branch 'origin/master' into feature/victor/cohorts
...
Conflicts:
common/djangoapps/student/models.py
2013-01-26 12:37:26 -05:00
Victor Shnayder
87e92644b6
Make all tests pass
...
caveat: with a bit of hackery. Need to do better testing once things are live.
2013-01-25 16:13:55 -05:00
Don Mitchell
7cca46e691
Requirejs doesn't belong here
2013-01-23 13:00:01 -05:00
Chris Dodge
b8074b8bb4
add required video setting
2013-01-09 09:11:43 -05:00
Calen Pennington
cd9fbaeb02
Add timeout so that jasmine tests eventually fail if the server doesn't start
2012-10-30 15:51:21 -04:00
Calen Pennington
e8be6b3111
Get jasmine tests running on cms
2012-10-30 11:33:21 -04:00
Calen Pennington
0f043f35d7
Remove unused github_sync app
2012-10-23 13:40:49 -04:00
ichuang
09d7d6d688
add AUTH_USE_MIT_CERTIFICATES feature flag to CMS, and @ssl_login_shortcut
2012-10-14 16:40:04 -04:00
Calen Pennington
aff44b1f11
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
cms/djangoapps/contentstore/views.py
2012-10-02 12:12:55 -04:00
Calen Pennington
05b9e6cab2
Standardize more of css between lms and cms
2012-10-01 15:17:40 -04:00
Calen Pennington
44805ca383
Make discussion js work for cms as well as lms so that inline discussion xmodules load
2012-10-01 15:16:54 -04:00
Calen Pennington
c0ca7fe697
Make expansion/contraction work on overview page
2012-10-01 15:16:54 -04:00
Chris Dodge
27016465f4
support some simple authorization scheme to view/edit courses
2012-10-01 15:13:19 -04:00
Chris Dodge
85e6c23386
work-in-flight for uploading/serving of static content for courses
2012-09-27 10:24:53 -04:00
Calen Pennington
d4377d4ada
Make imports into the CMS ignore broken modules, while still loading bad xml as error modules in the LMS
2012-09-25 10:10:44 -04:00
Calen Pennington
2554413291
Hook up link to create modules from templates
2012-09-25 10:10:44 -04:00
Calen Pennington
2223d2007b
Only display the LMS link if it's set up, and don't error if it isn't
2012-09-25 09:18:54 -04:00
Victor Shnayder
6017aa698b
add ENABLE_DISCUSSION_SERVICE: "False" to cms config
2012-09-06 17:28:12 -04:00
Calen Pennington
c4bed2c128
Add basic authentication support for requests made to the xqueue server
2012-08-14 11:59:47 -04:00
Calen Pennington
91b6bb649c
Move queue interface url and auth into configuration, rather than hardcoding it
2012-08-14 11:59:46 -04:00
