Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
12,581 Commits 1 Branch 0 Tags
8a02001a4fc42832dfca4383540be4de16dc059c
Commit Graph

12581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Brian Talbot
b115ad46bf studio - changed https to http in course mailto link and added that prefix to link displayed 2013-04-17 13:44:23 -04:00
Brian Talbot
33ba38b8dd studio - prefixed course URL with https: for individual share course mailto link on settings 2013-04-17 13:38:14 -04:00
Brian Talbot
c4e4f73373 studio - adding in course name value in the share course mailto link 2013-04-17 13:19:42 -04:00
Calen Pennington
d4df9eebac Merge pull request #1866 from MITx/feature/cale/enable-rednose 
Enable test colors in nosetests
 2013-04-17 10:15:25 -07:00
Calen Pennington
73f5dc1cf5 Add documentation of the setup.cfg flag for pdb 2013-04-17 12:26:52 -04:00
Calen Pennington
9f158774e4 Disable pdb by default when running tests 2013-04-17 12:26:33 -04:00
Jay Zoldak
9fff26cf64 Merge pull request #1867 from MITx/fix/cale/pep8-violations 
Fix pep8 violations
 2013-04-17 09:05:25 -07:00
Calen Pennington
6c7c49e6bd Fix pep8 violations 2013-04-17 11:07:58 -04:00
Calen Pennington
b3c470ece4 Randomize ports used by jasmine tests 
This prevents multiple tests running in parallel from stomping on each
other.
 2013-04-17 10:57:03 -04:00
Calen Pennington
3cd414afbb Merge pull request #1825 from MITx/fix/cale/gradebook 
Fix/cale/gradebook
 2013-04-17 07:37:02 -07:00
Calen Pennington
f2cd0bbc97 Add comment about enabling pdb in tests 
Uncommenting the pdb=1 line will cause pdb to open on every test
failure, allowing immediate debugging of the failure case
 2013-04-17 10:34:48 -04:00
Calen Pennington
904ec5d88b Shorten long line 2013-04-17 10:05:43 -04:00
Calen Pennington
856b50531c Remove errant copy of test_download_csv.py 
It was added to 2 different locations by mistake.
 2013-04-17 10:04:40 -04:00
Calen Pennington
f252c62f31 Enable test colors in nosetests 
Use setup.cfg to set up default settings when running nose tests. Enable
the rednose library to color test output.
 2013-04-17 09:58:52 -04:00
Don Mitchell
24189378d6 Merge pull request #1864 from MITx/bug/christina/export 
Don't try to export orphaned draft items.
 2013-04-16 14:24:49 -07:00
cahrens
8c336ef998 Don't try to export orphaned draft items. 
#278
 2013-04-16 17:05:11 -04:00
brianhw
91d84c0208 Merge pull request #1863 from MITx/fix/brian/jobs-20130410 
Update with 2013-04-10 changes
 2013-04-16 12:56:58 -07:00
Brian Wilson
7f90e31709 Update with 2013-04-10 changes 2013-04-16 15:43:14 -04:00
John Hess
ee4d70cf84 Merge pull request #1862 from MITx/jmclaus/genex-grading-fix 
Grading works when sequence is loaded from saved state
 2013-04-16 12:22:52 -07:00
Carlos Andrés Rocha
a947f620a0 Merge pull request #1861 from MITx/fix/btalbot/stanford-logo 
fixing the visual display of the stanford logo
 2013-04-16 11:50:43 -07:00
Brian Talbot
b417651cf1 fixing the visual display of the stanford logo used in press releases on the homepage and dashboard (proportions were off) 2013-04-16 14:47:26 -04:00