Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
13,094 Commits 1 Branch 0 Tags
026773b5087aaff30fbe2ec3b6980d753f564aa8
Commit Graph

13094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arthur Barrett
026773b508 fix pep8 warnings and add empty message to notes tab 2013-05-13 16:54:32 -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
jarv
4774a1e92b Merge pull request #2004 from edx/jarv/repo-rename 
repo rename to edx-platform
 2013-05-13 12:18:16 -07: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
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
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
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
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