chrisndodge
|
48093da589
|
Merge pull request #1030 from MITx/fix/cdodge/need-to-pass-course-namespace-for-cms-rewrite
need to pass in course namespace when rewrite static links in the CMS
|
2012-11-09 06:26:10 -08:00 |
|
Chris Dodge
|
01889df686
|
need to pass in course namespace when rewrite static links in the CMS
|
2012-11-09 09:23:48 -05:00 |
|
chrisndodge
|
e6ce669e19
|
Merge pull request #1029 from MITx/fix/cdodge/static-import-path-error
make sure we strip away the leading '/' from the subpath for static cont...
|
2012-11-09 06:13:19 -08:00 |
|
Chris Dodge
|
5a02e37cce
|
make sure we strip away the leading '/' from the subpath for static content otherwise the naming expectations will break
|
2012-11-09 09:11:56 -05:00 |
|
Jay Zoldak
|
14564b2310
|
Merge branch 'feature/cale/cms-master' into feature/jzoldak/cms-unit-testing
|
2012-11-09 08:58:48 -05:00 |
|
Brian Talbot
|
b145112740
|
multi-input field markup and styling
|
2012-11-09 08:39:54 -05:00 |
|
Brian Talbot
|
f1e1f9e7e5
|
in progress field layout styling
|
2012-11-08 18:11:48 -05:00 |
|
Victor Shnayder
|
fb3b52b99f
|
refactor + style self-assessment in progress
|
2012-11-08 18:01:09 -05:00 |
|
Brian Talbot
|
8f2ab52215
|
in progress form styling of course info
|
2012-11-08 17:48:38 -05:00 |
|
Jay Zoldak
|
ddfbf3b678
|
Add test for course overview page
|
2012-11-08 17:16:25 -05:00 |
|
jarv
|
6b12cfd740
|
Merge pull request #1028 from MITx/feature/ned/better-node-installation
Get node.js from a more up-to-date PPA.
|
2012-11-08 14:13:27 -08:00 |
|
Ned Batchelder
|
f912fb9542
|
Get node.js from a more up-to-date PPA.
|
2012-11-08 17:04:29 -05:00 |
|
Chris Dodge
|
3774c95b5e
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/xlint
|
2012-11-08 16:12:26 -05:00 |
|
chrisndodge
|
13700316a6
|
Merge pull request #1025 from MITx/feature/cdodge/static-tab-edit
Feature/cdodge/static tab edit
|
2012-11-08 13:10:51 -08:00 |
|
Chris Dodge
|
981f5cee45
|
initial buildout of a 'xlint' test to verify legacy coursewar
|
2012-11-08 16:07:17 -05:00 |
|
Jay Zoldak
|
2077f62dd5
|
Add test for index page, plus SOUTH migrations for faster test execution.
|
2012-11-08 14:16:51 -05:00 |
|
chrisndodge
|
488918b777
|
Merge pull request #1027 from MITx/origin/feature/cdodge/static-tab-edit
address feedback from cale
|
2012-11-08 10:33:03 -08:00 |
|
Chris Dodge
|
c3c6a7af7e
|
address feedback from cale
|
2012-11-08 13:29:46 -05:00 |
|
Calen Pennington
|
171e932266
|
Merge branch 'master' into feature/cale/cms-master
Conflicts:
rakefile
|
2012-11-08 12:28:40 -05:00 |
|
Calen Pennington
|
3230345204
|
Make coverage reports only include code from the source directories
|
2012-11-08 12:25:12 -05:00 |
|
Calen Pennington
|
e50a442d88
|
Only try to generate html and xml coverage reports if the source .cover file exists
|
2012-11-08 12:06:05 -05:00 |
|
Calen Pennington
|
31e42a28f9
|
Merge pull request #1026 from MITx/feature/ned/quieter-tests
Feature/ned/quieter tests
|
2012-11-08 08:47:37 -08:00 |
|
Calen Pennington
|
686cab4545
|
Build all available coverage xml and html, even if some is missing
|
2012-11-08 11:32:27 -05:00 |
|
Ned Batchelder
|
28bb4724e7
|
Put the coverage data files in the reports dir, where they will be treated like the disposable things they are.
|
2012-11-08 11:20:23 -05:00 |
|
Ned Batchelder
|
d3e2e739a7
|
Add the .coverage files to the clobber task.
|
2012-11-08 11:20:23 -05:00 |
|
Calen Pennington
|
83e2b362e4
|
Make reports directory build work correctly
|
2012-11-08 11:20:23 -05:00 |
|
Calen Pennington
|
0cf46f7636
|
Namespace the coverage html and xml report generation tasks
|
2012-11-08 11:20:23 -05:00 |
|
Calen Pennington
|
17570c4c06
|
Create xml and html coverage reports
|
2012-11-08 11:20:23 -05:00 |
|
Calen Pennington
|
1968a1dde5
|
Remove attempt to use virtualenv python when running django-admin commands
|
2012-11-08 11:20:22 -05:00 |
|
Calen Pennington
|
899132a9bb
|
Force django to run using the python from the virtualenv
|
2012-11-08 11:20:22 -05:00 |
|
Ned Batchelder
|
3dc23eb131
|
Coverage xml and html reports are now a separate 'xml' and 'html' step from 'test'.
|
2012-11-08 11:20:22 -05:00 |
|
Calen Pennington
|
c3f0d31cc9
|
Split out requirements that come from the local mitx repo and those that come from github, and upgrade the local requirements before running tests
|
2012-11-08 11:20:16 -05:00 |
|
Calen Pennington
|
79a08266ad
|
Make pip install during jenkins builds quieter
|
2012-11-08 11:19:33 -05:00 |
|
Calen Pennington
|
2a457bdc0f
|
Set -e and -x on jenkins build scripts
|
2012-11-08 11:19:33 -05:00 |
|
Calen Pennington
|
6b28b70e51
|
Add jenkins files for builds
|
2012-11-08 11:19:33 -05:00 |
|
Ned Batchelder
|
90e3386751
|
WIP for quieter tests with coverage.
|
2012-11-08 11:19:33 -05:00 |
|
Ned Batchelder
|
7eb196df38
|
Run coverage directly instead of as a plugin. Also quiet the install and clean steps of tests.
|
2012-11-08 11:19:33 -05:00 |
|
Ned Batchelder
|
7033faf18c
|
Don't show stdout from collectstatic during tests.
|
2012-11-08 11:19:32 -05:00 |
|
Jay Zoldak
|
50a8cf4aea
|
Add test for course creation
|
2012-11-08 10:59:09 -05:00 |
|
Chris Dodge
|
7ca49f3a14
|
remove debug log msg
|
2012-11-08 10:54:56 -05:00 |
|
Chris Dodge
|
b432db1aba
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/static-tab-edit
|
2012-11-08 09:55:56 -05:00 |
|
Chris Dodge
|
7dbabce4db
|
fix up styling by reusing existing CSS class names. Also refactor some code regarding the management of static_tabs so that it's in the course as course contains references to static_tabs in the current data model
|
2012-11-08 09:55:52 -05:00 |
|
chrisndodge
|
e3d65a0c08
|
Merge pull request #997 from MITx/feature/cale/js-tests
Feature/cale/js tests
|
2012-11-08 06:44:49 -08:00 |
|
Calen Pennington
|
59ee0c5abf
|
Merge pull request #1018 from MITx/fix/cdodge/delete-last-component-does-not-stick
Fix/cdodge/delete last component does not stick
|
2012-11-08 05:52:02 -08:00 |
|
David Ormsbee
|
459c5e322f
|
Merge pull request #1024 from MITx/feature/dave/pearson_setup
Simple Pearson Testing
|
2012-11-07 16:29:29 -08:00 |
|
David Ormsbee
|
e90d321142
|
Comments, whitespace from review.
|
2012-11-07 19:28:22 -05:00 |
|
Carlos Andrés Rocha
|
25d482099e
|
Merge pull request #955 from MITx/louis/srt_downloads
Add support for subtitle download link
|
2012-11-07 15:31:02 -08:00 |
|
Victor Shnayder
|
e3c213dd38
|
Refactor html and js.
Next:
- more clear states (logic in python, view in js)
- style
|
2012-11-07 18:18:35 -05:00 |
|
David Ormsbee
|
ab0e7cf4ae
|
Change AUTH_TOKENS index reference to a get so it doesn't explode the whole app if I did Puppet incorrectly.
|
2012-11-07 17:36:50 -05:00 |
|
David Ormsbee
|
4b02b2af2a
|
Rearrange how we handle the auth tokens for our fake Pearson preliminary testing
|
2012-11-07 17:20:49 -05:00 |
|