Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,112 Commits 1 Branch 0 Tags
87500a47fb3d6464b8383ff54b6ffa52edc9c4bd
Commit Graph

4581 Commits

Author SHA1 Message Date
Giulio Gratta
4e77098859 added course level feature flag for forum alpha sorting as well as tests 2013-08-23 12:59:13 -07:00
Peter Fogg
07d9106c09 Merge pull request #769 from edx/peter-fogg/studio-error-descriptor 
Allow Studio to display error modules.
 2013-08-23 11:51:57 -07:00
Will Daly
c680dfdd40 Merge pull request #768 from edx/will/use-mixed-modulestore-in-tests 
Will/use mixed modulestore in tests
 2013-08-23 08:38:09 -07:00
Diana Huang
569727e608 Pep8 fixes 2013-08-22 15:58:07 -04:00
Peter Fogg
2466a5f557 Allow Studio to display error modules. 2013-08-22 15:48:49 -04:00
Vik Paruchuri
26a301f42e Merge pull request #504 from edx/feature/vik/oe-ui 
Feature/vik/oe ui
 2013-08-22 12:23:29 -07:00
Chris Dodge
46ce931d51 ErrorDescriptors do not have xml_attributes field 2013-08-22 14:50:45 -04:00
Vik Paruchuri
21e13e44af Pep8 and pylint fixes 2013-08-22 14:29:39 -04:00
chrisndodge
0191ae9417 Merge pull request #652 from edx/feature/ichuang/import-with-no-static 
Enable mongodb to be used as back-end for git-based authoring workflow
 2013-08-22 11:05:02 -07:00
chrisndodge
1e9621cf4f Merge pull request #763 from edx/fix/cdodge/strip-transient-draft-serialization-attributes 
fix some gaps which would allow the temporary xml attributes 'parent_seq...
 2013-08-22 11:00:55 -07:00
Vik Paruchuri
a6cc30d1fe Fix tests, address review feedback 2013-08-22 13:51:27 -04:00
Chris Dodge
7138aed2a9 add xlint tests in test_mongo.py 2013-08-22 13:30:52 -04:00
chrisndodge
2699ba65ba Merge pull request #756 from edx/fix/cdodge/incorrect-html-serialization 
Fix/cdodge/incorrect html serialization
 2013-08-22 08:58:56 -07:00
