Greg Price
caef8d272d
Merge pull request #2097 from edx/gprice/add-rb-config
...
Add Review Board config to repo
2013-05-21 12:39:54 -07:00
Greg Price
5bcae4e79f
Add Review Board config to repo
2013-05-21 14:52:28 -04:00
Christina Roberts
747dec07ae
Merge pull request #2091 from edx/feature/christina/xblock_version
...
Upgrade version of xblock.
2013-05-21 11:47:29 -07:00
Ned Batchelder
8b64d581f7
Merge pull request #2095 from edx/ned/fix-lazymod-test
...
Use a different arbitrary dotted module, which Christina doesn't already...
2013-05-21 11:39:02 -07:00
Ned Batchelder
9bf6281339
Merge pull request #2079 from edx/ned/fingerprint-site-packages
...
Fingerprint the filenames in site-packages to decide when to install req...
2013-05-21 11:37:57 -07:00
Ned Batchelder
e59d345917
Use a different arbitrary dotted module, which Christina doesn't already have imported
2013-05-21 14:27:50 -04:00
Calen Pennington
158948336f
Merge pull request #2046 from edx/fix/cale/pylint-cleanup
...
Fix/cale/pylint cleanup
2013-05-21 10:27:13 -07:00
Nate Hardison
ea1bc6b875
Merge pull request #2080 from edx/feature/nate/handle-heroku-maintenance-mode
...
Handle Heroku's 503 maintenance mode response
2013-05-21 10:07:09 -07:00
Calen Pennington
cfe220a746
Add exceptions for unused imports in settings files
2013-05-21 13:07:04 -04:00
Nate Hardison
cc7b2942ee
Handle Heroku's 503 maintenance mode response
...
The LMS comment client previously would try to parse the response
as JSON, choke, and return a 500 to the client. Now, the LMS client
displays a message indicating that the forums are down for
maintenance.
2013-05-21 10:03:51 -07:00
cahrens
0b92e0b91b
Upgrade version of xblock.
2013-05-21 09:49:28 -04:00
Calen Pennington
d5d99ef60f
Switch to official pylint 0.28 release
2013-05-21 09:34:13 -04:00
Calen Pennington
241ef68f4f
Start linting envs files, add task to only pylint errors, and move pylintrc file to the correct location
2013-05-21 09:34:12 -04:00
Brian Talbot
073c6d9a79
Merge pull request #2088 from edx/bug/btalbot/studio-lineheight
...
Studio - adding back in older Sass lh() function/mixin
2013-05-20 13:49:18 -07:00
Brian Talbot
8bbbe992fe
studio - references new line-height() Sass mixin when declaring typography archetypes
2013-05-20 15:20:17 -04:00
Brian Talbot
31b5c4ab61
studio - adds back in older lh() Sass function/mixin and moves it to the inheritied/to-be-sunsetted mixins sheet
2013-05-20 15:20:17 -04:00
e0d
c94f8d6f56
Merge pull request #2089 from edx/bugfix/e0d/resize-notes-uri
...
actually needs to be 255 given unicode requirements
2013-05-20 11:49:59 -07:00
e0d
a7b02e0029
actually needs to be 255 given unicode requirements
2013-05-20 14:40:05 -04:00
Ned Batchelder
c947133e54
A better way to compute the hash, that gets the right hash after an install actually installs something.
2013-05-20 14:39:25 -04:00
e0d
f63a4432d0
Merge pull request #2086 from edx/bugfix/e0d/resize-notes-uri
...
Bugfix/e0d/resize notes uri
2013-05-20 10:24:27 -07:00
Ned Batchelder
23384ca2eb
Use backticks so that the command won't echo to the user.
2013-05-20 12:09:28 -04:00
Ned Batchelder
fa87a64984
Missing trailing paren
2013-05-20 12:06:36 -04:00
e0d
0e37564490
pep8 fixes
2013-05-20 12:01:25 -04:00
e0d
a54ecb98c6
resizing uri column
2013-05-20 11:59:56 -04:00
Ned Batchelder
5b5fbc6b14
Fingerprint the filenames in site-packages to decide when to install requirements.
2013-05-20 11:46:56 -04:00
Brian Talbot
3671c7a7fd
Merge pull request #2075 from edx/fix/btalbot/studio-navLineHeight
...
Studio - Revised Course Nav Line Heights
2013-05-20 07:29:19 -07:00
Brian Talbot
bf8df49728
studio - revising line height between course nav titles and prefixes
2013-05-20 08:40:28 -04:00
Brian Talbot
0947329fc4
Merge pull request #2076 from edx/fix/btalbot/studio-fontrefs
...
Studio - Font Import Method Revert/Fix
2013-05-20 05:39:50 -07:00
Brian Talbot
098a5dda48
studio - reverts google web font import method back to original @font-face syntax since Sass doesn't like google's original method when processing
2013-05-20 08:39:18 -04:00
Ned Batchelder
9834f27eb9
Fingerprint the filenames in site-packages to decide when to install requirements.
2013-05-17 18:15:40 -04:00
e0d
f8e9c4d4d1
Merge pull request #2078 from edx/hotfix/rocha/celery-default-queue-name
...
Set the default celery queue name in addition to the default routing key
2013-05-17 15:02:31 -07:00
Carlos Andrés Rocha
34d39dde9a
Set the default celery queue name in addition to the default routing key
2013-05-17 17:59:51 -04:00
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
Ned Batchelder
5f7e856cf3
Merge pull request #2073 from edx/ned/message-if-no-install-needed
...
Print a message if the requirements files haven't changed.
2013-05-17 13:08:51 -07:00
Ned Batchelder
5555d41d80
OK, all the phases should have messages.
2013-05-17 16:04:24 -04:00
Calen Pennington
340d39f322
Merge pull request #2069 from edx/fix/cale/coffee-watch-on-osx
...
Batched coffee --watch compilation in smaller batches
2013-05-17 13:02:08 -07:00
Greg Price
5268d982ce
Merge pull request #2067 from edx/fix/gprice/mktg-button-closed-registration
...
Disable marketing registration button for courses that user cannot enrol...
2013-05-17 12:40:54 -07:00
Sarina
39456f98b5
Merge pull request #2072 from edx/fix/sarina/add-frances
...
Add Frances Botsford as one of our authors
2013-05-17 12:38:47 -07:00
Carlos Andrés Rocha
0042988ea7
Merge pull request #2063 from edx/feature/rocha/lets-use-celery
...
Add Celery configuration to LMS and CMS
2013-05-17 12:36:23 -07:00
Diana Huang
00378add25
Merge pull request #2065 from edx/diana/drupal/fix-link-test
...
Drupal: Fix test so that it works with both CMS and LMS settings
2013-05-17 12:08:46 -07:00
Greg Price
bc650887c9
Merge pull request #2070 from edx/fix/gprice/moar-cookies
...
Ensure CSRF cookie is present for login and registration pages
2013-05-17 11:56:59 -07:00
Ned Batchelder
61f135944d
Print a message if the requirements files haven't changed.
2013-05-17 14:56:44 -04:00
Sarina Canelake
73e05b3e67
Add Frances Botsford as one of our authors
2013-05-17 14:48:11 -04:00
Sarina
036be2a692
Merge pull request #2001 from edx/jtauber/intial-authors
...
added initial AUTHORS file
2013-05-17 11:37:51 -07:00
Greg Price
d4cee365e6
Ensure CSRF cookie is present for login and registration pages
2013-05-17 14:23:28 -04:00
Calen Pennington
280f09739f
Batched coffee --watch compilation in smaller batches
...
This is to work around an OSx issue that causes EMFILE errors in the
default configuration.
Ref: https://github.com/joyent/node/issues/2479
2013-05-17 14:22:01 -04:00
Greg Price
f200bca6f8
Merge pull request #2066 from edx/fix/gprice/mktg-access-courseware
...
Make "access courseware" buttons for marketing site break out of iframes
2013-05-17 11:13:40 -07:00
Greg Price
db3189d5ad
Disable marketing registration button for courses that user cannot enroll in
2013-05-17 14:10:04 -04:00
frances botsford
cb9d2c8879
Merge pull request #2064 from edx/bug/frances/studio-ffnavwrap
...
Bug fix for Studio nav in FF on PC
2013-05-17 11:08:03 -07:00
