Commit Graph

25222 Commits

Author SHA1 Message Date
muhammad-ammar
4815adb641 Merge pull request #4869 from edx/ammar/bok-choy-video-transcript-tests-batch2
Bok-Choy Video Transcript Tests Batch 2
2014-08-22 15:39:27 +05:00
Oleg Marshev
62821c3e54 Merge pull request #4920 from edx/oleg/allow-one-group-in-configuration
Allow one group in a group configuration (BLD-1223)
2014-08-22 12:51:26 +03:00
Oleg Marshev
7506a479c6 Allow one group in a group configuration. 2014-08-22 11:52:35 +03:00
Waheed Ahmed
c12535c509 Merge pull request #4850 from edx/waheed/stud2096-fix-export-with-old-ora
Fix export course with old ORA components.
2014-08-22 13:47:46 +05:00
Waheed Ahmed
9a05f27cc6 Merge pull request #4922 from edx/waheed/lms11228-fix-instructor-dash-analytics-count
Fixed analytics counts on instructor dashboard.
2014-08-22 13:47:24 +05:00
Muhammad Ammar
75a0d52472 Bok-Choy Video Transcript Tests Batch 2 2014-08-22 07:28:48 +00:00
Waheed Ahmed
f686e7d0b9 Passed cls=EdxJSONEncoder on json.dumps to fix save, edit and import.
STUD-2096
2014-08-22 12:23:46 +05:00
Waheed Ahmed
b98fe5bf1e Fixed analytics counts on instructor dashboard.
LMS-11228
2014-08-22 12:22:29 +05:00
Andy Armstrong
3ac3a3152a Merge pull request #4913 from edx/andya/handle-component-errors
Fix Studio to gracefully handle xblock JavaScript errors
2014-08-21 18:20:16 -04:00
Andy Armstrong
d451c3e91d Fix Studio to gracefully handle xblock JavaScript errors
TNL-46

I've changed Studio to catch JavaScript errors when rendering xblocks, log the error, but to then continue as normal. This means that the user is still able to interact with the xblock to delete, duplicate etc. This seems reasonable as the xblock is only rendered as a WYSIWYG representation so if it isn't fully interactive that shouldn't be a big problem.
2014-08-21 17:31:19 -04:00
Ben McMorran
30fc0441d1 Merge pull request #4782 from edx/reruns/ui
Reruns/ui
2014-08-21 16:57:00 -04:00
Renzo Lucioni
fa2154a694 Merge pull request #4893 from edx/web-analytics/pass-ga-cookie
Re-use GA cookie when sending server-side events to Segment.io
2014-08-21 16:28:06 -04:00
Jesse Zoldak
3efc384fa5 Merge pull request #4926 from edx/zoldak/update-bok
Update bok-choy version
2014-08-21 16:16:34 -04:00
Ben McMorran
62643a5941 Fix broken rerun test 2014-08-21 15:43:22 -04:00
Ben McMorran
d38bd2ea95 Reword rerun notification 2014-08-21 14:11:43 -04:00
Brian Talbot
b69aa64c0e Merge pull request #4904 from edx/talbs/studio-fix-font-weight
Studio: FIX - Font Weights
2014-08-21 13:53:24 -04:00
Jesse Zoldak
337a75598f Update bok-choy version 2014-08-21 12:16:42 -04:00
Ben McMorran
ff525bea96 Fix field serialization 2014-08-21 12:11:30 -04:00
Ben McMorran
bb90c30767 Make refresh clickable while courses are processing 2014-08-21 12:11:30 -04:00
Ben McMorran
b6d9ef3ed7 More PEP8/pylint cleanup 2014-08-21 12:11:29 -04:00
Ben McMorran
883aedb51b Add blank=True to rerun state display name 2014-08-21 12:11:29 -04:00
Don Mitchell
3b6b4668dd On rerun, override the course start date
LMS-11011
2014-08-21 12:11:29 -04:00
Don Mitchell
85f5c49bb7 Unit tests for rerun
along w/ fixes to make them work
LMS-11011
2014-08-21 12:11:29 -04:00
Ben McMorran
4bc672b93d Fix broken unicode char in CSS 2014-08-21 12:11:29 -04:00
Ben McMorran
de52f82352 PEP8/pylint cleanup 2014-08-21 12:11:28 -04:00
Ben McMorran
ab3a8c96d3 Add test for failed course creation 2014-08-21 12:11:28 -04:00
Ben McMorran
4e41a42c76 Rename unsucceeded to in_process 2014-08-21 12:11:28 -04:00
Ben McMorran
d943204199 Fix i18n on course outline and show error message for long names 2014-08-21 12:11:28 -04:00
Ben McMorran
baee2da278 Improve javascript test coverage 2014-08-21 12:11:28 -04:00
Ben McMorran
7bf9c1a7fd Add test for non URL characters 2014-08-21 12:11:28 -04:00
Ben McMorran
1778c15703 Refactor dismissNotification uses into shared logic in view_utils 2014-08-21 12:11:27 -04:00
Don Mitchell
d1ffecf31f Fix lms wiki url parsing
LMS-11240
2014-08-21 12:11:27 -04:00
Don Mitchell
24cdd7a481 Assume any non-xml modulestore is r/w
LMS-11235
2014-08-21 12:11:27 -04:00
Ben McMorran
63603d70f4 Refactor shared course creation validation into create_course_utils 2014-08-21 12:11:27 -04:00
Don Mitchell
78879ebc18 Asset urls must start w/ slash
LMS-11233
2014-08-21 12:11:27 -04:00
Ben McMorran
2839ad8711 PR cleanup 2014-08-21 12:11:26 -04:00
Ben McMorran
46932ee0f9 Replace data-test-course and data-test-unsucceeded with data-course-key 2014-08-21 12:11:26 -04:00
Don Mitchell
0d1669c612 DateTime fields can support datetime values.
LMS-11209
2014-08-21 12:11:26 -04:00
Don Mitchell
71c41cfb92 fixup! Set GlobalStaff permissions on reruns 2014-08-21 12:11:26 -04:00
Brian Talbot
620218b19d Studio: removing redundant font-weight Sass placeholders 2014-08-21 12:11:26 -04:00
Brian Talbot
aa799a1736 Studio: syncing up markup/styling for other 'learn more' external help links 2014-08-21 12:11:26 -04:00
Brian Talbot
972b392d62 Studio: adding in doc URL logic for course re-run help link 2014-08-21 12:11:25 -04:00
Brian Talbot
b43c757101 Studio: revising visual padding on dismiss UI used in course re-run flow 2014-08-21 12:11:25 -04:00
Brian Talbot
7baf338cdb Studio: revising help copy and actions on course re-reun UI 2014-08-21 12:11:25 -04:00
Brian Talbot
e3fa5f0879 Studio: removing static rendering notes/comments from course rerun template 2014-08-21 12:11:25 -04:00
Ben McMorran
6c8b418331 Test notification dismissal on course listing page 2014-08-21 12:11:25 -04:00
Ben McMorran
319b53bb3c Add jasmine test for notification dismissal on course outline 2014-08-21 12:11:24 -04:00
Ben McMorran
4fcb6c925a Add jasmine tests for course_rerun.js 2014-08-21 12:09:13 -04:00
Mat Peterson
6096bae755 Skipping rerun test on feature flag conditional 2014-08-21 12:09:13 -04:00
Mat Peterson
0088978281 Set GlobalStaff permissions on reruns 2014-08-21 12:09:13 -04:00