Arthur Barrett
|
5e39971fcc
|
merge master. resolved conflicts in component.py and course.py.
|
2013-05-14 10:54:21 -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 |
|
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 |
|
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 |
|
Arthur Barrett
|
996b3513b9
|
Merge branch 'master' into feature/abarrett/lms-notes-app
|
2013-05-13 16:27:06 -04:00 |
|
Arthur Barrett
|
bea943d537
|
merged master. resolved conflict with the cms contentstore/views.py that was refactored into separate modules.
|
2013-05-13 16:26:28 -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 |
|
Arthur Barrett
|
55942b8a0b
|
fix brokn tab test
|
2013-05-13 14:57:36 -04:00 |
|
Steve Strassmann
|
b3cc9a1174
|
pep8 cleanups
|
2013-05-13 14:55:41 -04:00 |
|
Arthur Barrett
|
8f07072d3d
|
added unit tests to add/remove course tab utility functions.
|
2013-05-13 14:44:56 -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 |
|
Arthur Barrett
|
8cddec41bf
|
updated comments about adding/removing tab types for advanced modules
|
2013-05-13 13:55:59 -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 |
|
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 |
|
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 |
|
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 |
|