Commits · b0b8257eee917fdc58dd4a4afb816f20156a401f · edx / edx-platform · GitLab

12 Feb, 2014 18 commits
- Merge pull request #2543 from edx/christina/reference_bug · b0b8257e
```
Rewrite Reference and ReferenceList fields on import
```
  Christina Roberts committed Feb 12, 2014
  b0b8257e Browse Files
- Merge pull request #2334 from edx/ali123/course-short-description · 302b5746
```
Changes to make the course short description editable in cms
```
  Ali Reza Sharafat committed Feb 12, 2014
  302b5746 Browse Files
- Course short descriptions -- couple of more asserts and pep8 fixes · 85058ec4
  Ali Reza Sharafat committed Feb 12, 2014
  
  85058ec4 Browse Files
- Change Reference and ReferenceList instances on import to new namespace. · 894c40b8
```
STUD-149
```
  cahrens committed Feb 12, 2014
  894c40b8 Browse Files
- Merge pull request #2503 from edx/christina/conditional · 89ac19e8
```
Conditional module changes to support Locator/Location conversion.
```
  Christina Roberts committed Feb 12, 2014
  89ac19e8 Browse Files
- Merge pull request #2581 from edx/sylvia/documentation/TIM-137 · 0818b47f
```
Sylvia/documentation/tim 137
```
  Mark Hoeber committed Feb 12, 2014
  0818b47f Browse Files
- Update screen shots for advanced settings in Specialized Problems · 2c253b5d
  Sylvia Pearce committed Feb 12, 2014
  
  2c253b5d Browse Files
- Remove specific advanced setting info from ORA · 651babfd
  Sylvia Pearce committed Feb 12, 2014
  
  651babfd Browse Files
- Merge pull request #2567 from edx/sylvia/documentation/BLD-701 · acc9785b
```
Add gene editor; update protein builder and molecule editor
```
  Mark Hoeber committed Feb 12, 2014
  acc9785b Browse Files
- Add new Gene Explorer screen shot · 00929923
  Sylvia Pearce committed Feb 12, 2014
  
  00929923 Browse Files
- Update info about gene explorer, molecule editor, and protein builder · f508bf11
  Sylvia Pearce committed Feb 12, 2014
  
  f508bf11 Browse Files
- Store locations in ReferenceLists so they can be converted to locators. · 276c6e91
```
STUD-1027
```
  cahrens committed Feb 12, 2014
  276c6e91 Browse Files
- Merge pull request #2519 from edx/markhoeber/documentation/stud-1258 · a02beb6d
```
First draft of documentation for Image Modal tool
```
  Mark Hoeber committed Feb 12, 2014
  a02beb6d Browse Files
- Documentation for Image Modal tool · b3351c45
  Mark Hoeber committed Feb 12, 2014
  
  b3351c45 Browse Files
- Merge pull request #2572 from edx/sarina/add-catalan · 191bd289
```
Add Catalan (Valencia)
```
  Sarina Canelake committed Feb 12, 2014
  191bd289 Browse Files
- Add Catalan (Valencia) · 75a7d690
  Sarina Canelake committed Feb 12, 2014
  
  75a7d690 Browse Files
- Merge pull request #2482 from edx-solutions/splash-screen · 25b127ef
```
splash-screen: Add ability to redirect to a splash screen URL
```
  chrisndodge committed Feb 11, 2014
  25b127ef Browse Files
- Merge pull request #2531 from edx/sarina/LMS-2201 · 12e598cc
```
i18n points possible display LMS-2201
```
  Sarina Canelake committed Feb 11, 2014
  12e598cc Browse Files
11 Feb, 2014 22 commits
- Merge pull request #2568 from edx/sarina/update-i18n-translator-docs · defa2374
```
Update i18n translator documentation
```
  Sarina Canelake committed Feb 11, 2014
  defa2374 Browse Files
- Update i18n translator documentation · 191aafe3
  Sarina Canelake committed Feb 11, 2014
  
  191aafe3 Browse Files
