Commit Graph

19654 Commits

Author SHA1 Message Date
Vik Paruchuri
badd3a8d13 Properly stub out the controller_qs variable in the tested module. Test times out without this. 2013-05-31 13:14:19 -04:00
Vik Paruchuri
9281a80089 Fix js that prevented single step OE problems (ie only self assessment) from working 2013-05-31 13:08:41 -04:00
Peter Fogg
2277c82efd Fix pep8 whitespace violation. 2013-05-31 12:54:09 -04:00
Peter Fogg
56ed47b37f Allow single-click video creation. 2013-05-31 12:52:53 -04:00
Slater-Victoroff
6f1f0e115c changed ubuntu strategy for numpy and scipy 2013-05-31 12:46:44 -04:00
Slater-Victoroff
0ce2ff22f6 testing numpy change on ubuntu 2013-05-31 12:45:36 -04:00
marco
290d049c29 Merge branch 'feature/christina/metadata-ui' of https://github.com/edx/edx-platform into feature/christina/metadata-ui 2013-05-31 12:41:13 -04:00
Slater-Victoroff
a76adc2871 Added useful requirements and removed problematic scipy 2013-05-31 12:40:43 -04:00
marco
72e1fab1c4 SASS variable and naming standards sync-up based on @talbs feedback completed 2013-05-31 12:40:40 -04:00
Peter Baratta
ff3997e72e Add test to verify a single period is not accepted as input 2013-05-31 12:37:14 -04:00
Ned Batchelder
1bedc2e4bd Change the file paths to be less specific. 2013-05-31 12:23:58 -04:00
Ned Batchelder
35a1dc123a Wrap the lines so I can read the text. 2013-05-31 12:23:16 -04:00
Slater-Victoroff
ab2a919c92 more tests run, some requirements added for graphviz on ubuntu 2013-05-31 12:22:45 -04:00
Peter Fogg
a503a753cd Remove unnecessary pylint warning disable. 2013-05-31 12:16:25 -04:00
Peter Fogg
453bf42133 Revert changes to how video_alpha is stubbed out for testing. 2013-05-31 12:12:14 -04:00
Ned Batchelder
9314154ec1 Move loncapa grading helpers into the sandbox-packages directory. 2013-05-31 12:01:33 -04:00
Peter Fogg
7a16938ad2 Remove unnecessary suppression. 2013-05-31 11:58:05 -04:00
Chris Dodge
87daba69ea Merge branch 'master' of github.com:edx/edx-platform into fix/cdodge/bad-link-in-activation-email 2013-05-31 11:53:49 -04:00
David Ormsbee
aae3380aa9 Merge pull request #16 from edx/feature/e0d/remove-request-debugger
RFC: removing the request debugger entirely.
2013-05-31 08:36:16 -07:00
John Jarvis
23e98314f4 Merge pull request #19 from edx/jarv/django-upgrade
updating django minor release
2013-05-31 08:33:42 -07:00
cahrens
57f8bbf69d Updates to Selenium test based on feedback. 2013-05-31 11:26:31 -04:00
cahrens
ab5834fb41 Pylint cleanup. 2013-05-31 11:26:19 -04:00
Chris Dodge
7efcd98135 fix up styles in header for this particular use case 2013-05-31 11:25:28 -04:00
Jay Zoldak
a5ee903ef5 Pin capa to require distribute greater than 28 because an old branch had it at 30 2013-05-31 11:24:49 -04:00
Slater-Victoroff
1699d24c9a Successful on mac, almost there on ubuntu 2013-05-31 11:24:07 -04:00
Peter Fogg
782cb05410 Add passing Lettuce testing for video autoplay in LMS. 2013-05-31 11:22:45 -04:00
e0d
2e84540af0 removing the request debugger entirely. 2013-05-31 11:15:28 -04:00
John Jarvis
800ec068bd updating django minor release 2013-05-31 11:15:15 -04:00
Chris Dodge
62bacea371 use the right link to the login page in a particular use case: clicking activation email when not logged in 2013-05-31 11:10:14 -04:00
Peter Baratta
087834337a Pep8 newline 2013-05-31 11:05:21 -04:00
Slater-Victoroff
821621cd52 small edits mostly taken care of 2013-05-31 11:05:20 -04:00
Jay Zoldak
86f62d5419 Pin distribute version to greater than 28 because old branches of capa required 30 2013-05-31 11:04:59 -04:00
Victor Shnayder
75f127d76b Change help button text, fixing LMS-319 2013-05-31 10:59:00 -04:00
Slater-Victoroff
b489a5d773 distribute fix 2013-05-31 10:41:59 -04:00
Peter Baratta
80a27f9391 Add test and functionality for trailing period 2013-05-31 10:41:08 -04:00
Slater-Victoroff
660dbd80b9 small fix 2013-05-31 10:38:18 -04:00
Slater-Victoroff
433043b146 Removed starting courseware clone 2013-05-31 10:37:18 -04:00
Slater-Victoroff
49ed93a4e6 Fixed first stage bugs 2013-05-31 10:35:26 -04:00
Slater-Victoroff
b2cd6915e4 Draft 1 of cross-platform bash script is complete, but more testing needs to be done 2013-05-31 10:14:28 -04:00
cahrens
e6dfa8e81c Merge branch 'master' into feature/christina/metadata-ui 2013-05-31 09:46:17 -04:00
JonahStanley
a49acc73ee Removed the save_html line 2013-05-31 09:16:14 -04:00
Will Daly
1c48279563 Added requirement for pip>=1.3 2013-05-31 08:13:18 -04:00
Valera Rozuvan
37cffd0835 Added videoalpha to advanced components in component.py file. 2013-05-31 13:48:17 +03:00
marcotuts
46967a78dc Merge pull request #6 from edx/release
Release 2013-05-29, with Hotfix 2013-05-30 back into master
2013-05-30 16:34:22 -07:00
marcotuts
3614a72a2c Merge pull request #1 from edx/hotfix/advanced-settings
Put back in the blocks for Advanced Settings.
2013-05-30 15:41:09 -07:00
David Baumgold
bdc9570cd1 Removed Symbolset font files 2013-05-30 16:09:17 -04:00
Peter Baratta
e17f9f6c37 Merge pull request #2108 from edx/pbaratta/calc-tests
Add some testing to calc.py prior to changes
2013-05-30 12:54:52 -07:00
cahrens
62d2ad8986 Put back in the blocks for Advanced Settings. 2013-05-30 15:50:01 -04:00
Calen Pennington
6c7491a35a Merge pull request #2153 from edx/fix/cale/remove-secrets
Remove secrets from master
2013-05-30 12:43:56 -07:00
David Baumgold
c12cb59b96 Merge pull request #2154 from edx/fix/db/advanced-settings-notifications
Put the advanced settings notifications back in
2013-05-30 12:27:19 -07:00