Commit Graph

3237 Commits

Author SHA1 Message Date
Peter Fogg
df024b0bb1 Fix VideoAlpha acceptance test. 2013-08-07 13:25:53 -04:00
Jonah Stanley
ead87d1fde Merge pull request #602 from edx/jonahstanley/fix-acceptance-template
Changed css_selector
2013-08-07 10:12:06 -07:00
JonahStanley
ed620e635b Reset the file within the test itself 2013-08-07 13:07:38 -04:00
JonahStanley
a38f71cdbc Fixed the upload test 2013-08-07 13:06:25 -04:00
Christina Roberts
2191a11151 Merge pull request #598 from edx/christina/email-studio-request
Send e-mail to STUDIO_REQUEST_EMAIL when user requests course creator privileges
2013-08-07 09:51:14 -07:00
David Baumgold
6e784d606f Merge pull request #596 from edx/db/ff-subsection-datetime-bug
Fix Firefox subsection datetime bug
2013-08-07 09:25:17 -07:00
JonahStanley
5919456f24 Fixed some course-team bugs and other css stuff 2013-08-07 12:03:25 -04:00
cahrens
bbd8d84a28 Include the URL to the course creator admin table. 2013-08-07 11:34:51 -04:00
JonahStanley
5941f5b795 Fixed the other places that the css occurs 2013-08-07 11:30:50 -04:00
David Baumgold
97aaab9cc6 Created a new lettuce test to catch bug, updated other lettuce tests 2013-08-07 11:03:19 -04:00
JonahStanley
9e93d5588c Changed css_selector 2013-08-07 10:14:50 -04:00
David Baumgold
18be93c3d9 Don't ignore null datetimes on subsection settings
Clicking "Sync to <course>" should send an AJAX request with the datetimes
set to null, so that the server resets them.
2013-08-07 09:45:48 -04:00
David Baumgold
10344905ba Abstracted functionality to get datetime into separate JS function 2013-08-06 17:09:12 -04:00
David Baumgold
eefed18b7c Scoped pad2 function to the one place that it's called 2013-08-06 16:48:09 -04:00
David Baumgold
2d534a35af Removed unused JS functions 2013-08-06 16:47:23 -04:00
cahrens
e6f15bf611 Send notification to admin when a user enters 'pending' state.
Also fixes a bug where message was not sent to user when entering 'denied'
state unless the user was previously in 'granted'.

Send notification to admin when a user enters 'pending' state.

Pylint cleanup.
2013-08-06 16:26:33 -04:00
cahrens
55f2cbc92f Split up event notification, make sorting on username work. 2013-08-06 15:58:55 -04:00
Christina Roberts
4c95078eb0 Merge pull request #578 from edx/christina/autoenroll
Auto-enroll course staff to fix "View Live".
2013-08-06 12:33:56 -07:00
David Baumgold
a0123d3a27 Fixed Jasmine tests 2013-08-06 14:30:19 -04:00
Peter Fogg
ae517fee01 Merge pull request #455 from edx/peter-fogg/remove-videoalpha-xml
Peter fogg/remove videoalpha xml
2013-08-06 11:06:46 -07:00
chrisndodge
b24fdd9e22 Merge pull request #576 from edx/feature/cdodge/display-location-information-in-course-listings
Feature/cdodge/display location information in course listings
2013-08-06 10:27:38 -07:00
Peter Fogg
9c84440501 PR comment cleanup. 2013-08-06 13:23:33 -04:00
Brian Talbot
3e654550c8 Studio: corrects minor styling/formatting for multi-value metadata fields 2013-08-06 13:23:33 -04:00
Brian Talbot
99458e7223 Studio: revises visual layout/presentation of multi-value metadata fields 2013-08-06 13:23:33 -04:00
Peter Fogg
08c5f955aa Unstyled prototype for new list editor design. 2013-08-06 13:23:33 -04:00
Peter Fogg
f317244ac4 Convert Video Alpha to metadata-only. 2013-08-06 13:23:33 -04:00
Peter Fogg
74b815274f Add a list view for metadata editor.
This is to be used with VideoAlpha's functionality allowing a choice
of multiple HTML5 video sources.
2013-08-06 13:23:33 -04:00
David Baumgold
22fdef6b84 Properly parse and save section release times 2013-08-06 11:34:37 -04:00
David Baumgold
2445845d88 Make sure that we properly parse and save section release times
Firefox wasn't saving section release times, due to issues with JS Date() parsing.
I've modified the code to make it more explicit around what it should do and how
it should work, which also makes it work better with both Firefox and Chrome.
2013-08-06 11:29:45 -04:00
David Baumgold
55b68168e7 Cleanup/reformatting 2013-08-06 11:29:45 -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
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
Brian Talbot
d64894de02 Studio: revises markup and visual styling for course listings metadata 2013-08-05 16:20:03 -04: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
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
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
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