724678dd3e
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
cahrens
2013-05-15 15:26:02 -04:00
9c2756b76b
Fix up documentation
Calen Pennington
2013-05-08 13:26:47 -04:00
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
Calen Pennington
2013-05-07 12:19:06 -04:00
91dce34f77
Be more graceful when terminating background processes
Calen Pennington
2013-05-07 12:16:26 -04:00
352a4da5b8
Use install_prereqs in tests
Calen Pennington
2013-05-07 10:57:56 -04:00
0701e1a776
Use local node_modules as system_node_path if none is set
Calen Pennington
2013-05-07 08:29:34 -04:00
52d209d053
Use coffee installed in local node_modules for tests
Calen Pennington
2013-05-07 07:55:56 -04:00
089ac002c6
Install prereqs before running pep8 or pylint
Calen Pennington
2013-05-06 14:53:43 -04:00
ed9b91e9d0
Add mechanism for running migrations of developer workspaces
Calen Pennington
2013-05-06 14:22:44 -04:00
fa1dfd716a
Update unit test for editable_metadata_fields.
cahrens
2013-05-15 15:25:36 -04:00
9d42bce54f
Split rake file into smaller, more manageable pieces
Calen Pennington
2013-05-06 13:46:55 -04:00
afdf10a448
Clean up how asset prereq tasks are wired up
Calen Pennington
2013-05-03 16:47:47 -04:00
6485b85a9c
Allow overriding of prereqs cache dir
Calen Pennington
2013-05-03 16:47:16 -04:00
a22287f192
Install prereqs before starting cms/lms or running tests
Calen Pennington
2013-05-03 11:39:58 -04:00
964c21ff2b
Add a jasmine test runner for capa
Calen Pennington
2013-05-06 14:23:36 -04:00
1c28f5a0ec
Move Mysql and scipi to requirements/post.txt, because they require the contents of requirements.txt to be completely installed
Calen Pennington
2013-05-06 12:00:34 -04:00
ef17e9368c
Make capa specify distribute 0.6.28 like the rest of the project
Calen Pennington
2013-05-06 14:24:03 -04:00
05d76c77ec
Pip installs paths relative to the current directory, not the directory the requirements file is in
Calen Pennington
2013-05-03 11:40:41 -04:00
9743e84d0b
Use launchy for opening browsers
Calen Pennington
2013-05-03 11:40:20 -04:00
8e54991b89
Clean out cruft from rake file
Calen Pennington
2013-05-03 11:40:10 -04:00
4a835433ab
Remove unused fixtures
Carlos Andrés Rocha
2013-05-02 13:50:59 -04:00
cbdadaee1d
updates moved slightly, will not use new styling
marco
2013-05-15 13:39:38 -04:00
8b7970938f
Use one virtualenv for each parallel build process
Calen Pennington
2013-05-07 12:48:00 -04:00
305b555d63
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
cahrens
2013-05-15 13:33:41 -04:00
b3e41d19f6
styling for static pages updated
marco
2013-05-15 13:29:35 -04:00
b3e8d59762
Make gcli commands flexible around org and repo name
Calen Pennington
2013-05-13 16:12:18 -04:00
5cc15fccf1
Allow django liveserver to use larger port range
Calen Pennington
2013-05-13 16:14:34 -04:00
b32878e6c7
Added instructions for getting capa sandboxed.
Ned Batchelder
2013-05-15 12:59:56 -04:00
67356cdcc8
Merge of master to get Jenkins running.
dcadams
2013-05-15 09:54:53 -07:00
6225950356
Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement
dcadams
2013-05-15 09:48:14 -07:00
0422350e8c
final changes to codemirror styling, and clean up style for settings button clearing
marco
2013-05-15 12:05:43 -04:00
06d315484f
Set "editing" name.
cahrens
2013-05-15 11:52:38 -04:00
5f4bded3db
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
marco
2013-05-15 11:41:24 -04:00
56df114edb
style changes to component header
marco
2013-05-15 11:41:19 -04:00
1240c5ae92
Merge branch 'master' into feature/will/ci-lettuce-tests
Will Daly
2013-05-15 11:40:54 -04:00
a16740691f
Minor update.
cahrens
2013-05-15 11:39:07 -04:00
405299712c
Disabled color output from lettuce tests in the Jenkins logs
Will Daly
2013-05-15 11:38:11 -04:00
4152e4602d
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
cahrens
2013-05-15 11:36:32 -04:00
faf31d9728
Get toggling between Editor and Settings working.
cahrens
2013-05-15 11:34:49 -04:00
b3e959773d
Disabled logging of warnings/errors for acceptance tests to make the logs readable
Will Daly
2013-05-15 11:31:52 -04:00
63960ee4a2
style change for is-set
marco
2013-05-15 11:26:34 -04:00
6cec66979a
fix broken tests. Also drive by fix for the sporadic failure on tests which may go to a textbook page. The URL formatting was incorrect in the test
Chris Dodge
2013-05-15 11:16:47 -04:00
3a178bab1f
Merge branch 'master' into feature/abarrett/lms-notes-app
Arthur Barrett
2013-05-15 11:12:42 -04:00
d264c943a4
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
marco
2013-05-15 10:54:15 -04:00
e157173c11
styling adjustments to codemirror and wrapped polyfill into a function
marco
2013-05-15 10:53:54 -04:00
baec80ed07
Updated documentation with note about running acceptance tests in parallel.
Will Daly
2013-05-15 10:32:18 -04:00
d4d38827b4
Updates for showanswer.
cahrens
2013-05-15 10:35:40 -04:00
3217989de5
Fixed/skipped CMS tests in subsection and signup.
Will Daly
2013-05-15 10:14:37 -04:00
ce52be1e57
Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master
Chris Dodge
2013-05-15 09:59:26 -04:00
8e069c1faa
Skip tests that break on Ubuntu due to alerts (which will be removed soon anyway). Removed @skip-phantom and @skip-firefox tags
Will Daly
2013-05-15 09:39:07 -04:00
ee5f0ac0ce
Workaround for Ubuntu ChromeDriver issue. Now retries until it acquires a valid session.
Will Daly
2013-05-15 08:24:27 -04:00
b02e92a80c
fix word cloud test
Vasyl Nakvasiuk
2013-05-15 11:35:56 +03:00
92476ecacd
add docs note about possible values for boolean type
Vasyl Nakvasiuk
2013-05-14 12:54:05 +03:00
d86dab9a3a
word cloud: add more docs about display_student_percents options
Vasyl Nakvasiuk
2013-05-14 12:00:24 +03:00
0eb1b97ffc
add more docs
Vasyl Nakvasiuk
2013-05-13 18:43:05 +03:00
0afe6c11ab
word cloud: fix pylint warnings, use MetadataOnlyEditingDescriptor instead of RawDescriptor
Vasyl Nakvasiuk
2013-05-13 18:26:05 +03:00
b9fc3f9e07
updated styles for input type numbers
marco
2013-05-15 00:04:41 -04:00
47a4d6b6a1
initial polyfill implementation and metadata number entry javascript validation
marco
2013-05-14 23:55:34 -04:00
98e692d15e
fixed broken coffee script caused by errant pseudo code I checked in
marco
2013-05-14 23:03:33 -04:00
81e95f27db
basic tab switching added
marco
2013-05-14 22:31:11 -04:00
1afe556161
Merge pull request #2039 from edx/fix-course-updates
David Baumgold
2013-05-14 16:14:20 -07:00
26b149e742
Merge pull request #1997 from edx/fix/btalbot/studio-FEDcleanup
Brian Talbot
2013-05-14 14:22:41 -07:00
ad5db7d972
Merge pull request #2041 from edx/hotfix/rocha/xqueue-interface-import
Carlos Andrés Rocha
2013-05-14 14:20:15 -07:00
6c119fa3ab
refixed extend for text-sr and text-hide
Frances Botsford
2013-05-14 15:15:39 -04:00
24b7defb43
removed mixin for text-sr and text-hide, replaced with extend
frances botsford
2013-05-14 14:31:22 -04:00
8b77111d58
Studio: more styling changes
Brian Talbot
2013-05-08 16:35:09 -04:00
5d783d33ad
Update lettuce test for new css changes.
Jay Zoldak
2013-05-13 14:01:09 -04:00
9a671f12d7
Fix import con resposetype when importing xqueue_interface
Carlos Andrés Rocha
2013-05-14 17:15:46 -04:00
f069c1a1a1
Studio: style reorg
Brian Talbot
2013-05-08 16:09:26 -04:00
e9a8f408bf
Add {reset: true} to all collection.fetch() calls
David Baumgold
2013-05-14 16:43:41 -04:00
6ec1a29201
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
marco
2013-05-14 15:05:29 -04:00
064d21c4e2
clean up of editor header styling
marco
2013-05-14 15:05:22 -04:00
4ea7607648
Check that the directory being added to the Python path is really inside the course.
Ned Batchelder
2013-05-14 14:59:19 -04:00
768665067f
Update the CodeJail we want.
Ned Batchelder
2013-05-14 14:52:30 -04:00
87cc4fab5a
Add tags to comment service request Datadog timer
Greg Price
2013-05-14 13:20:55 -04:00
9dbcf0baa4
Updated login session handling to fix issue with ChromeDriver on Ubuntu
Will Daly
2013-05-14 14:47:50 -04:00
17750a7d6d
Use min, max, and step values from server.
cahrens
2013-05-14 14:20:10 -04:00
5bd0442ffb
Merge branch 'master' into feature/christina/metadata-ui
cahrens
2013-05-14 13:53:03 -04:00
0e7573a2cc
Merge branch 'master' into feature/abarrett/lms-notes-app
Arthur Barrett
2013-05-14 13:45:17 -04:00
36fb8f91e0
Acceptance tests now use the same mongo db as the unit test suite. The LMS/CMS acceptance tests both use the collection acceptance_modules
Will Daly
2013-05-14 12:45:38 -04:00
69832c57a9
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
cahrens
2013-05-14 12:40:25 -04:00
82899d6d2e
Number view.
cahrens
2013-05-14 12:40:17 -04:00
8d8c8d83df
updated unit styling, added polyfill js library, updated javascript handling for modes swap
marco
2013-05-14 12:38:52 -04:00
cahrens