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
Julian Arni
b38750e15d
Refactor wrap_xmodule call
2013-08-05 11:09:43 -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
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
9da0aa2e85
rename clone.py to a more descriptive clone_course.py
2013-08-02 22:30:31 -04:00
Chris Dodge
9f07507396
add same optimizations to the clone course command
2013-08-02 22:28:53 -04:00
Chris Dodge
f57b02c199
add a metadata cache and re-compute ignore when deleting a course to speed up the whole thing as well as squelching warnings in the console output
2013-08-02 22:19:59 -04:00
Chris Dodge
18458bd94b
wrong accessor
2013-08-02 21:45:51 -04:00
Chris Dodge
eaeaf3a520
fix formatting error
2013-08-02 21:44:48 -04:00
Chris Dodge
192d51bf7a
touch-ups per review feedback
2013-08-02 21:37:27 -04:00
Adam Palay
0f18ea4bf7
redirects edge landing page to /dashboard
2013-08-02 17:18:49 -04:00
Julian Arni
5c477a9004
Make builds quiet by default
2013-08-02 16:24:07 -04:00
Julian Arni
332703c856
Fix repeated doc builds
2013-08-02 16:23:25 -04:00
Julian Arni
7bfb0804f8
Switch to studio_view
2013-08-02 16:09:29 -04:00
Julian Arni
562456ade7
Make descriptorsystem inherit from Runtime
2013-08-02 15:36:15 -04:00
Vik Paruchuri
ea2b9191c1
Allow student to switch between rubrics, tell user once peer grading required amount is done
2013-08-02 15:30:17 -04:00
David Baumgold
cca94c62e9
Update Babel and Transifex libraries
2013-08-02 15:19:35 -04:00
marco
478fa18beb
merge edit cleanup, nothing new
2013-08-02 14:30:04 -04:00
frances botsford
2f808a92a3
Merge pull request #562 from edx/fix/frances/studio-ie-menu-bug2
...
adjusting fix for studio drop-down nav in IE9
2013-08-02 11:17:42 -07: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
Vik Paruchuri
aa09006247
Hide and show multiple rubrics
2013-08-02 13:53:07 -04:00
Adam
553512ba0a
Merge pull request #560 from edx/adam/i18n-bug-fixes
...
template errors
2013-08-02 10:45:58 -07:00
Vik Paruchuri
5da5d55630
Fix peer grading feedback issue
2013-08-02 13:41:37 -04:00
marco
ec99e20a35
styled rubric, dividers between sections
2013-08-02 13:37:53 -04:00
Frances Botsford
7401c38917
adjusting fix for studio drop-down nav in IE9
2013-08-02 13:34:26 -04:00
Vik Paruchuri
932bbd2592
Fix text issue
2013-08-02 13:23:03 -04:00
