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

18333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Ormsbee
013009ea24 Let staff have access to a forum even if they're not enrolled in the course. 2013-08-19 17:27:23 -04:00
David Ormsbee
c2d1791de4 Make it so that students who are not enrolled cannot see the forum 2013-08-19 17:09:47 -04: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
Frances Botsford
94c442c9cc initial rough skeleton for verification flow 2013-08-19 16:48:36 -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
Miles Steele
84322694cd add jasmine test for scroll to top 2013-08-19 13:37:41 -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
Don Mitchell
33737d3142 Merge pull request #661 from edx/dhm/location_mapper 
Location to/from locator mapping facilities
 2013-08-19 07:39:15 -07:00
Diana Huang
9469991f52 Merge pull request #713 from edx/diana/button-updates 
Drupal side Register button updates
 2013-08-19 07:28:45 -07:00
Brian Talbot
fc4eb3786a mktg - revised sass/css for iframed button to match styles/consistency 2013-08-19 10:25:29 -04:00
Julian Arni
852977c2d2 Mock only if on RTD. 
And some code cleanup.
 2013-08-19 10:24:52 -04:00
Adam Palay
2e47d61cef fixes delete state on dashboard 2013-08-19 10:22:42 -04:00
ichuang
e9ef45076d pylint 2013-08-19 10:21:10 -04:00
ichuang
2249692f9a pylint 2013-08-19 10:19:14 -04:00
ichuang
13bb3bf0a9 pylint 2013-08-19 10:18:04 -04:00
ichuang
39b646558a pep8 in inheritance.py 2013-08-19 10:15:26 -04:00
JonahStanley
ce5d9b93b1 Added the full range of help modal options 
Fixed pylint violations
 2013-08-19 09:56:57 -04:00
Will Daly
bd65cfa813 Removed outdated template logic in ModuleStoreTestCase 2013-08-19 09:39:30 -04:00
chrisndodge
7aa4418934 Merge pull request #723 from edx/fix/cdodge/bad-links-can-cause-exception-on-rewrite 
Fix/cdodge/bad links can cause exception on rewrite
 2013-08-19 06:33:55 -07:00
Will Daly
05b34098ab Refactored ModuleStoreTestCase to use modulestore interface 
for clearing _MODULESTORES
 2013-08-19 09:27:36 -04:00
polesye
aa49ef47dd Merge pull request #727 from edx/anton/video_minor_fixes 
Video Player: minor fixes
 2013-08-19 05:55:49 -07:00
Will Daly
06977c198e Created new test configuration for MixedModuleStore 2013-08-19 08:47:53 -04:00
ichuang
220ec522a1 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static 
Conflicts:
	common/djangoapps/static_replace/__init__.py
	common/djangoapps/xmodule_modifiers.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/module_render.py
 2013-08-19 08:24:35 -04:00
Anton Stupak
7a68516d12 Fix formatting. 2013-08-19 10:39:52 +03:00
Anton Stupak
a921e44aa3 Fix steps. 2013-08-19 10:39:52 +03:00
Anton Stupak
d848477596 Remove unecessary assert. 2013-08-19 09:10:50 +03:00
Chris Dodge
033f922ec0 add a try catch around the staticstorage lookup, which can throw an exception 2013-08-17 10:33:59 -04:00
Chris Dodge
4f0dfb97cd Merge branch 'master' of github.com:edx/edx-platform 2013-08-17 10:33:18 -04:00