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
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
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
Adam Palay
d0a36076c3
more template fixes for faq, press, and help
2013-08-05 11:24:25 -04:00
Feanil Patel
0e2f5fdedb
Merge pull request #572 from edx/vaxxxa/master-word-cloud-hotfix
...
Hotfix world cloud functionality
2013-08-05 07:41:50 -07:00
Vasyl Nakvasiuk
a52964a786
Hotfix world cloud functionality
2013-08-05 17:14:11 +03:00
Valera Rozuvan
aa0cda96f1
Merge pull request #571 from edx/valera/one_speed_html5_fix
...
Fixed typo of function call. Added comment why it is necessary.
2013-08-05 05:35:39 -07:00
Valera Rozuvan
a0aa652df4
Fixed typo of function call. Added comment why it is necessary.
2013-08-05 15:00:18 +03:00
