Commit Graph

19654 Commits

Author SHA1 Message Date
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
Peter Baratta
82482e89ea Finish calc.py tests; add docstrings, etc 2013-05-21 11:07:19 -04:00
cahrens
3b15207bc6 Use draft module store so we can test editing components (problems, html, etc.). 2013-05-21 09:58:34 -04:00
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
cahrens
3dc9791382 Update xblock, start Selenium. 2013-05-21 09:38:56 -04:00
cahrens
bb699f482d Update xblock, start Selenium. 2013-05-21 09:37:55 -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
cahrens
c8eeea240b Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui 2013-05-20 16:27:11 -04:00
cahrens
4facd262bd Jasmine test for metadata model. 2013-05-20 16:26:48 -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
Peter Baratta
5e8d2ce4f7 Start making comprehensive calc tests 2013-05-20 15:30:16 -04:00
marco
3cf915005b Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui 2013-05-20 15:22:31 -04:00
marco
79c78cbccd made firefox input number increment objects positioned as % to respond to page size accordingly 2013-05-20 15:22:21 -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
cahrens
4d7c7f866a Merge branch 'master' into feature/christina/metadata-ui 2013-05-20 15:06:40 -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
marco
7641e128de Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui 2013-05-20 14:39:50 -04:00
marco
c0cff81e5e styled firefox number buttons 2013-05-20 14:39:37 -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
cahrens
25388dec96 Minor cleanup. 2013-05-20 13:31:55 -04:00
cahrens
2020923f2d Prevent invalid numeric entries. 2013-05-20 13:26:27 -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
marco
c356904027 css styles for firefox input number fields 2013-05-20 12:06:30 -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
marco
32f7691040 minor style changes for increment and decrement buttons on firefox number fields 2013-05-20 11:39:13 -04:00
Vik Paruchuri
55fda26fd8 Fix tests, fix xqueue error, minor polish 2013-05-20 11:29:19 -04:00
cahrens
3229aaf503 Call polyfill at right time. 2013-05-20 11:16:20 -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