Kevin Chugh
bee25f3ba0
fix git mangle take 3
2013-04-21 19:51:04 -04:00
Kevin Chugh
9d57f0a9d2
fix git mangle take 2
2013-04-21 19:47:27 -04:00
Kevin Chugh
7bc75844b2
fix indentation
2013-04-21 06:24:23 -04:00
Kevin Chugh
e8c646142f
Merge branch 'master' into feature/kevin/flagging
2013-04-21 06:15:55 -04:00
Kevin Chugh
649578ea2f
unify flag moderator permissions
2013-04-21 06:15:23 -04:00
ichuang
f1a899ac1c
Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/masquerade-v3
2013-04-20 12:25:47 -04:00
ichuang
81621fbe3a
for staff masquerading as student be kind and don't 404 for inaccessible content
2013-04-20 12:12:25 -04:00
ichuang
6cbd353992
make masquerade work properly even if DISABLE_START_DATES true
2013-04-20 11:57:56 -04:00
Your Name
0a627bb5d9
update permissions for flagging
2013-04-19 17:40:13 -04:00
Will Daly
2629fc71d6
Added troubleshooting tip for jasmine tests (bundle install)
...
Updated jasmine rake documentation to reflect changes Cale made
2013-04-19 12:41:10 -04:00
Will Daly
3f47e2c29d
Added explanation of testing pyramid
2013-04-19 11:01:42 -04:00
Will Daly
e0fb13a26e
Resized test pyramid image
...
Fixed mistake in pip install snippet
2013-04-19 10:52:15 -04:00
Will Daly
85ea5f7367
Updated testing documentation
2013-04-19 10:29:58 -04:00
cahrens
c0f0366bda
Some cleanup TODOs.
2013-04-18 17:08:58 -04:00
Diana Huang
181eebc942
Miscellaneous updates and fixes.
...
* Hide "Test Code" button after we check the problem
* Only set the state of the problem to 'queued' if we have successfully
queued the problem
* Unit tests for bugs and new functionality
2013-04-18 16:37:36 -04:00
Will Daly
4615f0d869
Merge pull request #1874 from MITx/fix/zoldak/upgrade-lettuce
...
Upgrade lettuce and factory boy versions, fix CMS lettuce tests to run under phantomjs or tag them to skip
2013-04-18 12:52:45 -07:00
Calen Pennington
2ff4564686
Ignore compiled xmodule assets
2013-04-18 15:46:08 -04:00
Calen Pennington
ec2532ac2e
Before starting the server, forcibly rebuild assets before starting to watch them
2013-04-18 15:45:52 -04:00
Calen Pennington
f7cad77b93
Ignore errors when deleting the old xmodule compiled assets directory
2013-04-18 15:45:32 -04: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
Jay Zoldak
be76f73107
Consolidate and upgrade factories
2013-04-18 15:11:10 -04:00
Diana Huang
03daefb924
Change the name of the plot button
2013-04-18 14:31:51 -04:00
Jay Zoldak
29ce700de6
Tag CMS lettuce tests with @skip-phantom if they aren't working under phantomjs right now.
2013-04-18 10:23:03 -04:00
Jay Zoldak
0426761bed
Update lettuce and factory-boy versions.
2013-04-18 10:18:36 -04:00
Jay Zoldak
8a852f90cb
Fix or skip lettuce tests to run under phantomjs and firefox
2013-04-18 10:18:35 -04:00
Jay Zoldak
8a2d08bbd6
Refactor choosing the browser for lettuce tests to settings.py
2013-04-18 10:18:35 -04:00
Calen Pennington
bbab2d7de7
Install gemfiles for tests
2013-04-18 10:09:21 -04:00
Will Daly
584bb86208
Merge pull request #1872 from MITx/feature/will/textline_template_test
...
Feature/will/textline template test
2013-04-18 06:51:45 -07:00
Will Daly
a4717aca90
Pep8 fixes
2013-04-18 09:49:05 -04:00
Steve Strassmann
91bee1a966
add Babel to requirements.txt
2013-04-18 09:27:44 -04:00
Calen Pennington
3031c1da38
Fix up call to spawn
2013-04-18 07:19:32 -04:00
Calen Pennington
6a36d9dba8
Use the new gather_assets target before running tests
2013-04-18 07:19:32 -04:00
Calen Pennington
f80353121c
Don't clean pyc file and install xmodule before all arbitrary rake commands
2013-04-18 07:19:32 -04:00
Calen Pennington
afb60f790e
Change the name of the asset gathering task
2013-04-18 07:19:32 -04:00
Calen Pennington
589267599f
Run coffee and sass in watch mode when running lms or cms, and oneshot before running collectstatic
2013-04-18 07:19:32 -04:00
Calen Pennington
291e772ce0
Clean up cruft from rakefile
2013-04-18 07:18:36 -04:00
Calen Pennington
346aee8863
Make django-pipeline only work with raw js and css
2013-04-18 07:18:36 -04:00
Calen Pennington
9c7ba41880
Only add the xmodule.coffee file once per class, and put it before all other coffeescript files
2013-04-18 07:18:36 -04:00
ichuang
0ffc399f7d
move masquerade call up, to make sure it is used for start date checks
2013-04-17 22:12:12 -04:00
ichuang
3de927fe01
untabify course_nagivation.html
2013-04-17 21:22:08 -04:00
Will Daly
a57a093e73
Rebased to master
2013-04-17 15:56:05 -04:00
Will Daly
841d3484c8
Added test for textline input template
2013-04-17 15:46:24 -04:00
Will Daly
e5e0dc4bfb
Merge pull request #1865 from MITx/feature/will/more_capa_tests
...
Feature/will/more capa tests
2013-04-17 12:38:59 -07:00
Will Daly
52c2f3ae37
Tested additional values of rerandomize (true/false/per_student)
...
Pylint fixes
2013-04-17 15:32:39 -04:00
Will Daly
754d1eb702
Added tests for ChoiceGroup template
2013-04-17 15:32:39 -04:00
Will Daly
b42c4dacf7
Added test for "radio" choicegroup
2013-04-17 15:32:39 -04:00
Christina Roberts
a3233b67e5
Merge pull request #1869 from MITx/fix/btalbot/studio-courseemail
...
Fix/btalbot/studio courseemail
2013-04-17 11:26:40 -07:00
Mark L. Chang
0f26be2f4d
quick fix to email copy
2013-04-17 14:12:16 -04:00
Mark L. Chang
44bf60d208
copy changes, link text change
2013-04-17 14:03:29 -04:00
Brian Talbot
423fa47811
studio - reverting back to https references in the course mailto link and url display
2013-04-17 13:47:54 -04:00
