cahrens
0b92e0b91b
Upgrade version of xblock.
2013-05-21 09:49:28 -04:00
Chris Dodge
094e396556
Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master
2013-05-21 09:47:11 -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
Vik Paruchuri
fd6da08a97
Fix text
2013-05-21 00:26:39 -04:00
Vik Paruchuri
1f34561cff
Update examples, fix parsing error, avoid collision with capa template
2013-05-21 00:22:33 -04:00
Vik Paruchuri
4dab8f07b0
fix mocking issue
2013-05-20 17:29:11 -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
Vik Paruchuri
d0e8965a3c
Fix pep8/pylint issues
2013-05-20 16:42:27 -04:00
Vik Paruchuri
3b3cf19c47
Fix tests and add in jasmine test
2013-05-20 15:52:19 -04:00
Vik Paruchuri
23269359c1
Jasmine tests, fix some review issues
2013-05-20 15:31:56 -04: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
Vik Paruchuri
7699c1794c
Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor
2013-05-20 14:16:04 -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
ec09ac7f29
Put numpy into a pre.txt so that everything will actually install.
2013-05-20 12:57:07 -04:00
Vik Paruchuri
16e1ecf686
fix some pylint violations
2013-05-20 12:46:12 -04: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
Vik Paruchuri
ed2c1cf0d1
Remove header from cheatsheet
2013-05-20 11:46:01 -04:00
Vik Paruchuri
55fda26fd8
Fix tests, fix xqueue error, minor polish
2013-05-20 11:29:19 -04:00
Vik Paruchuri
6bdbbb62d5
Polish up editor, fix issues
2013-05-20 11:09:35 -04:00
Vik Paruchuri
d4b54ceca7
Update open ended editor to parse tasks properly
2013-05-20 10:49:04 -04:00
Chris Dodge
a44e816877
remove_open_ended_panel_tab() -> remove_extra_paneltab(). Also, update new forums test factors to use refactored Models.py
2013-05-20 10:33:52 -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
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
Vik Paruchuri
986999c62e
Fix cheatsheet, start working on xml replacement
2013-05-20 09:50:15 -04:00
Vik Paruchuri
3a15f93564
Render proper templates when user clicks on editor buttons
2013-05-20 09:20:46 -04:00
Vik Paruchuri
9a7006473e
Do basic work on a simple editor for combinedopenended
2013-05-20 09:07:03 -04: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
Vik Paruchuri
4c80325db3
Start working on COE editor, fix name checking in module_render
2013-05-20 08:11:54 -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
Will Daly
bab4b18647
Set the browser size on startup of acceptance tests.
...
This resolves an issue on Mac OS X in which the login dropdown
arrow couldn't be clicked because it was off-screen.
It should make the test suite more stable.
2013-05-17 17:21:44 -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
