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
Mark Hoeber
814009e277 Merge pull request #2582 from edx/markhoeber/documentation/release-notes-02-12-14 
Markhoeber/documentation/release notes 02 12 14
 2014-02-12 16:15:48 -05:00
Christina Roberts
b0b8257eee Merge pull request #2543 from edx/christina/reference_bug 
Rewrite Reference and ReferenceList fields on import
 2014-02-12 16:07:37 -05:00
Ali Reza Sharafat
302b5746f3 Merge pull request #2334 from edx/ali123/course-short-description 
Changes to make the course short description editable in cms
 2014-02-12 12:51:49 -08:00
Greg Price
1c188c9f89 Send language preference to the comments service 2014-02-12 15:25:34 -05:00
Greg Price
5841d460f0 Clean up usage of CS API key 2014-02-12 15:24:30 -05:00
Ali Reza Sharafat
85058ec460 Course short descriptions -- couple of more asserts and pep8 fixes 2014-02-12 20:24:26 +00:00
cahrens
894c40b89d Change Reference and ReferenceList instances on import to new namespace. 
STUD-149
 2014-02-12 15:22:12 -05:00
Christina Roberts
89ac19e81f Merge pull request #2503 from edx/christina/conditional 
Conditional module changes to support Locator/Location conversion.
 2014-02-12 15:03:29 -05:00
Mark Hoeber
0818b47fab Merge pull request #2581 from edx/sylvia/documentation/TIM-137 
Sylvia/documentation/tim 137
 2014-02-12 14:56:09 -05:00
Sylvia Pearce
2c253b5ddc Update screen shots for advanced settings in Specialized Problems 2014-02-12 14:53:23 -05:00
Sylvia Pearce
651babfdd1 Remove specific advanced setting info from ORA 2014-02-12 14:52:27 -05:00
Mark Hoeber
acc9785b7e Merge pull request #2567 from edx/sylvia/documentation/BLD-701 
Add gene editor; update protein builder and molecule editor
 2014-02-12 14:26:20 -05:00
Sylvia Pearce
00929923a9 Add new Gene Explorer screen shot 2014-02-12 14:22:15 -05:00
Sylvia Pearce
f508bf11da Update info about gene explorer, molecule editor, and protein builder 2014-02-12 14:20:02 -05:00
cahrens
276c6e918e Store locations in ReferenceLists so they can be converted to locators. 
STUD-1027
 2014-02-12 14:08:24 -05:00
Mark Hoeber
a02beb6d31 Merge pull request #2519 from edx/markhoeber/documentation/stud-1258 
First draft of documentation for Image Modal tool
 2014-02-12 13:53:53 -05:00
Mark Hoeber
b3351c4569 Documentation for Image Modal tool 2014-02-12 13:53:18 -05:00
Mark Hoeber
8214daebed Removed css issue per Dave 2014-02-12 13:47:46 -05:00
Calen Pennington
17fda08c8d Enable XBlocks in bok_choy tests 2014-02-12 13:41:14 -05:00
Sarina Canelake
191bd2893e Merge pull request #2572 from edx/sarina/add-catalan 
Add Catalan (Valencia)
 2014-02-12 11:59:50 -05:00
Calen Pennington
869198e44b Merge pull request #2573 from cpennington/zub/bugfix/std1311-changestodraft 
Fix for STUD-1311
 2014-02-12 11:39:23 -05:00
