Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,853 Commits 1 Branch 0 Tags
1cb52df16b4ea05828128fe9fdbef4caf792d454
Commit Graph

16853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Daly
1cb52df16b Removed unnecessary TestCase 2013-08-22 16:10:24 -04:00
Will Daly
736b3e0ecd Common djangoapps no longer access courseware; other cleanup 2013-08-22 14:08:35 -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
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
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
jkarni
e79f8c437a Merge pull request #665 from edx/feature/msteele/remove-log_event 
Remove js log_event (keep compatibility)
 2013-08-20 14:09:59 -07:00
Miles Steele
cb7a3ad8eb switch from log_event to Logger.log 
keep log_event for compatibility
 2013-08-20 16:52:18 -04:00
Peter Baratta
5692867b14 Merge pull request #750 from edx/peterb/numerical/add-docs 
Add docs for changes in #726
 2013-08-20 13:22:43 -07:00
Peter Fogg
9065023132 Merge pull request #749 from edx/peter-fogg/fix-rename-fail-grade 
Fix failing grade label being editable but not saved.
 2013-08-20 12:53:27 -07:00
Carlos Andrés Rocha
a35a2fd389 Merge branch 'release' 2013-08-20 14:55:20 -04:00
Peter Baratta
ab2570a7bd Add docs for changes in #726 2013-08-20 14:04:38 -04:00
Peter Fogg
533e0da101 Add acceptance test for noneditable failing grade range. 2013-08-20 13:34:41 -04:00
Peter Fogg
38165efd18 Fix failing grade label being editable but not saved. 2013-08-20 12:42:36 -04:00
jkarni
6c5d3e66c9 Merge pull request #731 from edx/jkarni/feature/docchanges 
Incorporate Anant's suggestions
 2013-08-20 07:00:05 -07: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
chrisndodge
4129c1cffd Merge pull request #636 from edx/fix/cdodge/dont-process-osx-hidden-files-on-imports 
on import, when enumerating through the 'draft content', OSX environment...
 2013-08-19 21:42:19 -07:00
Chris Dodge
e576c7be15 pylint error fix 2013-08-20 00:40:20 -04:00
chrisndodge
c33571ff98 Merge pull request #732 from edx/fix/cdodge/get_items_needs_courseid 
Fix/cdodge/get items needs courseid
 2013-08-19 21:26:12 -07:00
chrisndodge
63c65484d1 Merge pull request #729 from edx/fix/cdodge/I18N-dashboard-error 
don't put the substitutions in quotes
 2013-08-19 21:11:43 -07: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
6a3dafeed6 update hint manager to pass in a course_id when dereferencing a module 2013-08-19 23:42:27 -04:00
Chris Dodge
bc5e27fe17 update some more call sites in LMS to always pass in a course_id 2013-08-19 23:42:26 -04:00
Chris Dodge
a16aee340a get_items should take a course_id 2013-08-19 23:42:26 -04:00
Chris Dodge
2e1eb1dce5 add escaping 2013-08-19 23:41:49 -04:00
Chris Dodge
f599d4b508 don't put the substitutions in quotes 2013-08-19 23:41:49 -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
Jonah Stanley
73ad057eff Merge pull request #710 from edx/jonahstanley/help-acceptance-test 
Jonahstanley/help acceptance test
 2013-08-19 14:02:29 -07:00
Don Mitchell
20641bab61 indent even more 2013-08-19 16:57:59 -04:00
Adam
2a24d6497a Merge pull request #742 from edx/fix/adam/help-modal-FAQ 
set first FAQ link to mktg webiste too
 2013-08-19 13:44:35 -07:00
Adam Palay
cb3429570c set first FAQ link to mktg webiste too 2013-08-19 16:34:17 -04:00
Carlos Andrés Rocha
aa146702c1 Merge pull request #741 from edx/chirstina/static-tab-rc 
Persist static_tab name.
 2013-08-19 13:18:56 -07:00
Don Mitchell
d3cbf212fe Add doc strings and fix spaces 2013-08-19 16:15:15 -04:00
cahrens
478f3cc8aa Persist static_tab name. 
STUD-663.
 2013-08-19 15:38:27 -04:00
Jay Zoldak
6ff293fbab Merge pull request #734 from edx/zoldak/pylint-nose-import-not-an-error 
Change pylint settings to not report in importing assert_* from nose.tools
 2013-08-19 12:36:48 -07:00
Christina Roberts
d6c9affbf9 Merge pull request #733 from edx/christina/static-tab 
Make sure to persist static tab name assignment.
 2013-08-19 12:35:03 -07:00
cahrens
a4448ea50e Make sure to persist static tab name assignment. 
STUD-663

Pylint updates.
 2013-08-19 15:05:56 -04:00
Jay Zoldak
36a68a18f2 Change pylint settings to not report in importing assert_* from nose.tools 2013-08-19 14:26:34 -04:00
Julian Arni
72421a11cf Incorporate Anant's suggestions 2013-08-19 14:03:13 -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
jkarni
424570c6d5 Merge pull request #568 from edx/jkarni/fix/quietdocs 
Jkarni/fix/quietdocs
 2013-08-19 07:48:34 -07:00
Adam
bd45103fe9 Merge pull request #728 from edx/fix/adam/dash-delete 
fixes delete state on dashboard
 2013-08-19 07:45:59 -07:00