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

22077 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zubair-arbi
22205c35c8 Merge pull request #2985 from edx/zub/story/deletecoursefromlocmapper 
remove course location from loc_mapper on delete
 2014-03-25 12:44:04 +05:00
Dave St.Germain
3539c56f89 Added image tags to the whitelist for matlab 2014-03-24 18:53:07 -04:00
Adam
8aaabd7461 Merge pull request #3041 from edx/adam/fix-data-download 
fix typo in data download tab (LMS-2441)
 2014-03-24 14:43:58 -04:00
Dave St.Germain
93844b3ad1 Merge pull request #3025 from edx/dcs/fix-matlab-response 
Fixes BLD-948 by escaping messages from xqueue, preventing malformed
 2014-03-24 13:54:36 -04:00
Dave St.Germain
5cb145054d Fixes BLD-948 by escaping messages from xqueue, preventing malformed 
html from getting onto the page. The client will then unescape the html
and display it.
 2014-03-24 13:28:08 -04:00
Sarina Canelake
2244ba5ef2 Merge pull request #3028 from edx/sarina/LMS-2262 
More helpful UX in beta membership widget
 2014-03-24 13:24:01 -04:00
Sarina Canelake
4398443fe8 Merge pull request #3036 from edx/sarina/032414-language-update 
032414 Language update
 2014-03-24 13:22:46 -04:00
Valera Rozuvan
14ef43e961 Merge pull request #3039 from edx/valera/separate_youtube_urls 
Moved all YouTube related URLs to a separate namespace.
 2014-03-24 19:14:59 +02:00
Valera Rozuvan
1c8eed853e Moved all YouTube related URLs to a separate namespace. 
All YouTube urls are defined on backend side.
 2014-03-24 18:40:28 +02:00
Alexander Kryklia
156b531293 Merge pull request #2732 from edx/alex/fix_typo 
Fix typo in transcripts_utils.
 2014-03-24 18:20:46 +02:00
Sarina Canelake
7da3819154 Update translations (autogenerated message) 2014-03-24 12:18:26 -04:00
Sarina Canelake
76a2ac9833 Add Malaysian, Catalan languages 2014-03-24 12:18:25 -04:00
Sarina Canelake
c2ede18de5 More helpful UX in beta membership widget 
LMS-2262
 2014-03-24 12:16:41 -04:00
Adam Palay
f1c19d02d7 fix typo in data download tab (LMS-2441) 2014-03-24 12:00:38 -04:00
Andy Armstrong
f3c23e89d5 Merge pull request #3027 from edx/andya/asset-loading-indicator 
Add a loading indicator to the Files & Uploads page.
 2014-03-24 11:53:38 -04:00
Andy Armstrong
664f78dcb1 Merge pull request #2657 from edx/christina/tinymce-upgrade 
Upgrade TinyMCE and switch to CodeMirror plugin
 2014-03-24 11:53:17 -04:00
David Baumgold
e55bca6bf1 Merge pull request #3023 from edx/db/unicode-server-error-page 
Unicode strings for server error page
 2014-03-24 11:24:02 -04:00
Alison Hodges
0a6bb2734f Merge pull request #2934 from edx/ahodges/documentation/ABanalytics 
Updates for DOC-83, new SQL table and event types for A/B testing
 2014-03-24 11:10:12 -04:00
Alison Hodges
0de52014d0 Updates for DOC-83, new SQL table and event types for A/B testing 2014-03-24 11:09:36 -04:00
Andy Armstrong
f92c337235 Add a loading indicator to the Files & Uploads page. 2014-03-24 10:51:36 -04:00
cahrens
c8eaa53452 Fix typos. 2014-03-24 10:49:29 -04:00
cahrens
7b24172614 Update tests for minor UI changes. 
Code editor button no longer shows an icon, and code style toolbar button location has moved.
 2014-03-24 10:45:09 -04:00
zubiar-arbi
9d04a9270b remove course location from loc_mapper on delete 2014-03-24 19:26:19 +05:00
Ned Batchelder
3db4f43fe4 Merge pull request #3009 from jazkarta/upgrade-jsdraw-input 
Upgrade jsdraw input to latest version.
 2014-03-24 10:05:08 -04:00
