cahrens
2cceda948c
Disable test point when run under CMS.
...
The template exists when django admin is enabled, but the mappings in CMS' urls.py do not exist.
2013-07-08 13:12:44 -04:00
cahrens
b53899aa54
Merge branch 'master' into christina/course-creator-table
2013-07-08 12:12:04 -04:00
Carlos Andrés Rocha
1fbab8e9fa
Merge pull request #295 from edx/rocha/celery-virtual-host
...
Add setting to set the virtual host of a Celery broker
2013-07-08 06:58:31 -07:00
Chris Dodge
a224c1e8a3
need to change aws.py to take the COURSES_WITH_UNSAFE_CODE from the envs.json file
2013-07-03 14:01:33 -04:00
cahrens
2970f24245
Initial admin table view.
2013-07-03 09:24:02 -04:00
Adam Palay
03aee3ed79
add tests
2013-07-01 18:21:47 -04:00
Don Mitchell
ddfbe59814
Make DraftModuleStore mongo only
...
DraftModuleStore was originally designed as a mixin, but never used that
way, and with the upcoming changes to use the versioned module store,
never will be. This changes removes a circular dependency between
mongo.py and draft.py.
2013-07-01 12:33:08 -04:00
cahrens
72999e8417
Initial model.
2013-06-28 12:19:51 -04:00
Carlos Andrés Rocha
a844548fb8
Add setting to set the virtual host of a Celery broker
2013-06-27 17:58:51 -04:00
cahrens
f095c5fec6
Add ENABLE_CREATOR_GROUP (set to False).
2013-06-27 11:00:43 -04:00
Don Mitchell
b42fe277d4
Add serial commas to modulestore definitions
2013-06-25 22:34:36 -04:00
Jay Zoldak
6c66736e3c
Specify a different xcontent mongo db for the acceptance tests
2013-06-25 16:56:36 -04:00
Jonah Stanley
b14553d867
Merge pull request #220 from edx/jonahstanley/make-units-parallel
...
Jonahstanley/make units parallel
2013-06-25 11:44:01 -07:00
Ned Batchelder
5a5d425eb3
Files that may not exist need F0401 suppressed during import.
2013-06-21 17:33:23 -04:00
JonahStanley
e4af7287b6
Initial testing for parallelization
2013-06-21 08:51:43 -04:00
Ned Batchelder
bc2f7b96ec
Remove a redundant pylint suppression.
2013-06-19 22:31:05 -04:00
Ned Batchelder
645d847bb1
Remove unused imports from cms, as detected by pylint.
2013-06-19 16:56:34 -04:00
David Baumgold
cb3d46d815
Merge pull request #199 from edx/db/notifications-refactor
...
Refactor Backbone notifications
2013-06-19 08:04:18 -07:00
David Baumgold
b6e3b0ee03
Refactor Backbone Notifications
...
Models are extraneous for something as temporary as a notifaction -- this change
moves all the configuration into the views, and removes the models entirely.
2013-06-18 10:20:31 -04:00
pdehaye
c1dc2628a0
need to import os
2013-06-18 00:52:23 +02:00
John Jarvis
a3f45bd94a
moving segment io setting below auth.json
2013-06-17 17:45:22 -04:00
Renzo Lucioni
c05a06a885
Merge pull request #182 from edx/renzo/segment-io-auth-backport
...
Switch to using environment variables to get key for Segment.io
2013-06-17 13:40:24 -07:00
Renzo Lucioni
97f4291b2a
Add comment clarifying which Segment.io key is in use
2013-06-17 15:35:04 -04:00
Chris Dodge
0d6f213997
I think we need to add the new assets.js into the PIPELIE
2013-06-17 11:10:36 -04:00
Chris Dodge
70ee4b8060
add unit tests for asset delete/restore
2013-06-17 11:10:35 -04:00
Chris Dodge
3fa6e77dff
add new collection configuration to support a 'trashcan' for assets. Update class factory to allow callers to specify if they want the default set of assets or the trashcan
2013-06-17 11:09:52 -04:00
Renzo Lucioni
1e3efadc28
switch to using environment variables to get key for Segment.io
2013-06-17 10:58:37 -04:00
Don Mitchell
e7c4e5f4d3
Fixed use_tz not being effective in cms
2013-06-10 17:16:35 -04:00
Don Mitchell
168cb306d3
Move tz_aware into connection config rather than settings.
...
Make django use_tz
2013-06-10 17:16:35 -04:00
Don Mitchell
28f8910db4
Make pymongo tz_aware
2013-06-10 17:16:34 -04:00
John Jarvis
1ef8682ae3
updating mktg defaults in common.py
2013-06-06 10:05:44 -04:00
John Jarvis
713d78002d
read MKTG_URLS from env.json
2013-06-06 09:50:43 -04:00
Ned Batchelder
56385cdf32
Merge pull request #79 from edx/ned/private-settings
...
Developer-private settings files
2013-06-05 13:17:26 -07:00
Ned Batchelder
7e8c06caf3
Developer-private settings files
...
Developers can have private settings files by creating
lms/envs/private.py or cms/envs/private.py. They are imported
at the end of dev.py. Note that they won't be imported if you
are using one of the other dev*.py variants.
2013-06-05 16:07:17 -04:00
Chris Dodge
ffdeac3dcd
seems like there's a Django bug and the SESSION_COOKIE_NAME needs to be an explicit str()
2013-06-05 14:31:32 -04:00
Chris Dodge
6fb97d52c0
fix typos
2013-06-05 11:21:35 -04:00
Chris Dodge
4bade8d286
allow configuration settings to specify a session cookie name. This is to avoid problems we are experiencing between simultaneous login sessions between edx.org and edge.edx.org on certain browsers (i.e. Firefox)
2013-06-05 10:30:28 -04:00
Nate Hardison
1001b315a3
Preprocess assets as Django management command
...
Rather than directly invoke command-line Python (and Mako) from the
assets Rakefile, or call an external Python script, use a Django
management command to preprocess all asset template files.
An "asset template file" is defined as a static asset file with a
file extension indicating that it needs to be run through a template
engine prior to Sass/CoffeeScript compilation or packaging with other
assets. The preprocess_assets management command will look through
all of the files listed in the `STATICFILES_DIRS`, preprocessing each
as needed. Preprocessing strips off the special template file
extension, creating a new file in the process.
Currently, the only variable accessible in an asset template file is
the `THEME_NAME`, defined in the settings.
2013-06-03 09:58:01 -07:00
Peter Fogg
8c5f9e6e41
Fix merge conflict.
2013-06-03 08:49:52 -04:00
cahrens
14eb9c9a3b
Merge branch 'master' into feature/christina/metadata-ui
2013-05-30 12:27:03 -04:00
Peter Fogg
6eeb12ad1c
Add Lettuce tests for autoplay in Studio.
2013-05-30 11:34:15 -04:00
Peter Fogg
5465bda5f3
Use MITX_FEATURES to tell if we're in the CMS; this is much cleaner. Also use $.data instead of a hidden div.
2013-05-29 17:00:25 -04:00
cahrens
625c6b518c
Cleanup, change how we load templates.
2013-05-28 14:07:35 -04:00
cahrens
aca5cbb215
Merge branch 'master' into bug/christina/preview_url
2013-05-28 12:13:19 -04:00
cahrens
e0bb4ad4dd
Preview url is read in from environment file.
2013-05-28 12:04:48 -04:00
cahrens
87d904cb35
Merge branch 'master' into feature/christina/metadata-ui
...
Conflicts:
cms/templates/base.html
2013-05-24 16:10:34 -04:00
cahrens
138ad3988f
Update test (and set PREVIEW_LMS_BASE to something different so we can actually test the method).
2013-05-23 17:06:02 -04:00
cahrens
a03a4fdd07
PREVIEW_LMS_BASE must now be set (default value does not work for both edge and edx). Make this work locally as well.
...
https://edx.lighthouseapp.com/projects/102637/tickets/331
2013-05-23 16:45:10 -04:00
Calen Pennington
69beea854c
Merge pull request #2045 from edx/feature/cale/jasmine-junit-reports
...
Record junit reports of jasmine tests
2013-05-23 11:06:34 -07:00
chrisndodge
a8084628e1
Merge pull request #1956 from edx/feature/cdodge/autoprovision-forums-master
...
Feature/cdodge/autoprovision forums master
2013-05-23 09:27:36 -07:00
