Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 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
Christina Roberts
36b889349d Merge pull request #610 from edx/christina/popup-css 
Workaround for popup CSS path being wrong (tinymce).
 2013-08-08 07:40:16 -07:00
Miles Steele
090f8d812f add migration to remove index 2013-08-08 10:39:51 -04:00
Miles Steele
aaceb288a7 fix mysql indexing validity in migrations 2013-08-08 10:39:51 -04:00
Vik Paruchuri
17c77dd157 Merge pull request #392 from edx/fix/vik/answer-unknown 
Simplify save_grade and pass through answer_unknown
 2013-08-08 07:28:03 -07:00
David Baumgold
32f76988c6 Update docstring 2013-08-08 09:53:19 -04:00
David Baumgold
7aec95c310 Removed get_module_previews function 
According to @cpennington, no modules return anything for `get_sample_state`,
so this function is extraneous.
 2013-08-08 09:52:41 -04:00
Vik Paruchuri
4b5aba29ca Fix defaults 2013-08-08 09:52:13 -04:00
cahrens
1bb29e5414 Workaround for popup CSS path being wrong (tinymce). 
STUD-178
 2013-08-08 09:50:54 -04:00
David Baumgold
a87a1bfcda Docstrings 2013-08-08 09:46:15 -04:00
David Baumgold
baa9bd5bdc Make sure to return the content, not the fragment 2013-08-08 09:46:15 -04:00
David Baumgold
3fa990ea60 Made some tests more general, less fragile 2013-08-08 09:46:15 -04:00
David Baumgold
8a95d7e6f0 XBlock integration: replaced get_html with runtime.render() 
Currently calls the same machinery, but re-routes the logic in preparation of
deeper integration with XBlock
 2013-08-08 09:46:15 -04:00
David Baumgold
9634e222be Refactored get_module_previews function 2013-08-08 09:46:15 -04:00
David Baumgold
be103dfa0d improving code style 2013-08-08 09:46:15 -04:00
David Baumgold
4896444d10 Clean up item views, use JsonResponse class 2013-08-08 09:46:15 -04:00
chrisndodge
ece4ec3f57 Merge pull request #533 from edx/fix/cdodge/use-static-shorthand-for-asset-urls 
To increase portability of courses, have the Asset Index page display the classic /static/... URL shorthand.
 2013-08-08 06:32:35 -07:00
Vik Paruchuri
c9ddcd7868 Fix some pep8 violations 2013-08-08 08:34:40 -04:00
Vik Paruchuri
62c7255ac4 Use getlist 2013-08-08 08:34:40 -04:00
Vik Paruchuri
8b228dd64b Fix bad key naming 2013-08-08 08:34:39 -04:00
Vik Paruchuri
306649f6ad Fix test 2013-08-08 08:34:39 -04:00
Vik Paruchuri
018601777b Simplify peer grading service calibration 2013-08-08 08:34:39 -04:00
Vik Paruchuri
dadb128bf8 Simplify save_grade and pass through answer_unknown 2013-08-08 08:34:39 -04:00
Vik Paruchuri
1be6ce3ee3 Add in and route control options 2013-08-08 08:34:08 -04:00
Sef Kloninger
fcb215a6df Merge pull request #547 from edx/sef/peer-eval-xmodule-date-error-master 
fix crash in peer eval xmodule
 2013-08-07 20:51:37 -07:00
Chris Dodge
c1e037918c add docstring on StaticContent utility method 2013-08-07 21:07:51 -04:00
Chris Dodge
bffec584f7 add docstring 2013-08-07 21:01:14 -04:00
marco
3667fe8bd0 Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui 2013-08-07 16:35:32 -04:00
marco
56dee21142 partial cleanup for submitted rubric state, along with sass format cleanup for rubric.scss 2013-08-07 16:35:14 -04:00
Feanil Patel
e942e93f9d Merge branch 'release' into master 
Conflicts:
	common/lib/xmodule/xmodule/videoalpha_module.py
 2013-08-07 16:14:21 -04:00
Feanil Patel
7237f8026f Merge pull request #604 from edx/hotfix/2013-08-07 
Hotfix/2013 08 07
 2013-08-07 12:55:40 -07:00
David Baumgold
df25770fa7 Assign isExternal JS function to window object 
When JS functions are defined with names, they are local variables, and inaccessible
if defined inside a closure. Django-Pipeline concatenates all of our JS into one
big closure. This function explicitly assings the function to a property of the
`window` object, so that it is accessible to other JS functions.
 2013-08-07 15:16:58 -04:00
Peter Fogg
8ae3341667 Merge pull request #605 from edx/peter-fogg/fix-videoalpha-acceptance 
Fix VideoAlpha acceptance test.
 2013-08-07 12:07:15 -07:00
Jay Zoldak
a19c1a3c20 Make the virtualenvs on jenkins use site-packages for numpy, scipy, etc. 2013-08-07 15:03:23 -04:00
Sarina Canelake
d11d761704 Merge pull request #585 from edx/sarina/update-xblock-version 
Update XBlock version
 2013-08-07 11:45:36 -07:00
Peter Fogg
df024b0bb1 Fix VideoAlpha acceptance test. 2013-08-07 13:25:53 -04:00
Sarina Canelake
3a34529958 Need to call .save when modifying descriptor 2013-08-07 13:14:30 -04:00
Sarina Canelake
b6bab0a121 Update XBlock version 2013-08-07 13:14:30 -04:00
Jonah Stanley
ead87d1fde Merge pull request #602 from edx/jonahstanley/fix-acceptance-template 
Changed css_selector
 2013-08-07 10:12:06 -07:00
JonahStanley
ed620e635b Reset the file within the test itself 2013-08-07 13:07:38 -04:00
JonahStanley
a38f71cdbc Fixed the upload test 2013-08-07 13:06:25 -04:00
David Baumgold
e30a9a6fe3 Created a new lettuce test to catch bug, updated other lettuce tests 2013-08-07 12:57:31 -04:00
David Baumgold
ee3ce7b6c2 Don't ignore null datetimes on subsection settings 
Clicking "Sync to <course>" should send an AJAX request with the datetimes
set to null, so that the server resets them.
 2013-08-07 12:57:31 -04:00
David Baumgold
ae019ef8c9 Abstracted functionality to get datetime into separate JS function 2013-08-07 12:57:31 -04:00
David Baumgold
aab9661fe9 Scoped pad2 function to the one place that it's called 2013-08-07 12:57:31 -04:00
David Baumgold
c0bd7db293 Removed unused JS functions 2013-08-07 12:57:31 -04:00
David Baumgold
d2c4ac2597 Fixed Jasmine tests 2013-08-07 12:57:31 -04:00
David Baumgold
9c09323b0d Properly parse and save section release times 2013-08-07 12:57:31 -04:00
David Baumgold
87ce16c70e Cleanup/reformatting 2013-08-07 12:57:31 -04:00
David Baumgold
e8e09afa0a Make sure that we properly parse and save section release times 
Firefox wasn't saving section release times, due to issues with JS Date() parsing.
I've modified the code to make it more explicit around what it should do and how
it should work, which also makes it work better with both Firefox and Chrome.
 2013-08-07 12:57:31 -04:00
Christina Roberts
2191a11151 Merge pull request #598 from edx/christina/email-studio-request 
Send e-mail to STUDIO_REQUEST_EMAIL when user requests course creator privileges
 2013-08-07 09:51:14 -07:00