cahrens
1cd6e1dc7e Move code style block button. 2014-03-24 09:44:00 -04:00
cahrens
0953583d38 Change code editor icon to say HTML. 2014-03-24 09:44:00 -04:00
Frances Botsford
ed51a664f4 replaced code icon in TinyMCE editor; simplified UI on TMCE toolbar 2014-03-24 09:42:12 -04:00
Sarina Canelake
ca6850284d Merge pull request #3020 from edx/sarina/LMS-2357 
Finish i18n of beta instructor dashboard
 2014-03-24 09:11:24 -04:00
Anton Stupak
c2866949fc Merge pull request #2953 from edx/anton/check-transcripts-in-china 
Video: Add acceptance test to verify transcripts for non-Youtube countries.
 2014-03-24 11:48:14 +02:00
polesye
bd4be00ae4 BLD-534: Add acceptance test. 2014-03-24 08:47:12 +02:00
Mark Hoeber
982f24aed1 Merge pull request #3026 from edx/markhoeber/documentation/STUD-1458 
Update to page help on new Pages page in Studio
 2014-03-23 12:38:20 -04:00
Jay Zoldak
ee99ca4509 Merge pull request #3031 from edx/zoldak/disable-failing-bok-choy-test 
Disable failing bok-choy test_acid_block_editor test
 2014-03-22 09:48:46 -04:00
Jay Zoldak
0931c76a2a Disable failing bok-choy test_acid_block_editor test 2014-03-22 09:18:31 -04:00
Jay Zoldak
d88d86120e Merge pull request #3017 from edx/zoldak/bok-choy-version-upgrade 
Update edx-platform page objects and tests
 2014-03-22 08:32:48 -04:00
Jay Zoldak
bb8800d499 Disable intermittently failing ORA tests 2014-03-22 07:50:44 -04:00
Jay Zoldak
a00007b837 Merge pull request #3024 from edx/zoldak/update-se-version 
Update selenium version
 2014-03-22 07:45:02 -04:00
Sarina Canelake
454da6fefc i18n Inst Dash enrolled students profile table 
LMS-2357
 2014-03-21 17:49:13 -04:00
Sarina Canelake
c2933d9221 i18n Inst Dash pending tasks table 
LMS-2357
 2014-03-21 17:49:13 -04:00
Sarina Canelake
7cf093606c i18n Inst Dash Email tab 
LMS-2357
 2014-03-21 17:49:13 -04:00
Sarina Canelake
8dd1210cfc i18n Inst Dash Analytics tab 
LMS-2357
 2014-03-21 17:49:12 -04:00
Sarina Canelake
71931bcf0f i18n Inst Dash Membership tab 
LMS-2357
 2014-03-21 17:49:12 -04:00
Joe Blaylock
1fe68fafa2 Merge pull request #2530 from edx/jrbl/certs_regen_handy_flags 
Certificates: Additional flags for regenerate_user
 2014-03-21 14:36:25 -07:00
Jay Zoldak
db615248cb Update Authors file to add Raees and Ammar 2014-03-21 17:10:22 -04:00
Jay Zoldak
8135f4d413 Temporarily disable video autoplay selenium tests 2014-03-21 17:10:22 -04:00
Jay Zoldak
806a6b9f99 Update edx-platform page objects and tests to be compatible with new bok-choy version 
Change expectedFailure decorators to skip, because that still takes
a screenshot as if it were an error and at least one of those
take a super long time when running locally on devstack.
 2014-03-21 17:10:15 -04:00
cahrens
8f6980b212 Use compressed CodeMirror file. 2014-03-21 16:41:42 -04:00
Mark Hoeber
d752894604 Update to page help on new Pages page in Studio 
STUD-1458

Modified the edit-tabs template and the preview-lms-staticpages image
used in the modal.
 2014-03-21 16:33:26 -04:00
Frances Botsford
9054c621fc keeping the component editor inside the component window 2014-03-21 15:47:32 -04:00
Jay Zoldak
cd81b5aa2b Temporarily disable video autoplay selenium tests 2014-03-21 15:47:24 -04:00
cahrens
a9b918404b Remove unnecessary helper method. 2014-03-21 15:40:53 -04:00