Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
clytwynec
e67155b104 Merge pull request #4197 from edx/sarina/remove-en@-translations 
Remove pirate and lolcat translation files to prevent accidental display
 2014-06-24 12:30:03 -04:00
Sarina Canelake
f7c3603fa8 Remove pirate and lolcat translation files to prevent accidental display 2014-06-24 11:51:32 -04:00
Oleg Marshev
715fde27c4 Redirect Chinese students to a Chinese CDN for video. 2014-06-24 18:39:52 +03:00
Adam
a053dfbbd8 Merge pull request #4192 from edx/adam/change-logging-level-gradding 
Lower logging level in grading condition from exception to info
 2014-06-24 10:34:48 -04:00
polesye
584da69bee Fix unit test. 2014-06-24 14:26:02 +03:00
Alexander Kryklia
03ad6584db Merge pull request #4181 from edx/alex/allow_bok_choy_in_dev_env 
Add possibility to run bok_choy tests in local env.
 2014-06-24 12:20:52 +03:00
Adam Palay
d9f0a6ba68 Lower logging level in grading condition from exception to info 
addresses part of LMS-2907
 2014-06-23 16:50:28 -04:00
Adam Palay
6b1a7dc259 Prevents students from accidentally changing their enrollment on login (LMS-2773) 
skip tests if not run in lms
 2014-06-23 16:49:04 -04:00
Ned Batchelder
844eaeffca Merge pull request #4184 from IONISx/tusbar/add-mktg-check-dropdown 
Remove FAQ link in header when disabled
 2014-06-23 16:43:37 -04:00
Dave St.Germain
d9bb5365dd Merge pull request #3982 from edx/dcs/move-i18ntools 
Moved i18n tools to i18n-tools repo
 2014-06-23 16:35:50 -04:00
Ned Batchelder
a3cd274dec Update to the i18n-tools with the underscore processing 2014-06-23 16:30:13 -04:00
Adam Palay
bd2f3c75f5 Explicitly skip tests in common unless we know we're running the LMS unittest suite 2014-06-23 16:28:53 -04:00
Adam
970d8dd2d0 Merge pull request #4190 from edx/usman/lms2848-htmlbooks-fix 
Fix for htmlbooks
 2014-06-23 16:16:12 -04:00
Dave St.Germain
94cd1e659d Change reference to installed i18n command. 2014-06-23 15:21:40 -04:00
Piotr Mitros
4eb234e79f Merge pull request #4174 from edx/pmitros/chromeless-xblocks 
XBlocks can disable navigation chrome.

This allows for full-screen XBlocks (such as code IDEs), as well as allowing us to somewhat hackishly build top-level XBlocks. This is the first step on the path to non-hackish top-level XBlocks.
 2014-06-23 11:56:05 -04:00
polesye
a52b25779d Use confirm dialogue. 2014-06-23 18:24:53 +03:00
polesye
2d8e1226c8 Move js import into courseware js group. 2014-06-23 17:56:28 +03:00
polesye
2629b48de8 Fix unit test. 2014-06-23 17:56:28 +03:00
polesye
2c27c424f9 Update error code. 2014-06-23 17:56:28 +03:00
polesye
11c2bb19af Add url redirect to. 2014-06-23 17:56:27 +03:00
polesye
00d7760dc6 Add redirect. 2014-06-23 17:56:27 +03:00
Adam
2b1712afe1 Merge pull request #4170 from lduarte1991/lduarte-harvardx-pr6 
Annotation Tools: Removed background-color from image annotations
 2014-06-23 10:24:53 -04:00
Will Daly
6208969d20 Merge pull request #4185 from edx/will/ora2-release-2014-06-23T13.19 
ORA2 release-2014-06-23T13.19
 2014-06-23 10:09:56 -04:00
