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

5647 Commits

Author SHA1 Message Date
JonahStanley
4d6984e3e2 Fixed some of the ui-helpers and made the course-team test faster 2013-08-08 13:24:27 -04:00
JonahStanley
46d0e5ed05 Fixed display-name bug and added in a function to trigger events on firefox as well as check if it is firefox 2013-08-08 13:24:26 -04:00
Jay Zoldak
006b90af9f Modify cms acceptance tests to use auto_auth workflow. 2013-08-08 12:08:25 -04:00
Jay Zoldak
8414ef022f Modify lms acceptance test to use auto_auth. 2013-08-08 12:08:25 -04:00
Jay Zoldak
e78edf8ef9 Rename MITX_SETTING AUTOMATIC_AUTH_FOR_LOAD_TESTING -> AUTOMATIC_AUTH_FOR_TESTING because it will be used for acceptance testing also. 2013-08-08 12:08:25 -04:00
Jay Zoldak
385e9de1fd Modify auto_auth to accept parameters for overriding created user attributes. 2013-08-08 12:08:24 -04:00
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
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
cahrens
1bb29e5414 Workaround for popup CSS path being wrong (tinymce). 
STUD-178
 2013-08-08 09:50:54 -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
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
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
Sarina Canelake
3a34529958 Need to call .save when modifying descriptor 2013-08-07 13:14:30 -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
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
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
Chris Dodge
6db1be6e00 add jasmine tests to verify link rewriting in HTML editor 2013-08-06 13:38:14 -04:00
Peter Fogg
9c84440501 PR comment cleanup. 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
Adam Palay
402d50bbf1 tz fix in openendedchild 2013-08-06 11:17:39 -04:00
Chris Dodge
7a180c290b handle cases where the 'base-asset-url' is undefined, e.g. in Jasmine tests 2013-08-06 11:16:37 -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
Alexander Kryklia
f3a4d49591 Adds RawDescriptro for VideoAlpha 2013-08-06 11:29:51 +03:00
Chris Dodge
dff3312178 refactor the coffeescript a bit more. Hopefully to resolve Jasmine failures 2013-08-05 21:50:55 -04:00
Chris Dodge
d2f911211e fix cut/paste comment confusion 2013-08-05 16:15:04 -04:00
Chris Dodge
da9a4b5d4f alter the HTML editor so that it can do the /static/ <--> /c4x/ substitutions when toggling back and forth between the visual and advanced editors 2013-08-05 16:15:03 -04:00
Chris Dodge
3dbe4c189f add unit tests around asserting that /static/ links are not re-written on import 2013-08-05 16:15:03 -04:00
Chris Dodge
d329e3c833 don't attempt to do URL rewriting in the import step, let the LMS/CMS runtimes do it on the fly on reference 2013-08-05 16:15:03 -04:00
Chris Dodge
6200b2903f have the Files and Upload pages surface a 'portable_url' which uses the /static/ shorthand which is more portable across course runs 2013-08-05 16:15:03 -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
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
Valera Rozuvan
a0aa652df4 Fixed typo of function call. Added comment why it is necessary. 2013-08-05 15:00:18 +03:00
Alexander Kryklia
6225c2a532 Fixes 2013-08-05 13:38:32 +03:00
Alexander Kryklia
da4f295d00 Add TabsEditingDescriptor for VideoAlpha 
Updates comment
Make Model descriptor class property.
Fix tests
 2013-08-05 13:38:32 +03:00
chrisndodge
85267e6a73 Merge pull request #535 from edx/feature/cdodge/add-display-org-and-coursenum 
add display_coursenumber and display_organization fields on the CourseModule
 2013-08-04 18:00:29 -07:00
Chris Dodge
192d51bf7a touch-ups per review feedback 2013-08-02 21:37:27 -04:00
Diana Huang
4005b3bd79 Merge pull request #554 from edx/diana/django-ratelimit 
Limit the rate of logins
 2013-08-02 11:02:04 -07:00
Miles Steele
3d44c83fa7 Merge pull request #322 from edx/feature/msteele/instrdash 
Instructor Dashboard v2 (disabled)
 2013-08-02 10:03:06 -07:00
Adam
eb9f03479a Merge pull request #558 from edx/fix/adam/mrev-rounding 
change int to float for student progress display
 2013-08-02 09:00:23 -07:00