Jay Zoldak
76297c3050
Merge pull request #3305 from edx/zoldak/no-lettuce-with-discussion
...
Disable discussion service setting for lettuce tests
2014-04-10 13:56:09 -04:00
Greg Price
ecf9923e96
Return 404 instead of 500 for missing forum thread
...
Also show a more specific error message in the front end. This change
only has an effect if using cs_comments_service commit 1d71330 or later.
2014-04-10 13:17:58 -04:00
muhammad-ammar
2318ce18c4
Merge pull request #3217 from edx/ammar/convert-lettuce-video-tests-to-bok-choy
...
Convert lettuce video tests to bok choy
2014-04-10 21:38:00 +05:00
Chris Rossi
f04cd649e4
Upgrade JSDraw.
2014-04-10 12:01:02 -04:00
Jay Zoldak
9957b1aa8e
Disable discussion service setting for lettuce tests
2014-04-10 11:51:20 -04:00
David Baumgold
15a49f8782
Merge pull request #2440 from glowe/prevent-duplicate-checks
...
Temporarily disable CAPA problem "Check" button.
2014-04-10 11:37:52 -04:00
Muhammad Ammar
5b6f3f8fbf
Convert first batch of lettuce video tests to bok-choy.
2014-04-10 15:18:03 +00:00
Adam
3fd89a0db4
Merge pull request #3297 from edx/merge-release-into-master
...
Merge release into master
2014-04-10 09:48:03 -04:00
Jay Zoldak
2c500a2b67
Merge pull request #3289 from edx/zoldak/quiet-acceptance-test-logs
...
Quiet some noisy loggers for lettuce acceptance tests
2014-04-10 09:29:52 -04:00
Andy Armstrong
8059547ed8
Merge pull request #2981 from edx/andya/container-editing
...
Add "Edit" button to each leaf xblock on the container page
2014-04-10 09:29:32 -04:00
Greg Price
8c8367b055
Merge pull request #3183 from edx/gprice/inline-response-pagination
...
Add repsonse pagination to inline discussions
2014-04-09 17:55:15 -04:00
Mark Hoeber
8609345bc3
Merge pull request #3298 from edx/markhoeber/documentation/doc-79
...
Fixed typo in drag & drop
2014-04-09 17:29:49 -04:00
Mark Hoeber
581702e1cb
Fixed typo in drag & drop
...
numbers -> number
2014-04-09 17:22:19 -04:00
Adam Palay
b34c46ddb1
Merge remote-tracking branch 'origin/release' into merge-release-into-master
2014-04-09 17:16:19 -04:00
Greg Price
16847d85a9
Add bok-choy tests for inline response pagination
2014-04-09 16:56:20 -04:00
Frances Botsford
df0973e771
addressing review feedback
2014-04-09 16:45:22 -04:00
Adam
0fb3a7d20f
Merge pull request #3282 from edx/hotfix/2014-04-09
...
Hotfix 2014-04-09
2014-04-09 15:50:21 -04:00
Jay Zoldak
66a8685866
Merge pull request #3281 from edx/zoldak/fix-video-feature-name
...
Fix video feature name so the test results roll up correctly
2014-04-09 15:36:37 -04:00
Jay Zoldak
579e66fe88
Quiet some noisy loggers for lettuce acceptance tests
2014-04-09 14:40:50 -04:00
Mark Hoeber
430827d394
Merge pull request #3286 from edx/markhoeber/documentation/doc-254
...
Removal of JS input chapter
2014-04-09 14:33:58 -04:00
Carson Gee
13af6fc1ee
Refactored terminology and added loop break for optimization
2014-04-09 14:10:52 -04:00
Mark Hoeber
0abedac38f
Removal of JS input chapter
...
DOC-254
2014-04-09 13:55:35 -04:00
Andy Armstrong
2bf64d76d7
Remove feature flag for testing on container pages
2014-04-09 13:52:21 -04:00
Andy Armstrong
b78508a1f9
Indicate LaTex problems with a specific class on the editor
2014-04-09 13:33:01 -04:00
Carson Gee
4844a50405
Add test in import code to make sure two overlapping courses aren't imported
2014-04-09 12:54:12 -04:00
Andy Armstrong
a3e26e6824
Implement next round of code reviews
2014-04-09 12:15:38 -04:00
srpearce
7154ecca9e
Merge pull request #3266 from edx/sylvia/documentation/DOC-265
...
Add info about accessing student progress through steps
2014-04-09 12:11:01 -04:00
Sylvia Pearce
7c8dbcf53b
Document Course Staff Information field
2014-04-09 12:09:17 -04:00
Andy Armstrong
d55ad61801
Make the LaText source compiler link visible
2014-04-09 10:59:51 -04:00
Anton Stupak
a84bca233f
Merge pull request #3246 from edx/anton/i18n-lti
...
LTI i18n
2014-04-09 17:59:27 +03:00
Greg Price
5f337df639
Change behavior of cohort addition interface
...
Instead of noting users that are already in a cohort and not changing
such users, clobber the previous cohort and display a message indicating
the previous cohort membership.
JIRA: FOR-452
2014-04-09 10:51:11 -04:00
Andy Armstrong
2ae28c5db7
Improve unit testing of xblock editing
2014-04-09 10:32:13 -04:00
Andy Armstrong
9de6f1016c
Fix typo in textbook_spec.js
2014-04-09 10:32:13 -04:00
Andy Armstrong
a6aae729b7
Address the next round of review comments.
2014-04-09 10:32:13 -04:00
Andy Armstrong
88d95d119c
Rebuild the way modals are constructed to support nesting.
2014-04-09 10:32:13 -04:00
Andy Armstrong
b779b8a6fb
Add unit tests for custom tabs and modal titles
2014-04-09 10:32:13 -04:00
Andy Armstrong
5ab159b079
Try to fix the failing JavaScript test
2014-04-09 10:32:12 -04:00
Andy Armstrong
230c0b5b73
Add more improvements from the review.
2014-04-09 10:32:12 -04:00
Frances Botsford
b23f17dbe7
removed commented out lines
2014-04-09 10:32:12 -04:00
Andy Armstrong
07c54dcbaa
Fix up edit_component so that it doesn't take an unnecessary step argument
2014-04-09 10:32:12 -04:00
Andy Armstrong
415fe8d396
Clean up the logic for the edit modal's title
2014-04-09 10:32:12 -04:00
Andy Armstrong
dce075a852
Changes based upon code review comments
2014-04-09 10:32:12 -04:00
Frances Botsford
e18dd7f50a
fixed mixin sass
2014-04-09 10:32:12 -04:00
Andy Armstrong
052949d700
Fix unit tests
2014-04-09 10:32:12 -04:00
Frances Botsford
ee42902ee6
removed edit-dialog and uploads css, changed component edit icon to pencil, small css fixes
2014-04-09 10:32:11 -04:00
Frances Botsford
636fa19033
small ui fixes in Studio - textbooks upload and loading font-size
2014-04-09 10:32:11 -04:00
Frances Botsford
2425aab979
maintain scroll position after closing the component editing modal in Studio
2014-04-09 10:32:11 -04:00
Andy Armstrong
df32f109c7
Refactor test logic for switching editor tabs
2014-04-09 10:32:11 -04:00
Frances Botsford
be8e99444a
making chrome scroll up when showing the component menu on the Studio unit page
2014-04-09 10:32:11 -04:00
Andy Armstrong
4f85228e66
Make tab name comparison case-insensitive
2014-04-09 10:32:11 -04:00