- i18n points possible display LMS-2201 · ba0fbf07
  Sarina Canelake committed Feb 11, 2014
  
  ba0fbf07 Browse Files
- Add gene editor; update protein builder and molecule editor · 8eb704b0
  Sylvia Pearce committed Feb 11, 2014
  
  8eb704b0 Browse Files
- Merge pull request #2564 from edx/sarina/new-esperanto · 41f7f553
```
Update Esperanto (dummy) translation files
```
  Sarina Canelake committed Feb 11, 2014
  41f7f553 Browse Files
- Merge pull request #2403 from edx/dcadams/tinymce_mods · e5354f24
```
Addition of 3 TinyMCE plugins to toolbar
```
  David Adams committed Feb 11, 2014
  e5354f24 Browse Files
- Update Esperanto (dummy) translation files · 0fb7b949
  Sarina Canelake committed Feb 11, 2014
  
  0fb7b949 Browse Files
- Merge pull request #2561 from edx/frances/studio/bug-editor-number-layout · ab4432db
```
Fixed missing polyfill buttons and adjusted layout of number input 
UX-381
```
  frances botsford committed Feb 11, 2014
  ab4432db Browse Files
- fixed missing polyfill buttons, adjusted layout of number input in component editor · 34ea03c8
```
UX-381
```
  Frances Botsford committed Feb 11, 2014
  34ea03c8 Browse Files
- splash-screen: Add ability to redirect to a splash screen URL · e6f4f4f4
```
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.
```
  Xavier Antoviaque committed Feb 11, 2014
  e6f4f4f4 Browse Files
- Merge pull request #2493 from danielcebrian/daniel-branch-fix · 770df009
```
fixed conflict between Annotator and internationalitation
```
  Diana Huang committed Feb 11, 2014
  770df009 Browse Files
- Merge pull request #2560 from edx/sarina/fix-i18n-xmodule-sequence · 2e28279b
```
i18n Sequence XModule
```
  Sarina Canelake committed Feb 11, 2014
  2e28279b Browse Files
- i18n Sequence XModule · 47426f46
  Sarina Canelake committed Feb 11, 2014
  
  47426f46 Browse Files
- Merge pull request #2538 from edx/sarina/fixup-symmath · 58565c6d
```
pep8/pylint cleanup on symmath/formula.py
```
  Sarina Canelake committed Feb 11, 2014
  58565c6d Browse Files
- Merge pull request #2558 from edx/will/more-robust-ora-page · 8880faed
```
Ora page object retries even if rubric doesn't load
```
  Will Daly committed Feb 11, 2014
  8880faed Browse Files
- Merge pull request #2549 from edx/zoldak/things-not-to-translate · d0a1701b
```
Do not translate checkbox values in html files
```
  Jay Zoldak committed Feb 11, 2014
  d0a1701b Browse Files
- pep8/pylint cleanup on symmath/formula.py · 27c3ba4a
  Sarina Canelake committed Feb 11, 2014
  
  27c3ba4a Browse Files
- Merge pull request #2365 from edx/anton/store-video-progress · d8144b0d
```
Anton/store video progress
```
  Valera Rozuvan committed Feb 11, 2014
  d8144b0d Browse Files
- Persist student progress in video. · 102d1cb2
```
Student logins to edx, plays video, selects position, closes
browser, opens video, position is restored.

BLD-385
```
  polesye committed Feb 11, 2014
  102d1cb2 Browse Files
- Merge pull request #2478 from edx/anton/add-view-for-dict-in-studio · 0b3604f8
```
Add a view for the field type Dict in Studio.
```
  Anton Stupak committed Feb 11, 2014
  0b3604f8 Browse Files
- BLD-658: Add view for field type Dict in Studio. · faa97379
  polesye committed Feb 11, 2014
  
  faa97379 Browse Files
- Merge pull request #2536 from edx/will/bok-choy-coverage-name · fdda638f
```
Change bok-choy coverage XML filename
```
  Will Daly committed Feb 11, 2014
  fdda638f Browse Files