Commit Graph

13825 Commits

Author SHA1 Message Date
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
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
David Baumgold
e9a8f408bf Add {reset: true} to all collection.fetch() calls
This is to fix a bug with the Backbone 1.0 upgrade; some views were listening to
reset events that were not longer getting fired
2013-05-14 16:43:41 -04:00
Greg Price
60f5314ab0 Merge pull request #2036 from edx/feature/gprice/datadog-cs-time
Add comment service request time logging to Datadog
2013-05-14 12:25:59 -07:00
Ned Batchelder
4ea7607648 Check that the directory being added to the Python path is really inside the course. 2013-05-14 14:59:19 -04:00
Ned Batchelder
768665067f Update the CodeJail we want. 2013-05-14 14:52:30 -04:00
Greg Price
87cc4fab5a Add tags to comment service request Datadog timer 2013-05-14 14:49:56 -04:00
Will Daly
9dbcf0baa4 Updated login session handling to fix issue with ChromeDriver on Ubuntu 2013-05-14 14:47:50 -04:00
Arthur Barrett
0e7573a2cc Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-14 13:45:17 -04:00
Will Daly
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
2013-05-14 12:45:38 -04:00
Greg Price
2c1b0c831f Merge pull request #2032 from edx/fix/gprice/zendesk-log-error
Add a prefix string to Zendesk errors to be more searchable in Splunk
2013-05-14 09:35:33 -07:00
Will Daly
daef910494 Mae mongo DB and collection names consistent for all
acceptance tests.
2013-05-14 12:34:15 -04:00
Arthur
c8bdc1ab66 update readme 2013-05-14 12:42:26 -03:00
Greg Price
c8970cafee Add comment service request time logging to Datadog 2013-05-14 11:32:40 -04:00
Arthur Barrett
149f2ff897 add readme 2013-05-14 11:26:15 -04:00
Chris Dodge
5df23d15f2 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master
Conflicts:
	cms/djangoapps/contentstore/views/course.py
2013-05-14 10:57:11 -04:00
Arthur Barrett
5e39971fcc merge master. resolved conflicts in component.py and course.py. 2013-05-14 10:54:21 -04:00
Chris Dodge
ef78c99f70 pep8/pylint violations fixes 2013-05-14 10:53:10 -04:00
Will Daly
e2d7f6a027 Changed module store directory root to test_root/data 2013-05-14 10:45:27 -04:00
Will Daly
72a42413e2 Fixed database to work on Jenkins (now stored in test_root),
moved syncdb/migration steps into the rake test_acceptance commands
and updated the documentation.
2013-05-14 10:33:25 -04:00
Jay Zoldak
3657fbe33b Merge pull request #2035 from edx/fix/zoldak/phantom-jasmine-version
Specify version of phantom jasmine to use.
2013-05-14 07:32:14 -07:00
Jay Zoldak
b590d344f5 Specify version of phantom jasmine to use. 2013-05-14 10:30:50 -04:00
Calen Pennington
465a2652b9 Merge pull request #2034 from edx/fix/cale/advanced-modules
Fix advanced modules list
2013-05-14 07:17:14 -07:00
Calen Pennington
bd6bb8e9c1 Fix advanced modules list 2013-05-14 09:39:25 -04:00
Calen Pennington
799ad92ecd Add documentation of xmodule template files 2013-05-14 09:37:13 -04:00
Jay Zoldak
c69c69d27b Merge pull request #2033 from edx/fix-phantom-jasmine-lms
Forgot to update phantom-jasmine location for LMS
2013-05-14 06:13:13 -07:00
David Baumgold
d376cb52ca Forgot to update phantom-jasmine location for LMS 2013-05-13 17:31:57 -04:00
Ned Batchelder
29f4566a00 Change the XBlock target hash, not because we need new code, but because the old one was tangled up in a eponymous branch that was causing trouble. 2013-05-13 17:27:21 -04:00
Ned Batchelder
b682e1c0d3 Put a feature flag around the staff-only debugging page. 2013-05-13 17:07:13 -04:00
Arthur Barrett
026773b508 fix pep8 warnings and add empty message to notes tab 2013-05-13 16:54:32 -04:00
Jay Zoldak
38ee7bea5a Merge pull request #2031 from edx/fix/zoldak/repo-name
Update repo name in jenkins test shell script.
2013-05-13 13:52:04 -07:00
Greg Price
a5bb31792b Add a prefix string to Zendesk errors to be more searchable in Splunk 2013-05-13 16:38:52 -04:00
Steve Strassmann
b412dd57b6 Merge pull request #2026 from edx/bug/straz/pep8
pep8 cleanups
2013-05-13 13:37:57 -07:00
Sarina
c4c3b202ce Merge pull request #2030 from edx/victor/fix-word-cloud-rotation
fix order of operations to make things rotate correctly
2013-05-13 13:33:17 -07:00
Jay Zoldak
30e8e2e2ae Update repo name in jenkins test shell script. 2013-05-13 16:30:01 -04:00
Victor Shnayder
4f2c3b78da fix order of operations to make things rotate correctly 2013-05-13 16:27:27 -04:00