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
Julian Arni
6716783009
Fix import mocks.
...
Prevents sphinx from bailing on builds that involve unavailable imports.
2013-08-06 14:01:22 -04:00
Julian Arni
0bbd80fedf
Add verbose option
2013-08-06 14:00:31 -04: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
Chris Dodge
6db1be6e00
add jasmine tests to verify link rewriting in HTML editor
2013-08-06 13:38:14 -04: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
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
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
Vik Paruchuri
cb54081d2e
Fix notification problem
2013-08-06 09:55:49 -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
Alexander Kryklia
9728dceeb0
Adds RawDescriptro for VideoAlpha
2013-08-06 08:05:12 -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
Chris Dodge
dff3312178
refactor the coffeescript a bit more. Hopefully to resolve Jasmine failures
2013-08-05 21:50:55 -04:00
Adam Palay
5dd202e592
update edge.html
2013-08-05 18:49:51 -04: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 Palay
17b5ccf13a
creates "edge" case
2013-08-05 18:18:39 -04:00
Adam Palay
bf5af6c8cf
add university_profile/edge.html for edge landing page
2013-08-05 18:18:25 -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
