Will Daly
57fde4ba15
Merge pull request #1877 from MITx/feature/will/update_testing_docs
...
Feature/will/update testing docs
2013-04-23 09:34:07 -07:00
Your Name
acfd0d9fd6
fix merge conflict
2013-04-23 10:30:51 -04:00
Your Name
e4194c99d8
Merge branch 'master' of github.com:MITx/mitx
2013-04-23 10:28:40 -04:00
Kevin Chugh
d6bc426ecd
Merge pull request #1731 from MITx/feature/kevin/pinning_inline
...
Feature/kevin/pinning inline
2013-04-23 07:24:22 -07:00
Your Name
068e02efd5
make unflag all permissions match javascript
2013-04-22 17:51:48 -04:00
Your Name
3f1d97b065
Merge branch 'master' into feature/kevin/flagging
2013-04-22 17:22:33 -04:00
Your Name
5e73e8f286
Merge branch 'master' of github.com:MITx/mitx
2013-04-22 17:22:24 -04:00
Diana Huang
d7f2d4b710
Merge pull request #1876 from MITx/diana/matlab-input-updates
...
Make updates to the MatlabInput InputType
2013-04-22 13:46:15 -07:00
Diana Huang
32881ed265
Change the name of the button so that it is clearer.
2013-04-22 16:38:41 -04:00
Your Name
30104979e7
fix downvoting url
2013-04-22 16:25:16 -04:00
Your Name
af1c411ddf
gentler url diff
2013-04-22 16:23:21 -04:00
Your Name
b8114b9eb2
restore accidentally deleted chunk
2013-04-22 16:17:54 -04:00
Your Name
8a02001a4f
minimize diff by restoring function locations
2013-04-22 15:40:19 -04:00
Your Name
385026172e
remove double Comment from merge conflict
2013-04-22 15:28:27 -04:00
Christina Roberts
a1360a2710
Merge pull request #1879 from MITx/fix/cdodge/import-can-create-draft-sequences
...
when updating the list of children of sequentials, we must use the 'dire...
2013-04-22 12:17:30 -07:00
Your Name
0bcef4ddb7
fix merge conflicts
2013-04-22 12:54:33 -04:00
Your Name
7994e1b344
pep8 fixes
2013-04-22 12:53:30 -04:00
Christina Roberts
a0cbe8d8ca
Merge pull request #1878 from MITx/fix/btalbot/studio-graceperiod
...
Correcting placeholder text for grace period field in course settings
2013-04-22 09:10:13 -07:00
Chris Dodge
506a9a20aa
when updating the list of children of sequentials, we must use the 'direct' store otherwise we end up with draft revisions of sequentials, which is bad
2013-04-22 10:13:33 -04:00
chrisndodge
0eed587571
Merge pull request #1839 from MITx/feature/sef/pressreleases
...
Press Releases: generic matching rule instead of explicit lines in url.py
2013-04-22 07:01:36 -07:00
Brian Talbot
ba4c0b6d53
studio - removing formatting suggestion from label
2013-04-22 09:43:57 -04:00
Brian Talbot
bcdf93fbc3
studio - fixing placeholder and label values for grace period on course grading settings
2013-04-22 09:42:47 -04:00
Kevin Chugh
bb12cdf6f4
remove whitespace
2013-04-21 19:57:19 -04:00
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
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
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
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
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
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
