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 |
|
Arthur Barrett
|
66d3ccff17
|
sanitize note text and other input in the model as well as escape template output to close potential security hole
|
2013-05-13 13:40:19 -04:00 |
|
Arthur Barrett
|
be98b5fa3e
|
merged master. resolved conflict in cms/djangoapps/contentstore/views.py (added word_cloud to advanced_modules list)
|
2013-05-13 13:26:55 -04: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 |
|
cahrens
|
e29c940e7c
|
Add display_names, update help, remove unnecessary things from templates.
|
2013-05-13 13:15:07 -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 |
|
Arthur Barrett
|
f6b554b10d
|
added initial schema migration for notes model
|
2013-05-13 12:26:33 -04:00 |
|
Vik Paruchuri
|
a5549fd7fb
|
Add in some assert statements
|
2013-05-13 12:25:23 -04:00 |
|
dcadams
|
f044bd4f02
|
Merge branch 'master' of github.com:edx/mitx into feature-dcadams-usermanagement
|
2013-05-13 09:17:14 -07:00 |
|
Will Daly
|
baa7916aa7
|
Added Jenkins script to run acceptance tests
Fixed a typo in the original jenkins/test.sh script
|
2013-05-13 12:11:14 -04:00 |
|
Arthur Barrett
|
6bb6f1c743
|
add comment to explain json dump logic
|
2013-05-13 12:05:33 -04:00 |
|
Arthur Barrett
|
e2e32e31d9
|
make user id check more idiomatic
|
2013-05-13 11:55:42 -04:00 |
|
Arthur Barrett
|
6f7f924510
|
replace bare except with except DoesNotExist
|
2013-05-13 11:51:21 -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 |
|
Chris Dodge
|
4d197e10ec
|
fix some violations. Build up karma
|
2013-05-13 11:10:11 -04:00 |
|
Steve Strassmann
|
e03585d85c
|
pylint: refactor imports
|
2013-05-13 11:07:08 -04:00 |
|
Chris Dodge
|
d32e7a5b61
|
Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting
|
2013-05-13 11:06:49 -04:00 |
|
marco
|
54a33a0a3b
|
updated pinning icons
|
2013-05-13 11:04:51 -04:00 |
|
cahrens
|
5edbf3d8f7
|
Merge branch 'master' into feature/christina/metadata-ui
|
2013-05-13 10:55:32 -04:00 |
|
Victor Shnayder
|
cb775ffa1e
|
Merge pull request #1913 from edx/vaxxxa/word_cloud
Word Cloud
|
2013-05-13 07:46:42 -07:00 |
|
Valera Rozuvan
|
c56d1b5e78
|
Checked JS files with linter, corrected a few minor issues.
|
2013-05-13 17:37:14 +03:00 |
|
Peter Baratta
|
2b9d78dfd5
|
Pep8 fixes and changes to NaN tests
|
2013-05-13 10:18:19 -04:00 |
|
Chris Dodge
|
3cf865a88f
|
added another unit test check point for export/import of classic textbooks
|
2013-05-13 10:16:18 -04:00 |
|
Steve Strassmann
|
b288a8e3bd
|
fix export from tabs.__all__
|
2013-05-13 10:03:20 -04:00 |
|
Steve Strassmann
|
979e3be174
|
fix pep8: imports and blank lines
|
2013-05-13 09:58:30 -04:00 |
|
Chris Dodge
|
d98e726a8e
|
Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting
|
2013-05-13 09:51:05 -04:00 |
|
Steve Strassmann
|
5ab6d47264
|
pull from master
|
2013-05-13 09:39:33 -04:00 |
|
marco
|
68cd922e04
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/mitx into feature/christina/metadata-ui
|
2013-05-13 09:27:18 -04:00 |
|
marco
|
97de97cc18
|
minimal mce editor style changes to borders
|
2013-05-13 09:27:13 -04:00 |
|
Brian Talbot
|
3ee0ed9e78
|
Merge pull request #2016 from edx/bug/btalbot/mktg-regbutton
edx.org - reduces padding on course listing register buttons
|
2013-05-13 06:25:47 -07:00 |
|
Calen Pennington
|
b78e044018
|
Move wordcloud template settings into metadata, and remove contents of definition (since no fields edited by studio authors have scope.settings)
|
2013-05-13 09:05:05 -04:00 |
|
Valera Rozuvan
|
1353ae3ec2
|
Added license information to d3 JS file and to the word cloud layout.
|
2013-05-13 14:44:10 +03:00 |
|
Vasyl Nakvasiuk
|
4138c47128
|
merge all word_cloud Xmodule fields to one WordCloudFields class
|
2013-05-13 14:44:10 +03:00 |
|
Vasyl Nakvasiuk
|
29e9ff2c0b
|
fix word_cloud.rst typo
|
2013-05-13 14:44:10 +03:00 |
|
Alexander Kryklia
|
331e3551ce
|
removes unnecesary images
|
2013-05-13 14:44:10 +03:00 |
|
Alexander Kryklia
|
09f6d2a651
|
updated docstrings
|
2013-05-13 14:44:10 +03:00 |
|
Vasyl Nakvasiuk
|
5e6f3601eb
|
Word Cloud: docstrings + pep8
|
2013-05-13 14:44:10 +03:00 |
|