Chris Dodge
079470d439 add some more tests in common to increase coverage 2013-08-22 11:48:37 -04:00
Anton Stupak
03111cb98e Remove onTouchBasedDevice function. 2013-08-22 08:45:44 +03:00
Anton Stupak
22b5decc95 Small fixes. 2013-08-22 08:45:43 +03:00
Anton Stupak
63c5ec5277 Add supporting failover from Youtube. 2013-08-22 08:45:43 +03:00
Chris Dodge
77a38afaeb add some draft courseware importing paths in common/* tests 2013-08-21 22:00:33 -04:00
Chris Dodge
0c1c3f11af loop in static import testing into common/* tests 2013-08-21 20:48:56 -04:00
Will Daly
078ad4b25e Added comment justifying ModuleStoreTestCase design. 2013-08-21 20:31:23 -04:00
Will Daly
8165a033b1 Pep8/pylint fixes 
Fixed test_masquerade failure due to not clearing the modulestore
between tests.
 2013-08-21 19:42:59 -04:00
Will Daly
109d3c3d10 Refactored to remove test#XXX methods from ModuleStoreTestCase 2013-08-21 19:00:32 -04:00
Will Daly
151782acf0 LMS acceptance tests use mixed modulestore 2013-08-21 16:23:48 -04:00
Chris Dodge
21f4b05813 fix some gaps which would allow the temporary xml attributes 'parent_sequential_url' and 'index_in_children_list' to get persisted in the database, whereas they are meant to be only scoped during export/import 2013-08-21 14:46:38 -04:00
Peter Fogg
e177270d0d Merge pull request #700 from edx/peter-fogg/course-image-upload 
WIP: Peter fogg/course image upload
 2013-08-21 11:17:12 -07:00
ichuang
42af561a17 pep8 and pylint for tests of nostatic import 2013-08-21 11:23:00 -04:00
Chris Dodge
938b094679 disable the 'dont verify HTML modules' in test_export.py. This better traps the bug whereby XML-parseable HTML content was being dropped on export serialization 2013-08-21 10:32:54 -04:00
Will Daly
96c2a50370 Merge branch 'master' into will/use-mixed-modulestore-in-tests 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/django.py
	lms/djangoapps/courseware/tests/test_views.py
	lms/djangoapps/courseware/tests/tests.py
 2013-08-21 10:12:24 -04:00
Peter Fogg
e4302e62d2 Allow course image uploads in the settings page. 
Authors can upload an image (or choose an existing one) from the
settings page, using the in-context uploader from PDF
textbooks. Includes tests for backwards compatibility with XML courses
-- they used a magic filename (images/course_image.jpg) which is
mapped to a location in the Mongo contentstore.

Still needs some UX work, though the backend plumbing is there.
 2013-08-21 09:42:00 -04:00
Will Daly
48c6daacb8 Removed unnecessary settings wrangling from ModuleStoreTestCase. 
Modified navigation tests to use MixedModulestore
Updated factories to find editable modulestore

Updated test_submitting_problems

Updated test_tabs.py

Updated test_view_authentication

Updated test_views

Updated courseware/tests/tests.py

Updated test_masquerade

Updated test_module_render

Pylint fixes

Updated video and word cloud tests

Updated course wiki tests

Updated license and open_ended tests.
One open_ended test still failing due to Mako initialization issues

Updated staticbook

Updated django_comment_client tests

Updated instructor tests

Updated instructor task tests

Updated external_auth tests

Updated course_groups
 2013-08-21 09:36:45 -04:00
ichuang
0d938d3940 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static 
Conflicts:
	lms/djangoapps/courseware/tests/test_module_render.py
 2013-08-20 23:40:09 -04:00
Chris Dodge
b8a8b202a4 update comments and some code violation drive by fixes 2013-08-20 22:53:03 -04:00
Chris Dodge
596fed78f1 add docstrings 2013-08-20 22:45:37 -04:00
Chris Dodge
5a7bcd7bb3 always serialize out HTML content to a separate .html file 2013-08-20 22:43:53 -04:00
Chris Dodge
5989bf6bdc update the PDF textbook url paths as well as update wiki_slug when importing 2013-08-20 21:50:28 -04:00
Peter Baratta
8211600bde Merge pull request #726 from edx/peterb/numerical/evaluate-staff 
Use calc's evaluator for staff answers in `Numercial` type
 2013-08-20 06:53:27 -07:00
Brian Talbot
f14e93029e Merge pull request #748 from edx/talbs/lms-fix-resetbutton 
Sync up Reset Action Button Styling for Capa xmodules
 2013-08-20 06:43:40 -07:00
Brian Talbot
fb7fe13061 adds in the .reset type of action to the x module capa styling 2013-08-20 09:21:04 -04:00
Christina Roberts
1a8b2fa0eb Merge pull request #735 from edx/fix/cdodge/pylint-violations 
address some pylint violations in the mixedmodulestore build report
 2013-08-20 05:42:55 -07:00
Christina Roberts
05712da6e9 Merge pull request #744 from edx/dhm/pep_pylint_cleanups 
Add doc strings and fix spaces
 2013-08-20 05:28:21 -07:00
marco
d782278d5c minor cleanup of pull request comments within scss files, along with removal of some whitespace in text fixture file for rubrics 2013-08-20 01:33:06 -04:00
Chris Dodge
e576c7be15 pylint error fix 2013-08-20 00:40:20 -04:00
Chris Dodge
6a423af7ad PR feedback 2013-08-19 23:53:53 -04:00
Chris Dodge
0ed0653956 on import, when enumerating through the 'draft content', OSX environments will have hidden binary encoded quarantine files. We don't want to try to process these as they will throw an exception when trying to be parsed. It's harmless - the import goes on fine - but it's a lot of clutter in the output logs. 2013-08-19 23:52:28 -04:00
Chris Dodge
352e56eb4e address some pylint violations in the mixedmodulestore build report 2013-08-19 23:40:46 -04:00
Jason Bau
606e8b1d97 Merge pull request #697 from edx/fix/jbau/openendmodule-round-score-up 
small change in aggregating peer eval grades (rounds up)
 2013-08-19 15:43:03 -07:00
Don Mitchell
20641bab61 indent even more 2013-08-19 16:57:59 -04:00
Don Mitchell
d3cbf212fe Add doc strings and fix spaces 2013-08-19 16:15:15 -04:00
cahrens
a4448ea50e Make sure to persist static tab name assignment. 
STUD-663

Pylint updates.
 2013-08-19 15:05:56 -04:00
Peter Baratta
e0f0ab090d Use calc's evaluator for staff answers in Numercial type 
Rather than just calling `complex(...)` on the staff answers, also call
`calc.evaluator`. This way, simple things like `1/3` can be entered, as well
as more complicated explicit equations (e.g. `sqrt((12^2 + 26^2)/2)` etc, etc)

Simplify and update the tests to work with this.
 2013-08-19 13:40:32 -04:00