Commit Graph

14212 Commits

Author SHA1 Message Date
marco
2f8e8f4881 border around course introduction which was lost in code mirror styling for component editors 2013-05-15 13:50:19 -04:00
Calen Pennington
9689445251 Merge pull request #1964 from edx/feature/cale/parallel-build-venvs
Use one virtualenv for each parallel build process
2013-05-15 10:48:40 -07:00
marco
cbdadaee1d updates moved slightly, will not use new styling 2013-05-15 13:39:38 -04:00
Calen Pennington
8b7970938f Use one virtualenv for each parallel build process 2013-05-15 13:39:21 -04:00
cahrens
305b555d63 Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui 2013-05-15 13:33:41 -04:00
marco
b3e41d19f6 styling for static pages updated 2013-05-15 13:29:35 -04:00
Calen Pennington
b3e8d59762 Make gcli commands flexible around org and repo name 2013-05-15 13:19:42 -04:00
Calen Pennington
5cc15fccf1 Allow django liveserver to use larger port range 2013-05-15 13:19:22 -04:00
Ned Batchelder
b32878e6c7 Added instructions for getting capa sandboxed. 2013-05-15 12:59:56 -04:00
marco
0422350e8c final changes to codemirror styling, and clean up style for settings button clearing 2013-05-15 12:05:43 -04:00
cahrens
06d315484f Set "editing" name. 2013-05-15 11:52:38 -04:00
marco
5f4bded3db Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui 2013-05-15 11:41:24 -04:00
marco
56df114edb style changes to component header 2013-05-15 11:41:19 -04:00
Will Daly
1240c5ae92 Merge branch 'master' into feature/will/ci-lettuce-tests 2013-05-15 11:40:54 -04:00
cahrens
a16740691f Minor update. 2013-05-15 11:39:07 -04:00
Will Daly
405299712c Disabled color output from lettuce tests in the Jenkins logs 2013-05-15 11:38:11 -04:00
chrisndodge
d7a6e58fec Merge pull request #2044 from edx/fix/cdodge/fix-test-on-css-class
fix broken tests. Also drive by fix for the sporadic failure on tests wh...
2013-05-15 08:37:58 -07:00
cahrens
4152e4602d Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
Conflicts:
	cms/static/coffee/src/views/module_edit.coffee
2013-05-15 11:36:32 -04:00
cahrens
faf31d9728 Get toggling between Editor and Settings working. 2013-05-15 11:34:49 -04:00
Will Daly
b3e959773d Disabled logging of warnings/errors for acceptance tests
to make the logs readable
2013-05-15 11:31:52 -04:00
marco
63960ee4a2 style change for is-set 2013-05-15 11:26:34 -04:00
Chris Dodge
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 2013-05-15 11:16:47 -04:00
Arthur Barrett
3a178bab1f Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-15 11:12:42 -04:00
marco
d264c943a4 Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui 2013-05-15 10:54:15 -04:00
marco
e157173c11 styling adjustments to codemirror and wrapped polyfill into a function 2013-05-15 10:53:54 -04:00
Will Daly
baec80ed07 Updated documentation with note about running acceptance tests
in parallel.

Updated docs to say we target Chrome.
2013-05-15 10:38:04 -04:00
cahrens
d4d38827b4 Updates for showanswer. 2013-05-15 10:35:40 -04:00
Will Daly
3217989de5 Fixed/skipped CMS tests in subsection and signup. 2013-05-15 10:14:37 -04:00
Chris Dodge
ce52be1e57 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 2013-05-15 09:59:26 -04:00
Calen Pennington
abc67b5e43 Merge pull request #2021 from edx/vaxxxa/word_cloud_fix_peps
word cloud: fix pylint warnings, fix word cloud test
2013-05-15 06:56:17 -07:00
Will Daly
8e069c1faa Skip tests that break on Ubuntu due to alerts (which will be removed
soon anyway).  Removed @skip-phantom and @skip-firefox tags

Fixed sign up test to work in Ubuntu

Added comments
2013-05-15 09:39:07 -04:00
Will Daly
ee5f0ac0ce Workaround for Ubuntu ChromeDriver issue. Now retries
until it acquires a valid session.
2013-05-15 08:24:27 -04:00
Vasyl Nakvasiuk
b02e92a80c fix word cloud test 2013-05-15 11:42:43 +03:00
Vasyl Nakvasiuk
92476ecacd add docs note about possible values for boolean type 2013-05-15 11:42:43 +03:00
Vasyl Nakvasiuk
d86dab9a3a word cloud: add more docs about display_student_percents options 2013-05-15 11:42:43 +03:00
Vasyl Nakvasiuk
0eb1b97ffc add more docs 2013-05-15 11:42:43 +03:00
Vasyl Nakvasiuk
0afe6c11ab word cloud: fix pylint warnings, use MetadataOnlyEditingDescriptor instead of RawDescriptor 2013-05-15 11:42:43 +03:00
marco
b9fc3f9e07 updated styles for input type numbers 2013-05-15 00:04:41 -04:00
marco
47a4d6b6a1 initial polyfill implementation and metadata number entry javascript validation 2013-05-14 23:55:34 -04:00
marco
98e692d15e fixed broken coffee script caused by errant pseudo code I checked in 2013-05-14 23:03:33 -04:00
marco
81e95f27db basic tab switching added 2013-05-14 22:31:11 -04:00
David Baumgold
1afe556161 Merge pull request #2039 from edx/fix-course-updates
Fix "Course Updates" page
2013-05-14 16:14:20 -07:00
Brian Talbot
26b149e742 Merge pull request #1997 from edx/fix/btalbot/studio-FEDcleanup
Studio Front End Development Clean-up
2013-05-14 14:22:41 -07:00
Carlos Andrés Rocha
ad5db7d972 Merge pull request #2041 from edx/hotfix/rocha/xqueue-interface-import
Fix import con resposetype when importing xqueue_interface
2013-05-14 14:20:15 -07:00
Frances Botsford
6c119fa3ab refixed extend for text-sr and text-hide 2013-05-14 17:17:43 -04:00
frances botsford
24b7defb43 removed mixin for text-sr and text-hide, replaced with extend 2013-05-14 17:17:42 -04:00
Brian Talbot
8b77111d58 Studio: more styling changes
typography, SASS, imports
2013-05-14 17:16:53 -04:00
Jay Zoldak
5d783d33ad Update lettuce test for new css changes. 2013-05-14 17:16:51 -04:00
Carlos Andrés Rocha
9a671f12d7 Fix import con resposetype when importing xqueue_interface 2013-05-14 17:15:46 -04:00
Brian Talbot
f069c1a1a1 Studio: style reorg
typography, SASS import, mixins/extends
2013-05-14 17:15:07 -04:00