Your Name
|
b317d45ffb
|
add missing imports
|
2013-08-21 09:49:09 -04:00 |
|
Kevin Chugh
|
08aafc58ea
|
refactor to add access control to already_existing access control routines in access.py
|
2013-08-20 19:43:46 -04:00 |
|
Kevin Chugh
|
a2bbb65dcf
|
refactor to add access control to already_existing access control routines in access.py
|
2013-08-20 19:42:03 -04: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 |
|
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 |
|
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 |
|
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 |
|
chrisndodge
|
8ba3214cd4
|
Merge pull request #496 from edx/feature/cdodge/add-a-mixed-modulestore
Add a 'MixedModuleStore' which aggregates between XML and Mongo Modulestores
|
2013-08-16 13:02:31 -07:00 |
|
Diana Huang
|
af76997ccd
|
Add in a uniqueness constraint on mode, course, and currency.
|
2013-08-16 15:26:57 -04:00 |
|
Chris Dodge
|
bd71a2ceb3
|
add unit test for video_caption asset path
|
2013-08-16 15:24:43 -04:00 |
|
Chris Dodge
|
1128f369f7
|
add changelog entry
|
2013-08-16 15:24:20 -04:00 |
|
Don Mitchell
|
7f126f13e9
|
Merge pull request #624 from edx/dhm/flatten_kvs
xblock fields persist w/o breaking by scope
|
2013-08-16 12:18:02 -07:00 |
|
Jay Zoldak
|
5b1b73cb85
|
Merge pull request #702 from edx/peter-fogg/fix-captions-sync
Correctly seek in captions with non-1.0 speeds.
|
2013-08-16 11:45:54 -07:00 |
|
Valera Rozuvan
|
a5a6d2d54a
|
Added test for Flash video player.
Fix for video and captions sync. Test for this fix.
|
2013-08-16 14:45:10 -04:00 |
|
James Tauber
|
6bc8d3273d
|
Merge pull request #716 from edx/jtauber/fix-encoding
fixed encoding declaration
|
2013-08-16 11:38:54 -07:00 |
|
Carlos Andrés Rocha
|
4e0f3d0791
|
Merge pull request #706 from rocha/enable-django-nose-for-all
Enable the django_nose app by default
|
2013-08-16 11:29:43 -07:00 |
|
Jay Zoldak
|
e91205aff3
|
Merge branch 'release'
Conflicts:
common/lib/xmodule/xmodule/video_module.py
|
2013-08-16 14:25:03 -04:00 |
|
Jay Zoldak
|
9c67e56d00
|
Merge pull request #714 from edx/zoldak/hotfix-2013-08-16
Zoldak/hotfix 2013 08 16
|
2013-08-16 11:15:34 -07:00 |
|
Don Mitchell
|
4c28684014
|
pass xblock fields as top-level keywords on factories
|
2013-08-16 14:01:16 -04:00 |
|
James Tauber
|
b985722255
|
fixed encoding
xgettext seems to only like `utf-8` not `utf8` so string extraction
was failing without this
|
2013-08-16 13:52:07 -04:00 |
|