Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,512 Commits 1 Branch 0 Tags
db5eee878afffd4eebd5d8a6ead28263cd38e4d1
Commit Graph

4570 Commits

Author SHA1 Message Date
Frances Botsford
0309b3ad10 fix for fuzzy prompt on Studio Pages 2014-04-11 13:06:22 -04:00
Anton Stupak
24b631f702 Merge pull request #3231 from edx/anton/refactor-speed-control 
Video: Refactor speed control.
 2014-04-11 19:38:04 +03:00
Nimisha Asthagiri
fe4bd4cbad Merge pull request #3234 from edx/nimisha/container-duplicate-delete 
Nimisha/container duplicate delete
 2014-04-10 22:10:33 -04:00
Frances Botsford
48d935d715 fix for fuzzy prompt on container page 2014-04-10 21:22:20 -04:00
Nimisha Asthagiri
dd3c8c268c Support for Duplicate and Delete of XBlock Container Leaves (disabled under Feature Flag). 2014-04-10 21:22:15 -04:00
jsa
72c3c87c84 in Studio, render compact placeholders for inline discussions. 
JIRA: FOR-429
 2014-04-10 15:44:30 -04:00
Jay Zoldak
9957b1aa8e Disable discussion service setting for lettuce tests 2014-04-10 11:51:20 -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
Frances Botsford
df0973e771 addressing review feedback 2014-04-09 16:45:22 -04:00
Jay Zoldak
579e66fe88 Quiet some noisy loggers for lettuce acceptance tests 2014-04-09 14:40:50 -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
Andy Armstrong
a3e26e6824 Implement next round of code reviews 2014-04-09 12:15:38 -04:00
Andy Armstrong
d55ad61801 Make the LaText source compiler link visible 2014-04-09 10:59:51 -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
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
Andy Armstrong
7770d9d427 Implement editing from the Studio container page. 
STUD-1306
 2014-04-09 10:32:11 -04:00
zubair-arbi
adbb9f9562 Merge pull request #3216 from edx/zub/bugfix/std1506-savedate 
save dates on enter key press
 2014-04-09 18:51:25 +05:00
polesye
f0492b3bb1 Refactor speed control. 2014-04-09 12:16:22 +03:00
zubiar-arbi
0b884cc3b8 save dates on enter key press 
STUD-1506
 2014-04-09 13:02:11 +05:00
Waheed Ahmed
09972c7973 Message changed for course import when timeout. 
STUD-1283
 2014-04-09 11:54:06 +05:00
Will Daly
08413afdfd Allow import of native XBlocks in draft 
Added tests for importing a pure XBlock
 2014-04-08 07:52:11 -04:00
cahrens
aade444f00 Move overview drag and drop code to a utility class. 2014-04-05 17:03:18 -04:00
chrisndodge
c407e89889 Merge pull request #2781 from edx/cdodge/password-history-enforcements 
Add some optional policies around password resets, such as password reus...
 2014-04-04 16:14:43 -04:00
polesye
d55554705f BLD-958: Force video player in flash mode. 2014-04-04 14:53:14 +03:00
Christina Roberts
dfed60fa8c Merge pull request #3163 from edx/christina/advanced-settings-font 
Use monospaced font for CodeMirror editor.
 2014-04-03 14:58:56 -04:00
cahrens
3d7915fa56 Use monospaced font for CodeMirror editor. 
Cursor position gets off with non-monospaced font.
STUD-1456.

Vertical alignment of monospace font in advanced settings via position css adjustment
 2014-04-03 13:11:08 -04:00
Christina Roberts
d6a0d6f06c Merge pull request #3180 from edx/christina/iframe_binding_bug 
Check iframe src for the specific value TinyMCE uses.
 2014-04-03 10:11:43 -04:00
zubair-arbi
048962874e Merge pull request #3150 from edx/waheed/stud1483-cannot-handle-more-than-9-lines-advanced-settings 
Fixed studio can't handle more than 9 lines in advanced settings.
 2014-04-03 18:42:39 +05:00
Alexander Kryklia
668134de4a Merge pull request #3169 from edx/alex/fix_more_flaky_tests 
Alex/fix more flaky tests
 2014-04-03 15:34:18 +03:00
Alexander Kryklia
41695def9e Merge pull request #3136 from edx/alex/display_native_language_2 
Alex/display native language 2
 2014-04-03 15:06:04 +03:00
Alexander Kryklia
cf3e2c860b Fix flaky video tests: speed up youtube api loading and wait for controls. 2014-04-03 14:37:17 +03:00
Alexander Kryklia
80635a9995 Merge pull request #3149 from edx/alex/fix_flaky_test 
Fix flaky acceptance test.
 2014-04-03 12:20:42 +03:00
Ned Batchelder
732bf3f307 Fix hash_resource to avoid encode errors. 2014-04-02 20:13:50 -04:00