Dave St.Germain
834c2c472f Moved test_generate from i18n-tools 2014-06-23 10:06:28 -04:00
Dave St.Germain
e6ec664ac0 remove tests, and bump version 2014-06-23 10:05:33 -04:00
Dave St.Germain
a6ffe8c12d Moving these tools to i18n-tools repo 2014-06-23 10:05:33 -04:00
Alison Hodges
dc22e69607 Merge pull request #4180 from edx/ahodges/documentation/preface 
Corrected all links in preface, added to dev and data guides
 2014-06-23 09:37:32 -04:00
Bertrand Marron
ae3d9feb7e Remove FAQ link in header when disabled 2014-06-23 15:24:54 +02:00
Will Daly
c16bdf332b ORA2 release-2014-06-23T13.19 2014-06-23 09:23:33 -04:00
Sarina Canelake
f86e7dbf87 Merge pull request #4183 from edx/sarina/062314-language-update 
Sarina/062314 language update
 2014-06-23 08:49:50 -04:00
Sarina Canelake
6b2164d455 Update translations (autogenerated message) 2014-06-23 08:36:32 -04:00
Alexander Kryklia
a7251e06d4 Add possibility to run bok_choy tests in local env. 2014-06-23 14:44:48 +03:00
Sarina Canelake
9fb2731a57 Add Amharic language 2014-06-23 07:42:39 -04:00
Sarina Canelake
54cf1adb86 Add Tamil language 2014-06-23 07:42:39 -04:00
Usman Khalid
d36e00d4a5 Pass storage_url and token values as parameters to StudentNotes init. 
LMS-2848
 2014-06-23 16:38:02 +05:00
Usman Khalid
f253f9a784 Added mising tinymce.js to static_htmlbook.html. 
LMS-2848
 2014-06-23 16:10:02 +05:00
Alison Hodges
52f6f1a372 Corrected all links in preface, added to dev and data guides 2014-06-22 14:56:29 -04:00
lduarte1991
cd9c6c5f3e Annotations Tools: Commented OSDA code and added clarification to catch changes 2014-06-21 16:25:53 -04:00
Alison Hodges
7673c13c7f Merge pull request #4164 from edx/ahodges/documentation/DOC392 
Draft for DOC-392
 2014-06-20 16:42:47 -04:00
Alison Hodges
e84c7a0198 Fixes: DOC-392, shared preface listing resources for different types of audiences 2014-06-20 16:42:06 -04:00
Andy Armstrong
20675857dc Merge pull request #3999 from edx/christina/updating-split-test 
Ability to change the associated group configuration for a split test
 2014-06-20 14:15:41 -04:00
Andy Armstrong
4b4736cc77 Disable periodically failing Bok Choy test 2014-06-20 14:15:18 -04:00
muhammad-ammar
46541eb8a5 Merge pull request #4112 from edx/ammar/youtube-video-quality-tests 
Youtube Video Quality Button Tests
 2014-06-20 22:42:58 +05:00
Don Mitchell
7e2bdeb367 Merge pull request #4155 from edx/dhm/stud-1654 
Ensure all split methods consuming Keys check that key is fully specified
 2014-06-20 13:33:15 -04:00
Mathew Peterson
8ccd72c885 Merge pull request #4158 from edx/mathewpeterson/course_import_fix 
Useless code path in import_from_xml causing errors removed
 2014-06-20 12:40:45 -04:00
cahrens
a395c2fa4b Complete Studio support for handling group configuration changes 
STUD-1658
 2014-06-20 11:41:23 -04:00
cahrens
73e7ced6f9 Introduce constants for studio_view, student_view, and author_view. 2014-06-20 11:41:23 -04:00
Andy Armstrong
11c25e8c1a Add Studio handling for changes to group configurations 
STUD-1658
 2014-06-20 11:41:22 -04:00
Christine Lytwynec
8239f0e783 stop update_assets commands from being called extra times 2014-06-20 11:41:22 -04:00
Piotr Mitros
87a462e206 Review from Cale 2014-06-20 11:07:30 -04:00