Greg Price
372084e0b6
Merge branch 'drupal-new'
...
Conflicts:
lms/envs/common.py
2013-05-17 16:17:35 -04:00
Greg Price
de5b4d7d27
Merge branch 'master' into drupal-new
2013-05-17 16:10:56 -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
Ned Batchelder
f856b69ab5
Merge branch 'feature/ned/sandboxed-python'
2013-05-17 10:28:06 -04:00
Greg Price
362736c4d1
Merge pull request #2060 from edx/fix/gprice/marketing-links
...
Fix marketing links in password reset pages
2013-05-16 14:24:13 -07:00
Greg Price
4e95aa053f
Fix marketing links in password reset pages
2013-05-16 16:57:56 -04:00
Diana Huang
1c2175304e
Merge branch 'master' into drupal-new
2013-05-16 16:27:36 -04:00
Arthur Barrett
adcd1dd886
update annotator.min.css with change to fix adder button and serve the minified one.
2013-05-16 14:48:06 -04:00
Arthur Barrett
52e5fe223c
update annotator.js library and fix the annotator-adder button hover state in courseware.
2013-05-16 14:27:21 -04:00
Ned Batchelder
e947218285
Merge master to here.
2013-05-16 14:21:51 -04:00
Arthur Barrett
1fbe43a650
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-16 13:23:12 -04:00
Calen Pennington
0701e1a776
Use local node_modules as system_node_path if none is set
2013-05-15 15:25:42 -04:00
Ned Batchelder
b682e1c0d3
Put a feature flag around the staff-only debugging page.
2013-05-13 17:07:13 -04:00
Greg Price
a0fb4d6c85
Merge branch 'master' into drupal-new
...
Conflicts:
lms/envs/aws.py
lms/envs/common.py
lms/static/sass/base/_base.scss
lms/templates/forgot_password_modal.html
2013-05-10 10:30:10 -04:00
Arthur Barrett
c7197cd567
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-08 18:04:24 -04:00
Jason Bau
1354cd412a
Set SERVER_EMAIL so that mail_admins works
2013-05-08 14:16:20 -07:00
Greg Price
e190dc00d6
Remove marketing URLs from common.py
...
The MKTG_URLS dictionary is overwritten completely in aws.py anyway, and we
shouldn't be trying to keep both the production config and LMS code in sync
with changes to the marketing site.
2013-05-08 11:06:02 -04:00
Greg Price
7143749d7b
Fix links to honor code, ToS, and privacy policy for marketing site
2013-05-07 17:54:32 -04:00
Arthur Barrett
cd4bec8750
merged master branch into feature/abarrett/lms-notes-app
2013-05-07 12:32:22 -04:00
Diana Huang
13d29b8e72
Fix indentation of settings dictionaries.
2013-05-06 16:49:10 -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
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
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
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
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
ichuang
3b4093ab7b
url and mitx_settings for masquerade
2013-04-13 22:47:04 -04:00
Brian Talbot
78079d1ca7
Merge branch 'master' into drupal-new
2013-04-08 22:35:29 -04:00
Chris Dodge
b609a96902
ummm. forgot to commit stuff
2013-03-27 22:51:52 -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
Arthur Barrett
0710bbd70c
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-03-19 13:43:45 -04:00
Arthur Barrett
20767d5cc7
create notes djangoapp for annotator.js
2013-03-15 12:41:52 -04:00
David Ormsbee
67a0cccba9
Addressing some pep8/pylint concerns
2013-03-15 11:08:09 -04:00
David Ormsbee
d0bff1ed3c
Merge branch 'master' into jmpm-analytics
...
Conflicts:
lms/djangoapps/instructor/views.py
lms/envs/common.py
lms/templates/courseware/instructor_dashboard.html
2013-03-06 17:09:09 -05:00
David Ormsbee
b0afbba58d
Merge pull request #1516 from MITx/hack/dave/submission_history
...
Record and report submission history for a problem
2013-03-04 11:39:54 -08: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
Vik Paruchuri
4d57f1b9ee
Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule
2013-02-19 10:43:55 -05:00
David Ormsbee
8f17e6ae9e
First pass at implementing problem history.
2013-02-15 01:30:14 -05:00
