Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

14212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jay Zoldak
ed5ad46192 Revert "Revert "fix merge conflict"" 
This reverts commit 2df3fe9344.

Conflicts:
	common/static/coffee/src/discussion/utils.coffee
 2013-05-16 10:29:33 -04:00
Your Name
4b806768ec more server trial and error 2013-05-16 10:29:33 -04:00
Your Name
8568ce7ad0 server django version generating 1 instead of True so test for both 2013-05-16 10:29:33 -04:00
Kevin Chugh
ab08fa94e4 coffeescript fixes 2013-05-16 10:29:32 -04:00
Kevin Chugh
c410da91de fix coffeescript error 2013-05-16 10:29:32 -04:00
marco
ef14155306 cleaned up latex styling, polyfill function wrapper, draft number template update for polyfill 2013-05-16 09:50:16 -04:00
Ned Batchelder
1c36564f45 Use newer CodeJail. 2013-05-16 07:47:16 -04:00
Will Daly
e78436db18 Merge branch 'feature/will/ci-lettuce-tests' of https://github.com/edx/edx-platform into feature/will/ci-lettuce-tests 2013-05-15 17:07:24 -04:00
Will Daly
3a981cfa05 Removed COURSES_ROOT and DATA_DIR from cms/envs/acceptance.py 2013-05-15 17:06:44 -04:00
Ned Batchelder
8f3c1db1ef Add some notes for the future maintainer. 2013-05-15 17:00:39 -04:00
Calen Pennington
281662a43e Merge pull request #2048 from edx/fix/cale/prereqs-before-django 
Install python prereqs before trying to run django or install requiremen...
 2013-05-15 13:49:05 -07:00
marco
bbb6a3c60d resolved metadata-edit conflict, adding in latex item into settings 2013-05-15 16:27:04 -04:00
marco
12dae84a07 commented out firefox polyfill ad well as xmodule css editor changes 2013-05-15 16:07:45 -04:00
Brian Talbot
6dcf7be05d Merge pull request #2047 from edx/fix/btalbot/studio-typographyvariables 
Studio - Resolving incorrect Sans Serif Sass Variable Definition
 2013-05-15 13:03:50 -07:00
Brian Talbot
6a618cbe5e Merge branch 'master' into fix/btalbot/studio-typographyvariables 2013-05-15 16:02:44 -04:00
Calen Pennington
0df9f714b8 Install python prereqs before trying to run django or install requirements/local.txt 2013-05-15 15:49:51 -04:00
Will Daly
4e118a080e Updated docs to add a note about Chrome / ChromeDriver revisions. 2013-05-15 15:48:03 -04:00
Will Daly
59f68c2179 Added comments for skipped tests 2013-05-15 15:45:12 -04:00
Brian Talbot
d1c629882c studio - fixes Sass variable defintion to ensure the older -serif references the proper new -sans-serif variable 2013-05-15 15:42:59 -04:00
Calen Pennington
ec7c47828f Merge pull request #1961 from edx/feature/cale/maintain-dev-environment 
Feature/cale/maintain dev environment
 2013-05-15 12:36:36 -07:00
cahrens
c85cc5a3a7 Fix bad merge. 2013-05-15 15:35:18 -04:00
cahrens
d72b6b05bf Merge branch 'master' into feature/christina/metadata-ui 
Conflicts:
	cms/static/sass/views/_static-pages.scss
 2013-05-15 15:29:27 -04:00
cahrens
724678dd3e Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui 2013-05-15 15:26:02 -04:00
Calen Pennington
9c2756b76b Fix up documentation 2013-05-15 15:25:43 -04:00
Calen Pennington
b5c134e21e Make the externally facing asset watch commands wait for user intervention, and add internal tasks that only run as long as the rake process 2013-05-15 15:25:42 -04:00
Calen Pennington
91dce34f77 Be more graceful when terminating background processes 2013-05-15 15:25:42 -04:00
Calen Pennington
352a4da5b8 Use install_prereqs in tests 2013-05-15 15:25:42 -04:00
Calen Pennington
0701e1a776 Use local node_modules as system_node_path if none is set 2013-05-15 15:25:42 -04:00
Calen Pennington
52d209d053 Use coffee installed in local node_modules for tests 2013-05-15 15:25:41 -04:00
Calen Pennington
089ac002c6 Install prereqs before running pep8 or pylint 2013-05-15 15:25:41 -04:00
Calen Pennington
ed9b91e9d0 Add mechanism for running migrations of developer workspaces 2013-05-15 15:25:41 -04:00
cahrens
fa1dfd716a Update unit test for editable_metadata_fields. 2013-05-15 15:25:36 -04:00
Calen Pennington
9d42bce54f Split rake file into smaller, more manageable pieces 2013-05-15 15:25:35 -04:00
Calen Pennington
437158a4f1 Allow disabling of prereq installation 2013-05-15 15:23:57 -04:00
Calen Pennington
afdf10a448 Clean up how asset prereq tasks are wired up 2013-05-15 15:23:57 -04:00
Calen Pennington
6485b85a9c Allow overriding of prereqs cache dir 2013-05-15 15:23:57 -04:00
Calen Pennington
a22287f192 Install prereqs before starting cms/lms or running tests 2013-05-15 15:23:57 -04:00
Calen Pennington
964c21ff2b Add a jasmine test runner for capa 2013-05-15 15:23:56 -04:00
Calen Pennington
1c28f5a0ec Move Mysql and scipi to requirements/post.txt, because they require the contents of requirements.txt to be completely installed 2013-05-15 15:23:56 -04:00
Calen Pennington
ef17e9368c Make capa specify distribute 0.6.28 like the rest of the project 2013-05-15 15:23:56 -04:00
Calen Pennington
05d76c77ec Pip installs paths relative to the current directory, not the directory the requirements file is in 2013-05-15 15:23:56 -04:00
Calen Pennington
9743e84d0b Use launchy for opening browsers 2013-05-15 15:23:55 -04:00
Calen Pennington
8e54991b89 Clean out cruft from rake file 2013-05-15 15:23:55 -04:00
Carlos Andrés Rocha
4a835433ab Remove unused fixtures 2013-05-15 15:23:55 -04:00
Carlos Andrés Rocha
79a029ce9a Clean root project directory 2013-05-15 15:23:55 -04:00
Calen Pennington
14bf719538 Merge pull request #2019 from edx/fix/cale/xmodule-template-docs 
Add documentation of xmodule template files
 2013-05-15 12:20:10 -07:00
Calen Pennington
1746c60072 Merge pull request #2027 from edx/fix/cale/allow-liveserver-port-ranges 
Allow django liveserver to use larger port range
 2013-05-15 12:19:25 -07:00
Calen Pennington
f499dec1db Merge pull request #2028 from edx/feature/cale/flexible-repo-jenkins 
Make gcli commands flexible around org and repo name
 2013-05-15 12:15:48 -07:00
cahrens
d35b29031f Clean up editable_metadata_fields. 2013-05-15 14:01:18 -04:00
marco
ba11d37ba9 clear button to match help icon visually 2013-05-15 13:58:08 -04:00