Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

4005 Commits

Author SHA1 Message Date
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
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
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
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
Julian Arni
b38750e15d Refactor wrap_xmodule call 2013-08-05 11:09:43 -04: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
Adam Palay
0f18ea4bf7 redirects edge landing page to /dashboard 2013-08-02 17:18:49 -04:00
Julian Arni
7bfb0804f8 Switch to studio_view 2013-08-02 16:09:29 -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