marco
|
c8d30b1cfe
|
Merge branch 'master' into ux/marco/forums-icons
|
2013-05-22 12:59:19 -04:00 |
|
chrisndodge
|
ce56fa3066
|
Merge pull request #1990 from edx/feature/abarrett/lms-notes-app
LMS Notes Djangoapp
|
2013-05-16 12:38:56 -07:00 |
|
John Jarvis
|
2fd0b1b972
|
Merge pull request #2054 from edx/jarv/move-edx-requirements
Jarv/move edx requirements
|
2013-05-16 12:13:44 -07:00 |
|
Arthur Barrett
|
adcd1dd886
|
update annotator.min.css with change to fix adder button and serve the minified one.
|
2013-05-16 14:48:06 -04:00 |
|
Arthur Barrett
|
52e5fe223c
|
update annotator.js library and fix the annotator-adder button hover state in courseware.
|
2013-05-16 14:27:21 -04:00 |
|
Arthur Barrett
|
e89cd7a397
|
fix test to check for 400 status code instead of 500.
|
2013-05-16 13:38:14 -04:00 |
|
Arthur Barrett
|
1fbe43a650
|
Merge branch 'master' into feature/abarrett/lms-notes-app
|
2013-05-16 13:23:12 -04:00 |
|
Arthur Barrett
|
430e009b5d
|
added TODO for open ended and notes tab advanced policy settings.
|
2013-05-16 13:22:40 -04:00 |
|
Arthur Barrett
|
0dd8dabf13
|
validation errors should return 400 status code instead of 500.
|
2013-05-16 13:18:36 -04:00 |
|
Will Daly
|
fca63f065f
|
Merge pull request #2023 from edx/feature/will/ci-lettuce-tests
Feature/will/ci lettuce tests
|
2013-05-16 10:18:00 -07:00 |
|
John Jarvis
|
a30e31213b
|
rakefile updates
|
2013-05-16 12:16:21 -04:00 |
|
John Jarvis
|
50160592f7
|
new location for requirement files
|
2013-05-16 12:13:40 -04:00 |
|
John Jarvis
|
caf64d5dd0
|
moving requirements files to a directory that corresponds with the virtualenv name
|
2013-05-16 12:06:31 -04:00 |
|
Will Daly
|
d1fee427fe
|
Updated Jenkins script to reflect new requirements installation process
|
2013-05-16 11:39:44 -04:00 |
|
Will Daly
|
1e1e6450df
|
Pep8 fixes
|
2013-05-16 11:33:50 -04:00 |
|
Will Daly
|
342b3bb0e9
|
Merge branch 'master' into feature/will/ci-lettuce-tests
Resolved conflict with changes to Rakefile in master
Conflicts:
rakefile
|
2013-05-16 11:21:59 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|