Commit Graph

16299 Commits

Author SHA1 Message Date
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
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
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
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
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
Adam
553512ba0a Merge pull request #560 from edx/adam/i18n-bug-fixes
template errors
2013-08-02 10:45:58 -07:00
Frances Botsford
7401c38917 adjusting fix for studio drop-down nav in IE9 2013-08-02 13:34:26 -04: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 Palay
d4a526906e template errors 2013-08-02 12:54:46 -04: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
Adam Palay
1a463962b9 change int to float for student progress display 2013-08-02 11:34:12 -04:00
Chris Dodge
c20ca2bf5e fix more rebase conflicts 2013-08-02 11:25:05 -04:00
Diana Huang
c867be7961 Limit the rate of logins. 2013-08-02 11:23:59 -04:00
Chris Dodge
f041ab1ccc fix rebase conflicts 2013-08-02 11:22:25 -04:00
Chris Dodge
e41554b24c be sure to encode the display strings 2013-08-02 09:56:19 -04:00
Chris Dodge
ebbeeb16a2 add some unit tests for the new fields 2013-08-02 09:56:19 -04:00
Chris Dodge
0937cdcbe6 one more escaping 2013-08-02 09:56:19 -04:00
Miles Steele
4b671d1195 fix pylint violations 2013-08-02 09:53:21 -04:00
Miles Steele
2760938e15 fix analytics distribution with no data, add unit test, cleanup 2013-08-02 09:53:21 -04:00
Miles Steele
f7989cb2ab move to instructor template directory 2013-08-02 09:53:21 -04:00
Miles Steele
f88b266c2b add member list widget, add segment.io call for section view 2013-08-02 09:53:21 -04:00
Miles Steele
588a307de5 add dangerous button confirmation popup 2013-08-02 09:53:21 -04:00
Miles Steele
02b7757d1b add catch for tasks AlreadyRunning 2013-08-02 09:53:21 -04:00
Miles Steele
8e923deca0 fix unicode comparisons, fix 404 access exception, fix initial link handling, fix forum access modification permissions 2013-08-02 09:53:20 -04:00
Miles Steele
a9749f38df add reset attempts all button click handler, increase polling interval, add slick grid refresh 2013-08-02 09:53:20 -04:00
Miles Steele
b44e8fe8b8 add regrade & rescore & task api tests, clean api 2013-08-02 09:53:20 -04:00
Miles Steele
7905e7d289 add csv & enrollment & access api tests, disallow instructors from un-instructoring themselves, rename mode to action for access 2013-08-02 09:53:20 -04:00
Miles Steele
fa0f56ec7d remove buggy styling 2013-08-02 09:53:20 -04:00
Miles Steele
0f09abe233 factor out urls to instructor.views.api_urls 2013-08-02 09:53:20 -04:00
Miles Steele
7392a888ce cleanup, fix permissions, rename functions, add more api tests 2013-08-02 09:53:20 -04:00
Miles Steele
1e8cb7df25 clean & comment coffeescript, add util.coffee 2013-08-02 09:53:20 -04:00
Miles Steele
e05d0f97d8 fix permissions, fix ENABLE_INSTRUCTOR_BACKGROUND_TASKS usage, fix csv download 2013-08-02 09:53:19 -04:00
Miles Steele
c6d6698abb change MockEnrollmentState to SettableFakeEnrollmentState 2013-08-02 09:52:18 -04:00
Miles Steele
f488aa059b rewrite test_access, add stricter argument to access 2013-08-02 09:52:18 -04:00
Miles Steele
cc9371d14e fix formatting, address comments from PR #322 2013-08-02 09:52:18 -04:00
Miles Steele
91bd3d7231 change arguments to format_dictlist 2013-08-02 09:52:17 -04:00
Miles Steele
63d07b7e47 rename enrolled_students_profiles -> enrolled_students_features 2013-08-02 09:52:17 -04:00