Diana Huang
13d29b8e72
Fix indentation of settings dictionaries.
2013-05-06 16:49:10 -04:00
Chris Dodge
a92910db20
update lms to reflect where comment models.py is now in common
2013-05-06 16:23:32 -04:00
Arthur Barrett
ceefdf0161
user must be authenticated to view notes tab
2013-05-06 15:52:32 -04:00
Diana Huang
6110b54ca8
Address code review feedback
...
* Fix indentation/line break issues
* Handle marketing root URL as a separate case in marketing_link
* Move link map to its own setting.
2013-05-06 14:56:06 -04:00
Greg Price
ec3c8458e7
Merge pull request #1911 from edx/feature/gprice/feedback-button
2013-05-06 11:03:41 -07:00
Arthur Barrett
04e75485ba
merged master branch into feature/abarrett/lms-notes-app. resolved conflicts in lms/envs/common.py and lms/templates/static_htmlbook.html.
2013-05-06 13:40:38 -04:00
Greg Price
87072a9a58
Add an endpoint for submission of Zendesk tickets by end users
...
This functionality requires the Zendesk URL, user, and API key to be specified
in django.conf.settings. Also, add a flag to MITX_FEATURES (enabled by default)
to control the endpoint and the front-end feature (yet to be added).
2013-05-06 13:35:51 -04:00
Diana Huang
a8ea201b6a
Move the link map to the settings.
2013-05-06 12:55:42 -04:00
Ned Batchelder
686eb64949
An example of how to set the CPU limit for codejail.
2013-05-06 11:39:21 -04:00
Ned Batchelder
d8c22dbeb3
Add a Django setting for course allowed to run unsafe code.
2013-05-06 11:39:21 -04:00
Ned Batchelder
ec7a04fdb3
A /debug/run_python endpoint for staff to test the sandboxing of Python code.
2013-05-06 11:39:17 -04:00
Ned Batchelder
5d4b61c7f5
Better configuration for codejail.
2013-05-06 10:55:05 -04:00
Diana Huang
e4e6c0dd7b
Add new URLS to MKTG_URLS.
2013-05-03 15:05:03 -04:00
Jason Bau
7720c0fc8d
Inserts overrides in env.lms.aws for email settings and timezone
...
overrides what is set in env.lms.common using the lms.env.json
file
2013-05-03 11:45:21 -07:00
Diana Huang
1d42df8cb1
Add MKTG_URLS to settings for new footer and header links.
2013-05-03 09:31:47 -04:00
Diana Huang
45baf013fe
Merge branch 'master' into drupal-new
2013-05-02 17:04:39 -04:00
Calen Pennington
dfd369b9e9
Make ordering of js bundles during jasmine tests consistant
2013-04-30 14:09:17 -04:00
Diana Huang
886e74342d
Move the testcenter login to external_auth
...
* hide the login behind a setting that is turned off by default
* clean out some of the outdated settings and hardcoded test strings
2013-04-25 11:12:19 -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
ichuang
f1a899ac1c
Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/masquerade-v3
2013-04-20 12:25:47 -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
Jay Zoldak
8a2d08bbd6
Refactor choosing the browser for lettuce tests to settings.py
2013-04-18 10:18:35 -04:00
Calen Pennington
346aee8863
Make django-pipeline only work with raw js and css
2013-04-18 07:18:36 -04:00
Calen Pennington
d4df9eebac
Merge pull request #1866 from MITx/feature/cale/enable-rednose
...
Enable test colors in nosetests
2013-04-17 10:15:25 -07:00
Calen Pennington
f252c62f31
Enable test colors in nosetests
...
Use setup.cfg to set up default settings when running nose tests. Enable
the rednose library to color test output.
2013-04-17 09:58:52 -04:00
Calen Pennington
d7796f4d47
Put test database into test_root
2013-04-16 11:40:04 -04:00
Calen Pennington
5f4004c5ad
Clean up whitespace
2013-04-16 11:40:04 -04:00
ichuang
3b4093ab7b
url and mitx_settings for masquerade
2013-04-13 22:47:04 -04:00
John Jarvis
54e5e3d31f
Adding the EDX_MKTG feature flag and links back to the marketing site
2013-04-10 14:29:55 -04:00
Brian Talbot
78079d1ca7
Merge branch 'master' into drupal-new
2013-04-08 22:35:29 -04:00
Carlos Andrés Rocha
29efa84205
Enable dev env support for sass source maps
...
Change the parameters of the sass compiler to output source
maps. Google Chrome uses the maps in the debugger to show the sass or
scss file that originated the style for a particular element.
More information here:
http://fonicmonkey.net/2013/03/25/native-sass-scss-source-map-support-in-chrome-and-rails/
2013-03-29 18:34:02 -04:00
Carlos Andrés Rocha
4050da6b4c
Enable meta-universities (organizations that contain other)
2013-03-28 13:23:50 -04:00
Chris Dodge
b609a96902
ummm. forgot to commit stuff
2013-03-27 22:51:52 -04:00
Arthur Barrett
d636f4fab0
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-03-25 19:04:58 -04:00
Arthur Barrett
7120998938
refactoring notes js
2013-03-21 17:18:45 -04:00
John Jarvis
57dd2e728c
Adding a new cookie to determine logged in status for the edx mktg site
...
When a user logs in this will drop a new cookie 'edxloggedin' that will
match the value and expire date of the django session cookie.
When a user logs out the cookie will be removed
2013-03-21 17:17:35 -04:00
Jay Zoldak
23364d8b0f
Merge branch 'master' into feature/zoldak/refactor-factories
2013-03-20 13:36:01 -04:00
Jay Zoldak
daadaffb61
Add mongo contentstore to acceptance.py for lettuce tests for lms
2013-03-20 09:38:52 -04:00
Will Daly
20ccf5937b
Implemented CodeResponse lettuce tests
2013-03-19 15:55:05 -04:00
Arthur Barrett
0710bbd70c
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-03-19 13:43:45 -04:00
Will Daly
8423816076
LMS contentstore lettuce tests now dynamically create courses in mongo
...
using terrain.factories.py and capa.tests.response_xml_factory
2013-03-15 14:04:22 -04:00
Arthur Barrett
20767d5cc7
create notes djangoapp for annotator.js
2013-03-15 12:41:52 -04:00
Calen Pennington
3b0aed5d42
Merge pull request #1572 from MITx/feature/alex/poll-merged
...
Feature/alex/poll merged
2013-03-15 09:04:42 -07:00
David Ormsbee
67a0cccba9
Addressing some pep8/pylint concerns
2013-03-15 11:08:09 -04:00
Calen Pennington
fb8352e2cc
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
2013-03-15 10:33:54 -04:00
Chris Dodge
d2f216615f
move the instantiation of the metadata cache out of modulestore.py as it was causing a circular import dependency when running on AWS. Put instantiation into one_time_startup.py which I believe is run before any Django requests are handled
2013-03-14 13:57:48 -04:00
David Ormsbee
8d4e0f8386
Add ANALYTICS_API_KEY to config files and dashboard analytics call
2013-03-13 16:55:40 -04:00
Chris Dodge
413aeed1b3
use django caching to hold computed metadata inheritence. Also invalidate the cache entries on writes (insert, updates)
2013-03-13 15:33:15 -04:00
David Ormsbee
33c2507abc
Guard against connection errors to the Analytics service.
2013-03-13 15:27:33 -04:00
David Ormsbee
a0dd6d9832
add entry for ANALYTICS_SERVER_URL to aws.py
2013-03-11 10:05:36 -04:00
