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

19654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Vik Paruchuri
f17987c13a Fix flagging, select rubric labels in peer grading 2013-08-16 17:37:53 -04: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
JonahStanley
fc899ab116 Stylistic change and factored out method to common 2013-08-16 15:30:35 -04: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
Vik Paruchuri
59336ee03c Fix prompt hiding issue in peer grading 2013-08-16 15:24:38 -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
Vik Paruchuri
48b0e570bc Disable submit buttons until rubric totally filled out 2013-08-16 15:10:55 -04:00
Vik Paruchuri
8248c33138 Grab the correct location to report data for 2013-08-16 14:48:11 -04: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
Vik Paruchuri
bc8244b709 Rename reset to try again, hide and disable submit buttons 2013-08-16 14:43:37 -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