5df23d15f2
Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master
Chris Dodge
2013-05-14 10:57:11 -04:00
5e39971fcc
merge master. resolved conflicts in component.py and course.py.
Arthur Barrett
2013-05-14 10:54:21 -04:00
ef78c99f70
pep8/pylint violations fixes
Chris Dodge
2013-05-14 10:53:10 -04:00
e2d7f6a027
Changed module store directory root to test_root/data
Will Daly
2013-05-14 10:45:27 -04:00
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.
Will Daly
2013-05-14 10:33:25 -04:00
3657fbe33b
Merge pull request #2035 from edx/fix/zoldak/phantom-jasmine-version
Jay Zoldak
2013-05-14 07:32:14 -07:00
b590d344f5
Specify version of phantom jasmine to use.
Jay Zoldak
2013-05-14 10:30:50 -04:00
c69c69d27b
Merge pull request #2033 from edx/fix-phantom-jasmine-lms
Jay Zoldak
2013-05-14 06:13:13 -07:00
0aaaf84f62
added number metadata template, cleaned up editor theme ui bordering and settings styles
marco
2013-05-14 08:22:36 -04:00
d376cb52ca
Forgot to update phantom-jasmine location for LMS
David Baumgold
2013-05-13 17:30:26 -04:00
f42850c8a4
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
cahrens
2013-05-13 17:28:17 -04:00
aaffee5081
Initial cleanup of open_ended_module and peer_grading_module.
cahrens
2013-05-13 17:27:59 -04:00
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.
Ned Batchelder
2013-05-13 17:27:21 -04:00
b682e1c0d3
Put a feature flag around the staff-only debugging page.
Ned Batchelder
2013-05-13 17:07:13 -04:00
026773b508
fix pep8 warnings and add empty message to notes tab
Arthur Barrett
2013-05-13 16:54:32 -04:00
38ee7bea5a
Merge pull request #2031 from edx/fix/zoldak/repo-name
Jay Zoldak
2013-05-13 13:52:04 -07:00
a5bb31792b
Add a prefix string to Zendesk errors to be more searchable in Splunk
Greg Price
2013-05-13 16:38:52 -04:00
b412dd57b6
Merge pull request #2026 from edx/bug/straz/pep8
Steve Strassmann
2013-05-13 13:37:57 -07:00
30e8e2e2ae
Update repo name in jenkins test shell script.
Jay Zoldak
2013-05-13 16:30:01 -04:00
4f2c3b78da
fix order of operations to make things rotate correctly
Victor Shnayder
2013-05-13 16:27:27 -04:00
996b3513b9
Merge branch 'master' into feature/abarrett/lms-notes-app
Arthur Barrett
2013-05-13 16:27:06 -04:00
bea943d537
merged master. resolved conflict with the cms contentstore/views.py that was refactored into separate modules.
Arthur Barrett
2013-05-13 16:26:28 -04:00
cb4019304a
cleaned up references to proper elements in settings header mode buttons
marco
2013-05-13 16:22:14 -04:00
17bd4d0236
Changed permissions on test_acceptance.sh to make it executable
Will Daly
2013-05-13 16:21:43 -04:00
9cc07d2345
removed duplicates
James Tauber
2013-05-13 16:20:37 -04:00
5e75e91322
Takes care of Victor's comments on the PR.
dcadams
2013-05-13 13:20:37 -07:00
7271440828
added initial AUTHORS file
James Tauber
2013-05-09 16:09:21 -04:00
3890701cbb
Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement
dcadams
2013-05-13 13:10:16 -07:00
8795fad917
Merge pull request #1938 from edx/feature/straz/transifex
Steve Strassmann
2013-05-13 10:40:20 -07:00
66d3ccff17
sanitize note text and other input in the model as well as escape template output to close potential security hole
Arthur Barrett
2013-05-13 13:40:19 -04:00
be98b5fa3e
merged master. resolved conflict in cms/djangoapps/contentstore/views.py (added word_cloud to advanced_modules list)
Arthur Barrett
2013-05-13 13:26:55 -04:00
d80024472c
Pylint fixes
Peter Baratta
2013-05-13 12:40:32 -04:00
f6b554b10d
added initial schema migration for notes model
Arthur Barrett
2013-05-13 12:26:33 -04:00
a5549fd7fb
Add in some assert statements
Vik Paruchuri
2013-05-13 12:25:23 -04:00
f044bd4f02
Merge branch 'master' of github.com:edx/mitx into feature-dcadams-usermanagement
dcadams
2013-05-13 09:17:14 -07:00
baa7916aa7
Added Jenkins script to run acceptance tests Fixed a typo in the original jenkins/test.sh script
Will Daly
2013-05-13 12:11:14 -04:00
6bb6f1c743
add comment to explain json dump logic
Arthur Barrett
2013-05-13 12:05:33 -04:00
e2e32e31d9
make user id check more idiomatic
Arthur Barrett
2013-05-13 11:55:42 -04:00
6f7f924510
replace bare except with except DoesNotExist
Arthur Barrett
2013-05-13 11:51:21 -04:00
b0cc989b1e
pull from master
Steve Strassmann
2013-05-13 11:45:23 -04:00
7c98981498
Install phantom-jasmine via npm, rather than git submodules
David Baumgold
2013-05-13 11:33:07 -04:00
8bb6ad3689
relative imports
Steve Strassmann
2013-05-13 11:31:56 -04:00
06efd40ba9
Comment capitalization
Peter Baratta
2013-05-13 11:29:46 -04:00
0ef2944d43
Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting
Chris Dodge
2013-05-13 11:13:43 -04:00
85ae7b9744
Merge pull request #2012 from edx/feature/markchang/500-copy-change
Mark L. Chang
2013-05-13 08:12:02 -07:00
4d197e10ec
fix some violations. Build up karma
Chris Dodge
2013-05-13 11:10:11 -04:00
e03585d85c
pylint: refactor imports
Steve Strassmann
2013-05-13 11:07:08 -04:00
d32e7a5b61
Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting
Chris Dodge
2013-05-13 11:06:49 -04:00
54a33a0a3b
updated pinning icons
marco
2013-05-13 11:04:51 -04:00
5edbf3d8f7
Merge branch 'master' into feature/christina/metadata-ui
cahrens
2013-05-13 10:55:32 -04:00
cb775ffa1e
Merge pull request #1913 from edx/vaxxxa/word_cloud
Victor Shnayder
2013-05-13 07:46:42 -07:00
c56d1b5e78
Checked JS files with linter, corrected a few minor issues.
Valera Rozuvan
2013-05-13 17:37:14 +03:00
2b9d78dfd5
Pep8 fixes and changes to NaN tests
Peter Baratta
2013-05-13 10:18:19 -04:00
3cf865a88f
added another unit test check point for export/import of classic textbooks
Chris Dodge
2013-05-13 10:16:18 -04:00
b288a8e3bd
fix export from tabs.__all__
Steve Strassmann
2013-05-13 10:03:20 -04:00
979e3be174
fix pep8: imports and blank lines
Steve Strassmann
2013-05-13 09:58:30 -04:00
d98e726a8e
Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting
Chris Dodge
2013-05-13 09:51:05 -04:00
5ab6d47264
pull from master
Steve Strassmann
2013-05-13 09:39:33 -04:00
68cd922e04
Merge branch 'feature/christina/metadata-ui' of github.com:edx/mitx into feature/christina/metadata-ui
marco
2013-05-13 09:27:18 -04:00
97de97cc18
minimal mce editor style changes to borders
marco
2013-05-13 09:27:13 -04:00
3ee0ed9e78
Merge pull request #2016 from edx/bug/btalbot/mktg-regbutton
Brian Talbot
2013-05-13 06:25:47 -07:00
b78e044018
Move wordcloud template settings into metadata, and remove contents of definition (since no fields edited by studio authors have scope.settings)
Calen Pennington
2013-05-13 09:05:05 -04:00
1353ae3ec2
Added license information to d3 JS file and to the word cloud layout.
Valera Rozuvan
2013-05-13 13:54:58 +03:00
Chris Dodge