Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,684 Commits 1 Branch 0 Tags
47ed02c9ea2ef4e55478317184cb26a831f9413c
Commit Graph

7684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
47ed02c9ea Remove more merge badness 2012-12-07 11:30:21 -05:00
Calen Pennington
3e568667fc Fix merge badness 2012-12-07 11:24:25 -05:00
Calen Pennington
3b75bbdc6f Actually run cms tests on cms master 2012-12-07 11:18:38 -05:00
Calen Pennington
c917725ff0 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/static/sass/course.scss
	requirements.txt
 2012-12-07 11:17:41 -05:00
David Ormsbee
98fefd14c5 Merge pull request #1105 from MITx/feature/cale/github-status-api 
Feature/cale/github status api
 2012-12-07 08:09:00 -08:00
Calen Pennington
38671fc83c Move files from base.sh to test.sh 2012-12-07 11:01:58 -05:00
Calen Pennington
e2ed7d1c4e Move to a single test.sh file that only runs the relevant tests for a particular branch in the repo. In particular, don't run cms tests on branches derived from master 2012-12-07 10:56:24 -05:00
Calen Pennington
5a3cdc11cd Only mark github commit status when full test suite passes 2012-12-07 10:41:24 -05:00
Calen Pennington
d4ec5946d4 Mark failed state correctly 2012-12-07 10:37:44 -05:00
Calen Pennington
3f5187401d Change message with state 2012-12-07 10:29:13 -05:00
Calen Pennington
86579efc5b Source jenkins/base.sh with the correct path 2012-12-07 09:59:21 -05:00
Calen Pennington
724cba193a Source the base jenkins configuration before running tests 2012-12-07 09:43:52 -05:00
Calen Pennington
d4cdd5b485 Make jenkins talk to the github status api 2012-12-07 09:38:47 -05:00
Calen Pennington
1a89c14b62 Merge pull request #1087 from MITx/fix/cdodge/lms-runtime-bugs 
Fix/cdodge/lms runtime bugs
 2012-12-07 06:38:16 -08:00
David Ormsbee
61c17cabfa Merge pull request #1100 from MITx/fix/brian/nonascii-html-xmodule 
Fix/brian/nonascii html xmodule
 2012-12-06 15:33:21 -08:00
Victor Shnayder
1d9d347df9 Merge pull request #1101 from MITx/bugfix/dave/remove_point_cap 
Don't cap points coming back from CodeResponses
 2012-12-04 13:59:06 -08:00
David Ormsbee
cee0781a20 Don't cap points coming back from CodeResponses -- let them be more than max_points if they want to award extra credit. 2012-12-04 15:51:36 -05:00
Brian Wilson
70f35b2e15 remove skipped tests that use mongo 2012-12-04 13:46:32 -05:00
Brian Wilson
c2d5c04d9d Merge branch 'master' into fix/brian/nonascii-html-xmodule 2012-12-04 13:26:37 -05:00
Brian Wilson
cde20758f8 cosmetic cleanup 2012-12-04 13:25:04 -05:00
Brian Wilson
dfb9913100 clean up lms tests, and fix export/import 2012-12-04 11:52:35 -05:00
Carlos Andrés Rocha
94a12bddb6 Merge pull request #1099 from MITx/content/rocha/wellesley-announcmenent 
Modify Wellesley rollover logo
 2012-12-04 07:27:59 -08:00
Carlos Andrés Rocha
c702bbcd85 Modify Wellesley rollover logo 2012-12-04 10:27:23 -05:00
Carlos Andrés Rocha
4f9f17d3bb Merge pull request #1098 from MITx/content/rocha/wellesley-announcmenent 
Add Wellesley College news announcement and frontpage changes
 2012-12-04 07:01:47 -08:00
Carlos Andrés Rocha
4d6162b1df Fix incorrect Facebook URL for Wellesley news announcement 2012-12-04 09:58:50 -05:00
Carlos Andrés Rocha
e3d180505f Add Wellesley College news announcement and frontpage changes 2012-12-04 09:45:30 -05:00
Brian Wilson
4ebd70dcc4 add support for utf8 in sequences, verticals and custom modules. 2012-12-04 03:54:36 -05:00
Brian Wilson
5b02e1e3ce add additional html tests 2012-12-03 16:26:08 -05:00
Brian Wilson
1d44ebb10c Add more non-ascii characters to full dataset, and make fixes in xmodule code. 2012-12-03 16:22:25 -05:00
Ashley Penney
e36cffa86f Merge pull request #1096 from MITx/feature/cale/bad-newrelic-logging 
Don't try and send exceptions to newrelic with a busted logging interfac...
 2012-12-03 11:35:53 -08:00
