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
|
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 |
|
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 |
|
Don Mitchell
|
d3cbf212fe
|
Add doc strings and fix spaces
|
2013-08-19 16:15:15 -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 |
|
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 |
|
JonahStanley
|
ce5d9b93b1
|
Added the full range of help modal options
Fixed pylint violations
|
2013-08-19 09:56:57 -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 |
|
polesye
|
aa49ef47dd
|
Merge pull request #727 from edx/anton/video_minor_fixes
Video Player: minor fixes
|
2013-08-19 05:55:49 -07: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 |
|
chrisndodge
|
594a73d437
|
Merge pull request #722 from edx/feature/cdodge/add-a-mixed-modulestore
Feature/cdodge/add a mixed modulestore
|
2013-08-17 07:32:51 -07:00 |
|
Don Mitchell
|
998a25e7b3
|
Use a sort of name to choose if > 1 map
and some minor comment changes.
|
2013-08-16 16:07:26 -04:00 |
|
Don Mitchell
|
8f530d12c7
|
Raise ItemNotFoundError rather than return None if no map found
|
2013-08-16 16:07:26 -04:00 |
|
Don Mitchell
|
bd8a7906f5
|
Clarify doc/comments on default v explicit mappings
|
2013-08-16 16:07:26 -04:00 |
|
Don Mitchell
|
2ad515d15a
|
Move singleton accessor w/ django dependencies to same place as modulestore() singleton accessor
|
2013-08-16 16:07:26 -04:00 |
|
Don Mitchell
|
2702d8a636
|
Implement location mapper as stand-alone helper class
with own db connection.
|
2013-08-16 16:06:56 -04:00 |
|
Don Mitchell
|
47a2122a65
|
Require edx:// for urls
But don't use this parser for urls embedded in a browser url request.
|
2013-08-16 16:06:11 -04:00 |
|
Don Mitchell
|
1b63ecab48
|
Enable test via naming it correctly
|
2013-08-16 16:06:11 -04:00 |
|
Don Mitchell
|
37602edfec
|
Translate locations <-> locators
unit tests and fixes they implied
|
2013-08-16 16:06:11 -04:00 |
|
Don Mitchell
|
3ee6b3c095
|
pep8 violation fix (shadowed identifier)
|
2013-08-16 16:04:58 -04:00 |
|
Don Mitchell
|
1abae6f093
|
Location to Locator mapping utilities
partial impl
|
2013-08-16 16:04:58 -04:00 |
|
Don Mitchell
|
0833f87fef
|
Remove 'edu' from examples
per our agreement not to use the domain
|
2013-08-16 16:03:34 -04:00 |
|