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
David Baumgold
a0123d3a27
Fixed Jasmine tests
2013-08-06 14:30:19 -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
Vasyl Nakvasiuk
67d1e55984
Merge pull request #590 from edx/alex/fix-videoalpha-descriptor
...
Add RawDescriptor for VideoAlpha
2013-08-06 01:47:54 -07:00
Alexander Kryklia
f3a4d49591
Adds RawDescriptro for VideoAlpha
2013-08-06 11:29:51 +03:00
Adam
d5aba29938
Merge pull request #588 from edx/fix/adam/redirect
...
update edge.html
2013-08-05 15:49:22 -07:00
Adam Palay
4a99b7bfd6
update edge.html
2013-08-05 18:45:54 -04:00
Adam
fa567f1fc6
Merge pull request #587 from edx/fix/adam/redirect
...
add university_profile/edge.html for edge landing page
2013-08-05 15:16:54 -07:00
Adam Palay
5d0328aa3e
creates "edge" case
2013-08-05 18:08:32 -04:00
Adam Palay
cac6a3195d
add university_profile/edge.html for edge landing page
2013-08-05 17:26:47 -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
103788ae98
Merge pull request #579 from edx/db/course-team-role-fix
...
Fix for STUD-582
2013-08-05 12:21:05 -07: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
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
David Baumgold
cca94c62e9
Update Babel and Transifex libraries
2013-08-02 15:19:35 -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
