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

16373 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
David Baumgold
6e784d606f Merge pull request #596 from edx/db/ff-subsection-datetime-bug 
Fix Firefox subsection datetime bug
 2013-08-07 09:25:17 -07:00
JonahStanley
5919456f24 Fixed some course-team bugs and other css stuff 2013-08-07 12:03:25 -04:00
Alexander Kryklia
2c78f0623c Merge pull request #603 from edx/alex/fix-videoalpha-importing-from-xml 
Fix videoalpha import from xml
 2013-08-07 08:47:42 -07:00
cahrens
bbd8d84a28 Include the URL to the course creator admin table. 2013-08-07 11:34:51 -04:00
JonahStanley
5941f5b795 Fixed the other places that the css occurs 2013-08-07 11:30:50 -04:00
Vasyl Nakvasiuk
56244783fd Merge pull request #591 from edx/vaxxxa/word_cloud_acceptance_tests 
Add "Word Cloud" acceptance tests
 2013-08-07 08:08:12 -07:00
David Baumgold
97aaab9cc6 Created a new lettuce test to catch bug, updated other lettuce tests 2013-08-07 11:03:19 -04:00
Alexander Kryklia
495b5a366f Fix videoalpha import from xml 
VideoAlphaDescriptor inherits from EmptyDataRawDescriptor.
EmptyDataRawDescriptor is used for modules which might not have any
XML data, but require XmlDescriptor's functionality for
export/import. Without it, VideoAlphaModule would cause a crash on
export if any modules had an empty `self.data` field.

Don't use default video if HTML5 sources are given.
 2013-08-07 18:00:59 +03:00
JonahStanley
9e93d5588c Changed css_selector 2013-08-07 10:14:50 -04:00
David Baumgold
18be93c3d9 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 09:45:48 -04:00
David Baumgold
57f8d21869 Merge pull request #599 from edx/db/fix-studio-login-next 
Assign isExternal JS function to window object
 2013-08-07 06:24:49 -07:00
Vasyl Nakvasiuk
ae8b2c883c add Word Cloud acceptance tests 2013-08-07 15:46:27 +03:00
Kristin
16b5b95128 Merge pull request #506 from edx/ksteph/bugfix_offline_gradecalc 
Fix offline_gradecalc
 2013-08-06 14:53:30 -07:00
David Baumgold
10344905ba Abstracted functionality to get datetime into separate JS function 2013-08-06 17:09:12 -04:00
David Baumgold
eefed18b7c Scoped pad2 function to the one place that it's called 2013-08-06 16:48:09 -04:00
David Baumgold
2d534a35af Removed unused JS functions 2013-08-06 16:47:23 -04:00
David Baumgold
82ac56068e 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-06 16:39:04 -04:00
cahrens
e6f15bf611 Send notification to admin when a user enters 'pending' state. 
Also fixes a bug where message was not sent to user when entering 'denied'
state unless the user was previously in 'granted'.

Send notification to admin when a user enters 'pending' state.

Pylint cleanup.
 2013-08-06 16:26:33 -04:00
cahrens
55f2cbc92f Split up event notification, make sorting on username work. 2013-08-06 15:58:55 -04:00
Christina Roberts
4c95078eb0 Merge pull request #578 from edx/christina/autoenroll 
Auto-enroll course staff to fix "View Live".
 2013-08-06 12:33:56 -07:00
Adam
147f7ed959 Merge pull request #573 from edx/fix/adam/ORA-load-image 
tz fix in openendedchild
 2013-08-06 12:15:54 -07:00
David Baumgold
b69be70f65 Merge pull request #575 from edx/db/integrate-jsonresponse 
Integrate JsonResponse into lms/djangoapps/instructor/views/api.py
 2013-08-06 11:55:49 -07:00
David Baumgold
714d3b9662 pylint fixes 2013-08-06 14:36:13 -04:00
David Baumgold
a0123d3a27 Fixed Jasmine tests 2013-08-06 14:30:19 -04:00
Adam
08bb13edb4 Merge pull request #595 from edx/adam/i18n-bug-fixes 
template fixes on instructor dash
 2013-08-06 11:25:36 -07:00
jkarni
7ba6d191aa Merge pull request #577 from edx/jkarni/feature/pip-upgrade 
Bump up pip requirement to latest.
 2013-08-06 11:17:14 -07:00
Peter Fogg
ae517fee01 Merge pull request #455 from edx/peter-fogg/remove-videoalpha-xml 
Peter fogg/remove videoalpha xml
 2013-08-06 11:06:46 -07:00
chrisndodge
c4d6102af6 Merge pull request #584 from edx/fix/cdodge/allow-courseware-links-in-capa-module 
tie in the normal courseware link url rewriting in capa module since tha...
 2013-08-06 10:55:46 -07:00
Slater-Victoroff
13339fb9e0 Merge pull request #592 from edx/slater/dev_env_fixup 
Small fixup to final print statement in Create Dev Env script
 2013-08-06 10:52:13 -07:00
chrisndodge
b24fdd9e22 Merge pull request #576 from edx/feature/cdodge/display-location-information-in-course-listings 
Feature/cdodge/display location information in course listings
 2013-08-06 10:27:38 -07:00
Peter Fogg
9c84440501 PR comment cleanup. 2013-08-06 13:23:33 -04:00
Brian Talbot
3e654550c8 Studio: corrects minor styling/formatting for multi-value metadata fields 2013-08-06 13:23:33 -04:00
Brian Talbot
99458e7223 Studio: revises visual layout/presentation of multi-value metadata fields 2013-08-06 13:23:33 -04:00
Peter Fogg
08c5f955aa Unstyled prototype for new list editor design. 2013-08-06 13:23:33 -04:00
Peter Fogg
f317244ac4 Convert Video Alpha to metadata-only. 2013-08-06 13:23:33 -04:00
Peter Fogg
74b815274f Add a list view for metadata editor. 
This is to be used with VideoAlpha's functionality allowing a choice
of multiple HTML5 video sources.
 2013-08-06 13:23:33 -04:00
David Baumgold
22fdef6b84 Properly parse and save section release times 2013-08-06 11:34:37 -04:00
David Baumgold
2445845d88 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-06 11:29:45 -04:00
David Baumgold
55b68168e7 Cleanup/reformatting 2013-08-06 11:29:45 -04:00
Slater-Victoroff
ccc10f25f5 Small fixup to final print statement in Create Dev Env script 
Fixed Typo
 2013-08-06 11:20:11 -04:00
Adam Palay
402d50bbf1 tz fix in openendedchild 2013-08-06 11:17:39 -04:00
chrisndodge
4d5727a2da Merge pull request #570 from edx/fix/cdodge/add-metadata-caching-to-delete-course 
Performance enhancements for django-admin commands to delete and clone course
 2013-08-06 07:52:17 -07:00
Adam Palay
d894600207 template fixes on instructor dash 2013-08-06 10:16:57 -04:00
Chris Dodge
22d33db542 fix broken test due to HTML change 2013-08-06 09:55:09 -04:00
cahrens
3732d418c9 Add helper methods to hide internals of how users are enrolled in courses. 
Remove _

Minor cleanup.
 2013-08-06 09:36:39 -04:00
Vasyl Nakvasiuk
67d1e55984 Merge pull request #590 from edx/alex/fix-videoalpha-descriptor 
Add RawDescriptor for VideoAlpha
 2013-08-06 01:47:54 -07:00