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

16350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Alexander Kryklia
f3a4d49591 Adds RawDescriptro for VideoAlpha 2013-08-06 11:29:51 +03:00
Adam
d5aba29938 Merge pull request #588 from edx/fix/adam/redirect 
update edge.html
 2013-08-05 15:49:22 -07:00
Adam Palay
4a99b7bfd6 update edge.html 2013-08-05 18:45:54 -04:00
Adam
fa567f1fc6 Merge pull request #587 from edx/fix/adam/redirect 
add university_profile/edge.html for edge landing page
 2013-08-05 15:16:54 -07:00
Adam Palay
5d0328aa3e creates "edge" case 2013-08-05 18:08:32 -04:00
Adam Palay
cac6a3195d add university_profile/edge.html for edge landing page 2013-08-05 17:26:47 -04:00
David Baumgold
ef4220ee43 Add unit tests to exercise common_exceptions_400 decorator 2013-08-05 16:54:56 -04:00
Brian Talbot
d64894de02 Studio: revises markup and visual styling for course listings metadata 2013-08-05 16:20:03 -04:00
Adam
71c299930e Merge pull request #582 from edx/fix/adam/redirect 
Fix/adam/redirect
 2013-08-05 13:06:44 -07:00
Adam Palay
f85cfc11fa redirects lms landing page to student.views.index if there is no marketing site 
resets the cms edge redirect to '/'
 2013-08-05 16:05:12 -04:00
Chris Dodge
9e96b9525b tie in the normal courseware link url rewriting in capa module since that presents HTML via an Ajax callbacks and not via module_render.py 2013-08-05 15:24:19 -04:00
David Baumgold
103788ae98 Merge pull request #579 from edx/db/course-team-role-fix 
Fix for STUD-582
 2013-08-05 12:21:05 -07:00
cahrens
a227b14fdd Auto-enroll course staff to fix "View Live". 
STUD-554

Code review feedback.
 2013-08-05 15:00:37 -04:00
David Baumgold
25e98fcb5c Merge pull request #566 from edx/db/i18n-lib-update 
Update Babel and Transifex libraries
 2013-08-05 11:45:38 -07:00
David Baumgold
94976df8d7 Check that content-type starts with application/json 
When Chrome sends the AJAX request to add a user to the course team, it sets the
Content-type to "application/json". However, when Firefox sends the same request,
it sets the Content-type to "application/json; charset=UTF-8". This commit only
checks that the Content-type begins with "application/json", not is identical
to it; that way, Firefox can play, too.
 2013-08-05 14:16:28 -04:00
David Baumgold
7b01147c1a Translate messages early 2013-08-05 13:51:47 -04:00
David Baumgold
8807d9fe51 Integrate JsonResponse into lms/djangoapps/instructor/views/api.py 2013-08-05 13:00:30 -04:00
Julian Arni
3893ac6656 Bump up pip requirement to latest. 
Solves an issue with using git > 1.8.1 for github based pip requirements.
 2013-08-05 12:59:16 -04:00
Chris Dodge
ef53e8df6c one field had wrong label nesting 2013-08-05 12:56:06 -04:00
Chris Dodge
09a3bc01be show the organization, course number, course run in the course listing page in CMS 2013-08-05 12:51:42 -04:00
Feanil Patel
2f27f7c43b Merge pull request #569 from edx/fix/adam/edge-redirect 
redirects edge landing page to /dashboard
 2013-08-05 09:13:29 -07:00
Alexander Kryklia
16cee198b1 Merge pull request #386 from edx/alex/editor-tabs-for-videoalpha 
adds TabsEditingDescriptor, pluggen in VideoAlphaDescriptor
 2013-08-05 08:57:53 -07:00
Adam
ad73feb7e3 Merge pull request #565 from edx/adam/i18n-bug-fixes 
more template fixes for faq, press, and help
 2013-08-05 08:25:29 -07:00