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

22331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Usman Khalid
12c2e1bfee Test TemplateLookup dirs are not cleared during lms startup. 
LMS-2498
 2014-04-03 20:23:44 +05:00
Stephen Sanchez
751bd71a7b Merge remote-tracking branch 'origin/release' 2014-04-03 11:06:09 -04:00
Mark Hoeber
9e00d6f0c4 Merge pull request #3172 from edx/markhoeber/documentation/doc-248 
Release notes for 4/2/14
 2014-04-03 10:54:05 -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
Dave St.Germain
c202e2aa6f Merge pull request #3177 from edx/dcs/paver-one-watcher 
Fixes potential 'too many open files error' when running all servers.
 2014-04-03 10:02:58 -04:00
Mark Hoeber
6dc4640f92 Release notes for 4/2/14 
DOC-248
 2014-04-03 09:57:28 -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
Mark Hoeber
4be9c06d1b Merge pull request #3078 from edx/markhoeber/documentation/stud-1443 
Documentation for Pages and Wiki changes
 2014-04-03 09:29:09 -04:00
Mark Hoeber
0a8d07c0c3 Documentation for Pages and Wiki changes 
STUD-1443
 2014-04-03 09:27:49 -04:00
Jay Zoldak
b0859941e6 Merge pull request #3181 from edx/zoldak/fix-acid 
Add synchronization for rendering to studio xblock tests
 2014-04-03 09:24:09 -04:00
Alexander Kryklia
70db47a73d Merge pull request #3201 from edx/alex/fix_971 
Fix flaky video test #21: increase timeout.
 2014-04-03 16:13:09 +03: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
221f4e2363 Fix flaky video test #21: increase timeout. 2014-04-03 14:34:12 +03:00
Alexander Kryklia
fab43e1a68 Merge pull request #3199 from edx/alex/fix_flaky_video_test_20 
Alex/fix flaky video test 20
 2014-04-03 14:32:06 +03:00
Alexander Kryklia
e3902cbebc Merge pull request #3198 from edx/alex/fix_flaky_video_test_12 
Fix flaky test #12
 2014-04-03 14:31:06 +03:00
Alexander Kryklia
c3f9943802 Fix lms video #20: scroll view to be clickable. 2014-04-03 13:17:32 +03:00
Alexander Kryklia
2a39d28348 Fix flaky test #12 
"CC button works correctly w/o english transcript in HTML5 mode of Video component"
 2014-04-03 12:45:38 +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
11d078a9cc Merge pull request #3192 from edx/ned/fix-encode-error-when-hashing-resources 
Fix hash_resource to avoid encode errors.
 2014-04-02 22:03:00 -04:00
Ned Batchelder
732bf3f307 Fix hash_resource to avoid encode errors. 2014-04-02 20:13:50 -04:00
Mark Hoeber
f275f5424b Merge pull request #3165 from edx/markhoeber/documentation/doc-188 
Initial Reorg of Setting up Course
 2014-04-02 16:26:49 -04:00
Mark Hoeber
69ed998474 Reorganizatio of Setting up Course 
DOC-188
 2014-04-02 16:26:20 -04:00
Ned Batchelder
bda1471cdf Merge pull request #3178 from edx/ned/private-requirements-in-paver 
Paver should install requirements/private.txt
 2014-04-02 16:23:42 -04:00
Valera Rozuvan
65a9ce24dd Merge pull request #3170 from edx/valera/remove_ipython_dependent_methods 
Remove a method call which depends on IPython.
 2014-04-02 23:18:51 +03:00
Stephen Sanchez
eb4096f1a6 Merge pull request #3186 from edx/sanchez/update_ora2_hash 
Updating the hash of the ORA2 release candidate in the requirements
 2014-04-02 16:07:17 -04:00
Stephen Sanchez
e6e818a5a2 Updating the hash of the ORA2 release candidate in the requirements 2014-04-02 16:05:54 -04:00
Calen Pennington
af486423c8 Merge pull request #3179 from cpennington/problem-check-metrics 
Rename metrics so that we capture checks as well as scores and number of attempts
 2014-04-02 15:34:00 -04:00