Calen Pennington
251f552e64 Don't try and send exceptions to newrelic with a busted logging interface 2012-12-03 14:30:36 -05:00
David Ormsbee
36a3aeed6a Merge pull request #1093 from MITx/bugfix/dave/pearson_compat 
Don't log errors to console if there is no console (like IE8 and below).
 2012-12-01 09:18:22 -08:00
David Ormsbee
3b326048f9 Don't log errors to console if there is no console (like IE8 and below). 2012-12-01 12:16:10 -05:00
David Ormsbee
597b8a245b Merge pull request #1092 from MITx/bugfix/dave/pearson_compat 
IE errors if you try to use 'return' as a dict key.
 2012-12-01 07:00:48 -08:00
Brian Wilson
0c1ebd8dfb add toylab test data and test changes, including fix to jump_to 2012-11-30 19:05:26 -05:00
David Ormsbee
7ffb30d0c9 IE errors if you try to use 'return' as a dict key. 2012-11-30 18:22:37 -05:00
David Ormsbee
c2c016c58b Fix MathJax S3 URL to use the standard HTTPS location 2012-11-30 18:00:45 -05:00
Victor Shnayder
e30dceb15d Merge pull request #1091 from MITx/hotfix/dave/ie8_mathjax 
Switch to S3 hosted mathjax (I thought we did this ages ago).
 2012-11-30 14:08:44 -08:00
David Ormsbee
0b3d739646 Switch to S3 hosted mathjax (I thought we did this ages ago). 2012-11-30 17:01:30 -05:00
chrisndodge
2d866418ad Merge pull request #1089 from MITx/feature/studio/tom/speedups 
some quick speedups
 2012-11-30 08:55:31 -08:00
Tom Giannattasio
b41ab37c4e fixed padding on a few buttons 2012-11-30 07:51:14 -05:00
Tom Giannattasio
fbbf9e9c0f key bindings and speed reworkings for the my courses and courseware pages 2012-11-29 16:21:51 -05:00
Chris Dodge
2aceb2e44a make sure when defining the course namespace in the replace url methods that we explicitly state the parameter name. There are some optional parameters and if we don't define the parameter name, it'll end put being interpreted as a different parameter 2012-11-29 15:56:03 -05:00
Chris Dodge
46870f4391 be sure to always pass in a course namespace - which can be just the location of the module itself since it has the same org/course pair - when rewriting links. Also, allow for an option parameter in get_module() to disable the wrapping of the module's HTML with the xmodule_display.html. This is needed for ancillary course content such as 'about', 'course info', which are now stored as xmodules, but should not be wrapped in xmodule_display.html as it breaks some styling 2012-11-29 15:09:28 -05:00
Calen Pennington
4646f36b58 Merge pull request #1078 from MITx/feature/jzoldak/jenkins-cleanup 
Add pip install of test requirements, remove askbot requirements.
 2012-11-29 11:26:20 -08:00
Chris Dodge
050cb89cf7 fix crash with working with custom tags with XML filestore 2012-11-29 13:24:41 -05:00
Chris Dodge
021ed3bca6 fix crash with working with custom tags with XML filestore 2012-11-29 13:24:07 -05:00
Victor Shnayder
82cf37b2b6 Merge pull request #1085 from MITx/feature/victor/fix-self-assessment 
Feature/victor/fix self assessment
 2012-11-29 10:20:41 -08:00
chrisndodge
89ad8cc564 Merge pull request #1086 from MITx/feature/studio/tom/tabs-cleanup 
Static tabs cleanup
 2012-11-29 06:49:28 -08:00
jarv
68158b39ca Merge pull request #1083 from MITx/fix/rocha/create-dev-env 
Move APT dependencies and repos to their own files
 2012-11-29 05:48:44 -08:00