Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,076 Commits 1 Branch 0 Tags
844eaeffca7d29adecfc30c76370101e3fc9dbe9
Commit Graph

24076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Piotr Mitros
afe22ca42e Review from Cale 2014-06-20 10:57:11 -04:00
Piotr Mitros
e644f641ac Explicit disable_accordion 2014-06-20 10:29:17 -04:00
Piotr Mitros
17d2420f7b Removed suppress_top_level_nav, as per Cale 2014-06-20 10:23:16 -04:00
Muhammad Ammar
15839147c2 Youtube Video Quality Button Tests 2014-06-20 13:48:27 +00:00
clytwynec
7ff3f08f92 Merge pull request #4159 from edx/clytwynec/updating_update_assets_prereqs 
stop update_assets commands from being called extra times
 2014-06-20 09:22:10 -04:00
Mat Peterson
3a35121099 Useless code path in import_from_xml causing errors removed 2014-06-20 13:21:40 +00:00
Mark Hoeber
a6972c9969 Merge pull request #4173 from edx/markhoeber/documentation/doc-582 
Add new doc projects to top level make file
 2014-06-20 08:45:45 -04:00
Piotr Mitros
4f303a623b XBlocks can disable navigation chrome. 
There is an option to:
* Enable/disable accordion navigation
* Enable/disable/repoint tab navigation

This allows for full-screen XBlocks (e.g. a code IDE, or large video
player). It is also the first pass at allowing top-level XBlocks. It's
also now possible to make a chromeless XBlock, point a tab to it, and
make it point back to that tab.

Next steps down that path would be:
* Fix up how tabs are handled. The current version is a hack.
* Create appropriate XBlocks for courseware, tabbed navigation,
  etc. to reach feature parity
* Invert/rejigger the XML format.
 2014-06-19 21:06:08 -04:00
Mark Hoeber
50f41c24f0 Add new doc projects to top level make file 
To enable Jenkins testing
 2014-06-19 20:50:45 -04:00
muhammad-ammar
0258e71ab1 Merge pull request #4146 from edx/ammar/remove-flash-test-scenarios 
Remove Flash Test Scenarios
 2014-06-20 00:08:40 +05:00
lduarte1991
95c0738361 Annotation Tools: Removed background-color from image annotations 
- Also fixed edit bug when annotation is not created first
- Also fixed indentation issues
 2014-06-19 13:52:44 -04:00
clytwynec
f6d5d73010 Merge pull request #4117 from edx/clytwynec/rake2paver-bokchoy 
deprecating bok-choy tasks from rake to paver
 2014-06-19 13:45:33 -04:00
Jim Abramson
d18d078e4e Merge pull request #4143 from edx/jsa/forums-search-users-ux 
forums: add UX for username search results.
 2014-06-19 11:43:03 -04:00
jsa
e6871af2d3 forums: add UX for username search results. 
JIRA: FOR-627
 2014-06-19 11:33:52 -04:00
Piotr Mitros
6c3e95b3f1 Documentation for: Run a single test. I mean it. 2014-06-19 11:25:08 -04:00
Adam
7cc85b43e1 Merge pull request #4160 from edx/adam/browser-warning-lte-ie8 
only display browser warning for <= IE8 (LMS-2732)
 2014-06-19 09:48:41 -04:00
clytwynec
49a2369eb2 Update testing.md 2014-06-19 09:06:41 -04:00
Christine Lytwynec
d6ed01bbf0 deprecating bok-choy tasks from rake to paver 2014-06-19 09:06:41 -04:00
clytwynec
e2936d0eb2 Merge pull request #4020 from edx/clytwynec/rake2paver-i18n 
Clytwynec/rake2paver i18n
 2014-06-19 09:03:33 -04:00