Calen Pennington
4403eb7209 Fix STUD-1311 (Don't overwrite published content w/ draft content accidentally) 2014-02-12 11:11:01 -05:00
Sarina Canelake
75a7d69050 Add Catalan (Valencia) 2014-02-12 10:18:34 -05:00
zubiar-arbi
f7e78544de failing test for xblock_handler 
STUD-1311
 2014-02-12 10:13:58 -05:00
Anton Stupak
9b0c8d266e Merge pull request #2557 from edx/anton/revert-download-transcript-rc 
Video: Revert Download transcript button behavior.
 2014-02-12 12:41:43 +02:00
polesye
f957b34427 BLD-811: Revert functionality. 2014-02-12 12:05:02 +02:00
chrisndodge
25b127ef45 Merge pull request #2482 from edx-solutions/splash-screen 
splash-screen: Add ability to redirect to a splash screen URL
 2014-02-11 23:40:33 -05:00
Sarina Canelake
12e598cca7 Merge pull request #2531 from edx/sarina/LMS-2201 
i18n points possible display LMS-2201
 2014-02-11 19:07:50 -05:00
Sarina Canelake
defa2374a8 Merge pull request #2568 from edx/sarina/update-i18n-translator-docs 
Update i18n translator documentation
 2014-02-11 18:55:44 -05:00
Sarina Canelake
191aafe3f4 Update i18n translator documentation 2014-02-11 18:54:47 -05:00
Sarina Canelake
ba0fbf0762 i18n points possible display LMS-2201 2014-02-11 18:25:00 -05:00
Sylvia Pearce
8eb704b0dd Add gene editor; update protein builder and molecule editor 2014-02-11 17:37:54 -05:00
Sarina Canelake
41f7f55365 Merge pull request #2564 from edx/sarina/new-esperanto 
Update Esperanto (dummy) translation files
 2014-02-11 17:34:00 -05:00
David Adams
e5354f24be Merge pull request #2403 from edx/dcadams/tinymce_mods 
Addition of 3 TinyMCE plugins to toolbar
 2014-02-11 13:54:00 -08:00
Jason Bau
f3a969a9fc fix non-microsite SUBDOMAIN_BRANDING defaults 2014-02-11 12:41:16 -08:00
Sarina Canelake
0fb7b94924 Update Esperanto (dummy) translation files 2014-02-11 15:37:34 -05:00
frances botsford
ab4432db72 Merge pull request #2561 from edx/frances/studio/bug-editor-number-layout 
Fixed missing polyfill buttons and adjusted layout of number input 
UX-381
 2014-02-11 15:22:53 -05:00
Frances Botsford
34ea03c887 fixed missing polyfill buttons, adjusted layout of number input in component editor 
UX-381
 2014-02-11 15:20:00 -05:00
cahrens
09d90b16af Clean up of modulestore references (primarly LMS). 
STUD-1151
 2014-02-11 14:29:22 -05:00
Mark Hoeber
c3bbe5ea9e First draft 2-12-14 release notes 2014-02-11 14:28:06 -05:00
Xavier Antoviaque
e6f4f4f4f8 splash-screen: Add ability to redirect to a splash screen URL 
Checks for the presence of a cookie with specific values when activated,
and redirect the user to a configurable URL when it is not found, or not
with an accepted value.

To be used to display a splash screen to users upon the first visit.
It's the responsability of the splash page at the redirected URL to set
the proper cookie value before sending users back to the LMS.
 2014-02-11 14:26:19 -05:00
Frances Botsford
cf16eb052d fixes for verification ui discrepancies 
UX-351
 2014-02-11 14:13:25 -05:00
Anton Stupak
6be1fc841f Merge pull request #2554 from edx/anton/fix-video-import 
Video: Fix for Download Video link.
 2014-02-11 20:52:56 +02:00
Diana Huang
770df00921 Merge pull request #2493 from danielcebrian/daniel-branch-fix 
fixed conflict between Annotator and internationalitation
 2014-02-11 13:32:57 -05:00
Sarina Canelake
2e28279b57 Merge pull request #2560 from edx/sarina/fix-i18n-xmodule-sequence 
i18n Sequence XModule
 2014-02-11 13:28:23 -05:00
polesye
cebc0c47fd BLD-824: Download Video link missing from video player. 2014-02-11 20:17:22 +02:00
Sarina Canelake
47426f46e6 i18n Sequence XModule 2014-02-11 12:22:24 -05:00
Sarina Canelake
58565c6dc4 Merge pull request #2538 from edx/sarina/fixup-symmath 
pep8/pylint cleanup on symmath/formula.py
 2014-02-11 10:16:18 -05:00
Will Daly
8880faedbd Merge pull request #2558 from edx/will/more-robust-ora-page 
Ora page object retries even if rubric doesn't load
 2014-02-11 10:01:05 -05:00
Jay Zoldak
d0a1701b2a Merge pull request #2549 from edx/zoldak/things-not-to-translate 
Do not translate checkbox values in html files
 2014-02-11 09:51:57 -05:00