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
Adam Palay
73b9e261e4
redirects lms landing page to student.views.index if there is no marketing site
...
resets the cms edge redirect to '/'
2013-08-05 16:16:40 -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
861f1ef7bb
add a test for the static url generation
2013-08-05 16:15:03 -04:00
Chris Dodge
b8bc1d0171
remove redudent asset_url return value when uploading files
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
Frances Botsford
2c75caca20
adjustment to sidebar help text on PDF textbook page in studio
2013-08-05 16:10:08 -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
David Baumgold
1abea0b406
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 15:29:05 -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
