Vik Paruchuri
e9f05640f8
Update comments
2013-05-22 12:16:23 -04:00
e0d
e4c3f92372
Merge pull request #2100 from edx/hotfix/e0d/code-jail
...
Sandbox-installed packages will be really installed instead of -e instal...
2013-05-22 09:05:03 -07:00
Vik Paruchuri
96f145b8f6
Update error message
2013-05-22 12:00:36 -04:00
Vik Paruchuri
3bd04290f5
Add tests, address review comments
2013-05-22 11:58:03 -04:00
Victor Shnayder
361faacc57
Merge pull request #2099 from edx/bugfix/abarrett/advanced_modules_list
...
Fix advanced components list in Studio.
2013-05-22 08:29:07 -07:00
Vik Paruchuri
a44eacd474
Make fields stringy, remove false dict
2013-05-22 10:54:52 -04:00
Vik Paruchuri
21f7e222f7
Fix exception clause
2013-05-22 10:51:11 -04:00
e0d
bf20760922
changes to refactor local requirements.
2013-05-22 10:19:30 -04:00
Christina Roberts
945fbe010f
Merge pull request #2093 from edx/feature/christina/acceptance-config
...
Use draft module store so we can test editing components (problems, html...
2013-05-21 17:19:51 -07:00
Ned Batchelder
ce005072b0
Sandbox-installed packages will be really installed instead of -e installed.
2013-05-21 19:21:39 -04:00
Arthur Barrett
cf502e2349
Fix advanced modules list.
2013-05-21 17:49:20 -04:00
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
Peter Baratta
43395b70b7
Enable coverage for calc module; split off tests
2013-05-21 15:20:51 -04:00
Vik Paruchuri
9a52a17aab
Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor
2013-05-21 14:54:45 -04: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
Vik Paruchuri
c5f9d94cc4
Add in comments, fix behavior
2013-05-21 14:46:22 -04: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
cahrens
f3bd9ab234
Get rid of empty, store ID.
2013-05-21 14:29:33 -04: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
Vik Paruchuri
c91fa2f45a
Add in some comments
2013-05-21 14:23:24 -04:00
Vik Paruchuri
956669de21
If location cannot be found, move on
2013-05-21 14:21:46 -04:00
Vik Paruchuri
0887383ca7
Don't show peer grading button unless there is a peer grading element in the course
2013-05-21 14:18:00 -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
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