Christina Roberts
269cd19abe Merge pull request #3155 from edx/christina/tinymce-update-cdn2 
Upgrade TinyMCE to 4.0.20 and replaced tabbed HTML editor
 2014-04-02 13:55:50 -04:00
Jay Zoldak
86cfda32b3 Add synchronization for rendering to studio xblock tests 2014-04-02 13:54:33 -04:00
cahrens
cc275a9347 Check iframe src for the specific value TinyMCE uses. 
STUD-1470
 2014-04-02 13:48:13 -04:00
Mark Hoeber
42a1f6e35b Merge pull request #3116 from edx/ahodges/documentation/launching 
Ahodges/documentation/launching
 2014-04-02 13:47:18 -04:00
Alison Hodges
e79cc796fa Initial draft and images for LMS-2381 2014-04-02 13:46:49 -04:00
David Baumgold
092d620185 Merge pull request #3147 from mtyaka/password-reset-email-http 
Don't hardcode https protocol in password reset email.
 2014-04-02 13:46:45 -04:00
Valera Rozuvan
638da490ad Remove a method call which depends on IPython. 
Because IPython is not part of edx-platform dependencies, the
method assert_in has to be defined.
 2014-04-02 16:36:24 +00:00
Stephen Sanchez
ca7ada624a Merge pull request #3176 from edx/hotfix/revert-openended-i18n 
Revert "Open ended panel headings not internationalized."
 2014-04-02 11:55:58 -04:00
Calen Pennington
7e23e2655a Rename metrics so that we capture checks as well as scores and number of attempts 2014-04-02 11:54:30 -04:00
Ned Batchelder
beb1d74029 Paver should install requirements/private.txt 2014-04-02 11:52:46 -04:00
Dave St.Germain
7d38c493f7 Fixes potential 'too many open files error' when running all servers. 2014-04-02 11:45:00 -04:00
Calen Pennington
3aecaba76f Merge pull request #3168 from cpennington/fix-lms-2489 
Fix bad interaction between pluggable InputTypes and Microsites
 2014-04-02 11:21:55 -04:00
cahrens
e4de5d2eda Match our default code editor font size of 13. 2014-04-02 11:12:34 -04:00
Brian Talbot
473ed4cc89 Studio: syncing up font-based styling between TinyMCE editing view and Studio HTML xmodule preview 
Separating and documenting tinyMCE font imports from customized vendor code and customized render styling css files (because font must load first in iframe).

Add the TinyMCE font file to the CMS pipeline.
 2014-04-02 11:12:34 -04:00
cahrens
b04a0d9986 Update default font size to 14 for bulk e-mail editor (LMS). 2014-04-02 11:12:34 -04:00
Brian Talbot
cc15a267ae revising default (minified) TinyMCE content CSS to be scoped to .mce-content-body element 2014-04-02 11:12:34 -04:00
Brian Talbot
6443486dd0 scoping TinyMCE editing CSS to just tinyMCE context-based elements 2014-04-02 11:12:33 -04:00
cahrens
9d9b2b8e18 Directions for creating codemirror-compressed.js 2014-04-02 11:12:33 -04:00
cahrens
aaf842f83a Add dialog plugin code to compressed JS file and CSS file. 
Needed for TinyMCE CodeMirror plugin.
 2014-04-02 11:12:33 -04:00
Frances Botsford
786b416bad removing tinymce button border only on active to counteract fun LMS button styles 2014-04-02 11:12:33 -04:00
Nimisha Asthagiri
f44a1b6c1c Tiny MCE version 4.0.20 
Changed tiny-MCE to not load CSS files dynamically.
Added CSS files for tiny-MCE in env files.
Moved TinyMCE files to directory structure required by Jake command.
Changed clients of "tinymce.min.js" to use "tinymce.full.min.js" instead.
Updated CHANGELOG to indicate tinymce version 4.0.20.
Renamed tinymce.css.
Directions for creating tinymce.full.min.js and commenting of edX changes.
Updated comments related to disabling dynamic JS and CSS file loading in tinymce.
Allow TinyMCE to handle CSS within the iframe.
 2014-04-02 11:12:26 -04:00