Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,299 Commits 1 Branch 0 Tags
94976df8d72f19c9052d365e4c4a40db48d9910a
Commit Graph

3196 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
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
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
Frances Botsford
7401c38917 adjusting fix for studio drop-down nav in IE9 2013-08-02 13:34:26 -04:00
Diana Huang
c867be7961 Limit the rate of logins. 2013-08-02 11:23:59 -04:00
Chris Dodge
3a2bb7ba01 add escaping 2013-08-02 09:51:41 -04:00
Chris Dodge
93df9c4c30 resolve merge conflicts 2013-08-02 09:41:02 -04:00
Christina Roberts
23efbf74fd Merge pull request #557 from edx/christina/html-latex 
Fix missing source_code in LaTeX  HTML.
 2013-08-02 06:11:36 -07:00
Peter Fogg
0cf42edc80 Merge pull request #552 from edx/peter-fogg/course-update-notifications 
Notifications for course updates.
 2013-08-02 06:10:50 -07:00
polesye
042b7d5f60 Merge pull request #428 from edx/valera/video_alpha2_refactor 
Valera/video alpha2 refactor
 2013-08-02 01:04:13 -07:00
cahrens
d63813b4aa Fix missing source_code in LaTeX HTML. 
STUD-565
 2013-08-01 17:27:34 -04:00
Peter Fogg
1ebedc9a4b Don't show update in the DOM on AJAX error. 2013-08-01 17:17:36 -04:00
John Jarvis
3d87dd8c58 Merge pull request #551 from edx/jarv/remove-ADMINS 
changing default ADMINS to an empty tuple
 2013-08-01 14:02:26 -07:00
David Baumgold
2ad78d949a Merge pull request #538 from edx/db/course-team-admin-grants 
Add error messaging to course team page
 2013-08-01 11:58:52 -07:00
David Baumgold
1b83cfc409 Merge pull request #546 from edx/db/dev-views 
Create urls/views/templates for dev-only views
 2013-08-01 11:47:39 -07:00
David Baumgold
d8a7901688 Add a lettuce test for removing own admin permission on course team 2013-08-01 14:44:38 -04:00
David Baumgold
741bbb3f92 pylint cleanup 2013-08-01 14:16:55 -04:00
Anton Stupak
6ba5d472b3 Fix with sequence switching and more. 
Studio: adds in new Sass file for Studio-specific
xmodule presentation and removes full screen control
from video alpha display UI.
Adds jasmine test for subtitles scroll.
Adds tests for caption change height functionality.
Uses gettext wrapper.
Fixes caption change height functionality.
Removes IS_CMS, isCms flags.
 2013-08-01 20:50:32 +03:00
Anton Stupak
7d215e12b7 Fixes InvalidStateError failures in FF and more. 
Fixes HD button
Disables Fullscreen mode in the Studio
Fixes ui controls bug
 2013-08-01 20:47:55 +03:00
David Baumgold
53ae177178 Curly quotes around course name 2013-08-01 13:46:40 -04:00
David Baumgold
16e2ee8011 Abstract out the unknown error message and i18n 2013-08-01 13:43:40 -04:00
David Baumgold
1eae675952 Create a dedicated CMS.Models.Course Backbone model 
Initialize on every page that has a context_course set
 2013-08-01 13:39:47 -04:00
Peter Fogg
d2194b2211 Notifications for course updates. 2013-08-01 13:23:41 -04:00
John Jarvis
b93e1985fb changing default ADMINS to an empty tuple 
https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-ADMINS
https://docs.djangoproject.com/en/dev/howto/error-reporting/
 2013-08-01 12:50:23 -04:00
David Baumgold
76948b52d9 Lettuce: confirm deletion prompts on course team page 2013-08-01 12:47:19 -04:00
David Baumgold
ec308e9771 Add lettuce test for transferring ownership of a course using the course team page 2013-08-01 12:11:49 -04:00
Peter Fogg
8bd686d63c Show notification on component reorder. 2013-08-01 11:56:16 -04:00
David Baumgold
607c06cba8 Stop using authz functions to change user groups 
They contain too much incorrect permission checking
 2013-08-01 11:24:42 -04:00
Will Daly
cadb81355e Merge pull request #548 from edx/will/fix-auto-auth-csrf-2 
Ensure auto-auth feature flag actually disables CSRF
 2013-08-01 08:20:32 -07:00
Peter Fogg
e501a176b1 Merge pull request #540 from edx/peter-fogg/overview-reorder-notification 
Show notification on course outline reorder.
 2013-08-01 07:17:59 -07:00
e0d
97013d610a Merge pull request #541 from edx/e0d/escalated-priv-migrations 
adding migrate env for cms
 2013-08-01 07:15:08 -07:00
Brian Talbot
a1f43fa6fd Studio: revises prompt messages for team roles UI 2013-08-01 09:58:32 -04:00
David Baumgold
21318d142d Add confirmation prompt when deleting a user from a course team 2013-08-01 09:58:32 -04:00
David Baumgold
2617b478c0 Add error messaging to course team page 
Hitting "Add User" with no email address, or trying to add a user to the course
team multiple times
 2013-08-01 09:58:32 -04:00
Peter Fogg
4a77693f4a Show notification on course outline reorder. 2013-08-01 09:41:27 -04:00
Will Daly
ab1461542d Moved CSRF override into its own settings file 2013-08-01 09:27:46 -04:00
e0d
ef75f9bb2c adding migrate env for cms 
cleanup
 2013-08-01 08:43:20 -04:00
Will Daly
39030c6683 Remove CSRF middleware/processor in aws and dev settings, 
not common.  This ensures that we load the MITX_FEATURES
token BEFORE deciding to disable CSRF.
 2013-07-31 23:59:25 -04:00
Calen Pennington
e8ee29786f Remove news carousel and other unused pages 
Remove unused course_filter page

removes university_profile urls and templates

removes all university_profile views

remove news from templates/index
 2013-07-31 19:39:15 -04:00
chrisndodge
8573ac3909 Merge pull request #510 from edx/feature/cdodge/allow-course-run-in-course-create 
Feature/cdodge/allow course run in course create
 2013-07-31 14:44:50 -07:00
David Baumgold
64ad5567f3 Create urls/views/templates for dev-only views 
Our designers find it helpful to be able to stub out simple views that aren't ready
to be seen for production yet, and check them into version control so that other
people can see them and provide feedback. This commit introduces a few new files
and directories for this purpose, as well as a sample view that will only be seen
in dev mode, and never in production.
 2013-07-31 17:20:26 -04:00
Don Mitchell
b80aad2308 Merge pull request #528 from edx/dhm/rename_revision 
Rename CourseLocator.revision to branch
 2013-07-31 13:18:17 -07:00
David Baumgold
248793c127 Fix some pylint issues 2013-07-31 15:42:11 -04:00
Frances Botsford
b6777118c6 removing animate class from course creation for now 2013-07-31 15:25:38 -04:00
frances botsford
2ac27550a5 Merge pull request #537 from edx/fix/frances/studio-ie-menu-bug 
fix for ie bug where drop down menus were still clickable when collapsed
 2013-07-31 10:19:56 -07:00
Frances Botsford
9ab21be98c fix for ie bug where drop down menus were still clickable when collapsed 2013-07-31 12:17:21 -04:00