Jesse Zoldak
cc41ccb48c
Define SELENIUM_DRIVER_LOG_DIR in paver bok-choy command
2014-08-22 16:57:23 -04:00
Ben McMorran
b875a42971
Merge pull request #4938 from edx/benmcmorran/reword-rerun-note
...
Reword course rerun notification
2014-08-22 16:07:04 -04:00
Sarina Canelake
657610dd73
Merge pull request #4944 from edx/sarina/make-studio-reg-copy-match
...
Make Studio and LMS register pages use the same language
2014-08-22 15:29:28 -04:00
Ben McMorran
e8fd9c08c1
Merge pull request #4934 from edx/benmcmorran/course-settings-error
...
Fix error when changing course details on split
2014-08-22 14:47:15 -04:00
Sarina Canelake
e57a1551c3
Make Studio and LMS register pages use the same language
2014-08-22 14:23:07 -04:00
Christina Roberts
85ede381c5
Merge pull request #4923 from edx/zub/bugfix/tnl56-dragdropintocollapsedunit
...
populate children of unit collapsed drop location
2014-08-22 13:03:37 -04:00
Sarina Canelake
5c48004f52
Merge pull request #4940 from edx/sarina/082214-translation-update
...
Update translations (autogenerated message)
2014-08-22 12:16:56 -04:00
Sarina Canelake
c11764e9b9
Update translations (autogenerated message)
2014-08-22 12:14:58 -04:00
Alison Hodges
9854c231d6
Merge pull request #4903 from edx/ahodges/doc/DOC263
...
Clarify the effect of changing problems
2014-08-22 11:44:52 -04:00
Alison Hodges
ff162a0297
Clarify the effect of changing problems
2014-08-22 11:38:34 -04:00
Ben McMorran
9cb87cfd61
Reword course rerun notification
2014-08-22 11:35:03 -04:00
cahrens
4946d601d2
Verify children are rendered before allowing drop into collapsed parent.
...
TNL-56
2014-08-22 11:20:13 -04:00
Sarina Canelake
061199cab6
Merge pull request #4933 from Kelketek/jp_authors
...
Added Jonathan Piacenti to the AUTHORS file.
2014-08-22 11:06:09 -04:00
Ben McMorran
e933c9fe18
Fix error when changing course details on split
2014-08-22 10:22:57 -04:00
Jonathan Piacenti
9058375d85
Added Jonathan Piacenti to the AUTHORS file.
2014-08-22 13:42:57 +00:00
Sarina Canelake
9b1301df05
Merge pull request #4927 from mitocw/cg/add_missing_endif
...
Add missing endif in crystallography mako template
2014-08-22 09:20:46 -04:00
frances botsford
7260094ef3
Merge pull request #4145 from IONISx/tusbar/rewrite-password-reset-templates
...
Make use of django_main for password_reset templates
2014-08-22 08:06:29 -04:00
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
Carson Gee
7dbea40f84
Add missing endif in crystallography mako template
2014-08-21 14:12:09 -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
