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 |
|
Brian Talbot
|
f069c1a1a1
|
Studio: style reorg
typography, SASS import, mixins/extends
|
2013-05-14 17:15:07 -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 |
|
Peter Baratta
|
554d342f4e
|
Merge pull request #2018 from edx/fix/peter/numerical_infinite_bug
Fix infinity bug for numericalresponse; add tests
|
2013-05-13 11:08:54 -07:00 |
|
e0d
|
eb843172ff
|
Enable Delft and Georgetown to be handled by the dynamic path
|
2013-05-13 14:02:41 -04:00 |
|
VikParuchuri
|
e122efc5a3
|
Merge pull request #1991 from edx/feature/vik/oe-tests
Feature/vik/oe tests
|
2013-05-13 10:49:33 -07:00 |
|
Steve Strassmann
|
4e92277847
|
Merge pull request #2013 from edx/feature/straz/views
Feature/straz/views - refactor views.py
|
2013-05-13 10:48:10 -07:00 |
|
Steve Strassmann
|
96c37089dc
|
whitespace for pep8
|
2013-05-13 13:47:51 -04:00 |
|
Steve Strassmann
|
c49b1f0912
|
Merge branch 'master' of https://github.com/edx/mitx into feature/straz/views
pull from master
|
2013-05-13 13:41:11 -04:00 |
|
Steve Strassmann
|
8795fad917
|
Merge pull request #1938 from edx/feature/straz/transifex
Feature/straz/transifex
|
2013-05-13 10:40:20 -07:00 |
|
Steve Strassmann
|
cdc2de7e65
|
Merge branch 'master' of https://github.com/edx/mitx into feature/straz/views
pull from master
|
2013-05-13 13:22:39 -04:00 |
|
Vik Paruchuri
|
451784dc92
|
Fix pep8 space issues
|
2013-05-13 12:59:18 -04:00 |
|
chrisndodge
|
4191ebdb1b
|
Merge pull request #2017 from edx/fix/cdodge/textbooks-not-exporting
Fix/cdodge/textbooks not exporting
|
2013-05-13 09:57:48 -07:00 |
|
Vik Paruchuri
|
6dfc490fc7
|
Json updates
|
2013-05-13 12:49:01 -04:00 |
|
Vik Paruchuri
|
df07192a68
|
Querydict comment.
|
2013-05-13 12:42:30 -04:00 |
|
Peter Baratta
|
d80024472c
|
Pylint fixes
|
2013-05-13 12:40:32 -04:00 |
|
Vik Paruchuri
|
a5549fd7fb
|
Add in some assert statements
|
2013-05-13 12:25:23 -04:00 |
|
Steve Strassmann
|
b0cc989b1e
|
pull from master
|
2013-05-13 11:45:23 -04:00 |
|
David Baumgold
|
7c98981498
|
Install phantom-jasmine via npm, rather than git submodules
Because removing a step from our install process is a Good Thing™
|
2013-05-13 11:33:09 -04:00 |
|
Steve Strassmann
|
8bb6ad3689
|
relative imports
|
2013-05-13 11:31:56 -04:00 |
|
Peter Baratta
|
06efd40ba9
|
Comment capitalization
|
2013-05-13 11:29:46 -04:00 |
|
Chris Dodge
|
0ef2944d43
|
Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting
|
2013-05-13 11:13:43 -04:00 |
|
Mark L. Chang
|
85ae7b9744
|
Merge pull request #2012 from edx/feature/markchang/500-copy-change
copy change
|
2013-05-13 08:12:02 -07:00 |
|