Commit Graph

13092 Commits

Author SHA1 Message Date
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
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
Calen Pennington
8b7970938f Use one virtualenv for each parallel build process 2013-05-15 13:39:21 -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
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
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
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
Greg Price
87cc4fab5a Add tags to comment service request Datadog timer 2013-05-14 14:49:56 -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
Greg Price
c8970cafee Add comment service request time logging to Datadog 2013-05-14 11:32:40 -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
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
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
Calen Pennington
f8a72e5cbe Merge pull request #1932 from edx/feature/e0d/flexible-base.sh
flexible org repos parsing tested locally
2013-05-13 13:09:06 -07:00
e0d
5e0afc63e0 Merge pull request #2024 from edx/bugfix/e0d/make-course-dynamic
Enable Delft and Georgetown to be handled by the dynamic path
2013-05-13 12:49:16 -07:00
Steve Strassmann
d26dc95709 pull from master 2013-05-13 15:42:43 -04:00
Steve Strassmann
7b71271bc1 prefix unused vars with _ 2013-05-13 15:21:29 -04:00
jarv
4774a1e92b Merge pull request #2004 from edx/jarv/repo-rename
repo rename to edx-platform
2013-05-13 12:18:16 -07:00
Steve Strassmann
9b7374ab73 pull from master 2013-05-13 15:07:14 -04:00
Steve Strassmann
10b7622018 declare exports from course, component 2013-05-13 15:06:52 -04:00
David Baumgold
f0bd73b2fb Merge pull request #2022 from edx/kill-submodules
Install phantom-jasmine via npm, rather than git submodules
2013-05-13 12:02:41 -07:00
Steve Strassmann
b3cc9a1174 pep8 cleanups 2013-05-13 14:55:41 -04:00