Commit Graph

15422 Commits

Author SHA1 Message Date
David Ormsbee
7993d5c1fc Merge pull request #348 from edx/bugfix/ichuang/idasbhoard-track-json
tracking in idashboard should only log json-serializable objects
2013-07-10 10:17:30 -07:00
Adam
2af1132894 Merge pull request #350 from edx/fix/adam/less-noise
move setting changes in tests to override_settings
2013-07-10 09:48:55 -07:00
dcadams
a5f8607c7e Merge pull request #357 from edx/bugfix/dcadams/enroll_emails
Fix course url link in enrollment emails.
2013-07-10 09:47:53 -07:00
Ned Batchelder
3bd590c1f6 Merge pull request #363 from edx/ned/fix-noisy-docs
Ned/fix noisy docs
2013-07-10 09:20:43 -07:00
Ned Batchelder
8997ed0322 Suggestions from James: mitx is old-school, as is autogeneration. 2013-07-10 12:19:53 -04:00
Ned Batchelder
55d4d98031 static_template_view.models is gone, remove it from docs. 2013-07-10 11:39:54 -04:00
Ned Batchelder
7f193bcaad We don't need to run sphinx on our tests. 2013-07-10 11:39:22 -04:00
jkarni
d0e5786250 Update CHANGELOG.rst 2013-07-10 11:38:18 -04:00
Ned Batchelder
a3d496a882 Set sys.path properly for docs to build.
We used to do it this way, I'm not sure why it was changed.
Our settings files add directories to the path, so we need to
do it here so that names will be importable.
2013-07-10 11:38:00 -04:00
ihoover
bec731207a Merge pull request #362 from edx/ihoover/login_enrollment_refactor
refactor login and enrollment test cases to use the mongo modulestore
2013-07-10 08:06:32 -07:00
ihoover
5a03d93000 refactor login and enrollment test cases to use the mongo modulestore
added namee to authors file
2013-07-10 10:34:14 -04:00
Adam Palay
d056c8a8f2 replace test setting changes with test-specific mock.patch.dicts 2013-07-10 10:18:58 -04:00
Adam
3b662ee063 Merge pull request #358 from edx/fix/adam/file-upload
fix to problems with uploading files
2013-07-10 07:07:28 -07:00
Calen Pennington
dcaed88cb2 Merge pull request #313 from edx/cale/use-super-for-calling-parent-__init__-methods
Use super for calling parent __init__ methods
2013-07-10 06:17:41 -07:00
David Baumgold
3b1182b462 Merge pull request #332 from edx/db/rake-pylint
Refactor rake tasks for pylint/pep8
2013-07-10 06:12:16 -07:00
David Baumgold
2eb89d0501 Merge pull request #221 from edx/pdf-textbooks
PDF textbooks in Studio
2013-07-10 06:11:55 -07:00
James Tauber
bd37230f08 Merge pull request #360 from edx/jtauber/license-change
clarify LICENSE
2013-07-09 23:19:24 -07:00
David Baumgold
7bf2b1e316 Re-add pylint task dependencies 2013-07-09 21:47:07 -04:00
Brian Talbot
cef33bf285 Studio: updates shame file with related future maintenance work 2013-07-09 19:16:44 -04:00
Frances Botsford
6814163a45 cleanup and tweaks from feeback to PDF Textbooks FED and Sass 2013-07-09 19:16:44 -04:00
Brian Talbot
b9e7e992b5 Studio: revises subtitle of Textbooks view to be consistent with others 2013-07-09 19:16:44 -04:00
David Baumgold
17bef565f1 Added another test 2013-07-09 19:16:44 -04:00
David Baumgold
4155f9fe8c Removed unused user_author_string function 2013-07-09 19:16:44 -04:00
David Baumgold
359cbbb4d9 Fixing up ui_helpers based on feedback from Christina 2013-07-09 19:16:44 -04:00
David Baumgold
437e658f98 pylint fixes 2013-07-09 19:16:44 -04:00
David Baumgold
1a0d6d21bb Forgot to call show() on saving notification 2013-07-09 19:16:43 -04:00
David Baumgold
dd39ebec03 If success_condition fails, raise an exception 2013-07-09 19:16:43 -04:00
David Baumgold
8d809dbad6 Remove commented-out code 2013-07-09 19:16:43 -04:00
David Baumgold
32a902ca57 Remove create_json_response in favor of JsonResponse class 2013-07-09 19:16:43 -04:00
David Baumgold
628dff5398 pylint fixing 2013-07-09 19:16:43 -04:00
David Baumgold
c68895ca5d world.css_click no longer returns a boolean 2013-07-09 19:16:43 -04:00
David Baumgold
cfa094e424 Validation tests for Backbone models 2013-07-09 19:16:43 -04:00
David Baumgold
eba5928009 Added a comment 2013-07-09 19:16:43 -04:00
David Baumgold
fe8587566f All textbook chapters must have name and asset_path
Previously, for a textbook with only one chapter, we allowed that chapter to
not have a title -- under the assumption that it would be shown as a monolithic
textbook, instead of a chaptered textbook. However, the UI doesn't support that
idea, the code was getting a bit messy, and there was no real benefit to the idea
of not having to specify a chapter title. This commit removes that special case,
and ensures that all textbook chapters must have a name and an asset path.
2013-07-09 19:16:43 -04:00
David Baumgold
f9a10855d9 Add notes about JS validation functions returning non-i18n error messages 2013-07-09 19:16:42 -04:00
David Baumgold
44185c3afa Updated CHANGELOG 2013-07-09 19:16:42 -04:00
David Baumgold
fa62f48e57 Fix Jasmine test failures 2013-07-09 19:16:11 -04:00
David Baumgold
e7088d50fd Display error message when trying to upload a non-PDF file as a PDF textbook 2013-07-09 19:16:11 -04:00
David Baumgold
7506562f50 Another lettuce test, and fixes to make it work 2013-07-09 19:16:11 -04:00
David Baumgold
ca2339f15e Remove unneeded arguments
They are the defaults now
2013-07-09 19:16:10 -04:00
David Baumgold
ee61b15345 Added a few more tests, to increase diff coverage 2013-07-09 19:16:10 -04:00
David Baumgold
c5c1fd08ae i18n 2013-07-09 19:16:10 -04:00
David Baumgold
84bbd84a54 Ease Christina's pain
But only slightly. Sorry Christina.
2013-07-09 19:16:10 -04:00
David Baumgold
e1ed5c3d2d docstrings 2013-07-09 19:16:10 -04:00
David Baumgold
b97f5585b9 Re-added a missing import 2013-07-09 19:16:10 -04:00
David Baumgold
0b8aec718f Add another pdf textbook test 2013-07-09 19:16:10 -04:00
David Baumgold
bacb904ce3 Skip failing unit test 2013-07-09 19:16:10 -04:00
David Baumgold
a90590a442 Remove unused imports/constants 2013-07-09 19:16:10 -04:00
Frances Botsford
b41d23747a PDF Textbooks: implemented "View Live" link 2013-07-09 19:16:09 -04:00
David Baumgold
2a92a14054 Wrote simple lettuce tests for pdf textbooks 2013-07-09 19:16:09 -04:00