Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,173 Commits 1 Branch 0 Tags
a02beb6d316ea9f3f4e9d964fb76dc4a5d5b2003
Commit Graph

21173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sarina Canelake
191bd2893e Merge pull request #2572 from edx/sarina/add-catalan 
Add Catalan (Valencia)
 2014-02-12 11:59:50 -05:00
Sarina Canelake
75a7d69050 Add Catalan (Valencia) 2014-02-12 10:18:34 -05: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
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
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
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
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
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
Sarina Canelake
27c3ba4a4d pep8/pylint cleanup on symmath/formula.py 2014-02-11 09:46:24 -05:00
Valera Rozuvan
d8144b0d5d Merge pull request #2365 from edx/anton/store-video-progress 
Anton/store video progress
 2014-02-11 16:16:27 +02:00
polesye
102d1cb253 Persist student progress in video. 
Student logins to edx, plays video, selects position, closes
browser, opens video, position is restored.

BLD-385
 2014-02-11 13:53:24 +00:00
Anton Stupak
0b3604f875 Merge pull request #2478 from edx/anton/add-view-for-dict-in-studio 
Add a view for the field type Dict in Studio.
 2014-02-11 15:45:55 +02:00
polesye
faa97379b7 BLD-658: Add view for field type Dict in Studio. 2014-02-11 14:53:57 +02:00
Will Daly
fdda638f57 Merge pull request #2536 from edx/will/bok-choy-coverage-name 
Change bok-choy coverage XML filename
 2014-02-11 07:50:04 -05:00
Oleg Marshev
1d517bd05a Merge pull request #2029 from edx/oleg/lti_stub_refactor 
Refactor stub implementation of LTI Provider. BLD-601.
 2014-02-11 13:27:07 +02:00
Oleg Marshev
79ffcb7e94 Refactor stub implementation of LTI Provider. BLD-601. 2014-02-11 12:50:22 +02:00
Will Daly
4a9202bd1c Ora page object retries even if rubric doesn't load 2014-02-10 23:36:13 -05:00
Mark Hoeber
15fc640e8f Merge pull request #2546 from edx/markhoeber/documentation/dev-doc-toc 
Fixed TOC and copyright
 2014-02-10 17:11:06 -05:00
Mark Hoeber
6457425620 Fixed TOC and copyright 2014-02-10 17:10:29 -05:00
Christina Roberts
4f696586b3 Merge pull request #2466 from edx/christina/move-tests 
Move tests related to views files into views/tests.
 2014-02-10 17:06:10 -05:00
Ned Batchelder
ce5fd88baa Merge pull request #2488 from edx/ned/i18n-for-wiki 
Finish wiki i18n
 2014-02-10 17:05:44 -05:00
David Baumgold
b3f50537b5 Merge pull request #2521 from edx/db/create-account-400 
unit tests to handle duplicate user registration attempts
 2014-02-10 16:47:00 -05:00
Diana Huang
8a95474537 Merge pull request #2544 from edx/diana/drupal-registration-i18n 
Don't internationalize strings we use for enrollment.
 2014-02-10 16:16:47 -05:00
cahrens
fc1e8fae2e Remove unused imports. 2014-02-10 16:08:59 -05:00
jmclaus
72ea40d7b6 Merge pull request #2381 from edx/jmclaus/feature_video_speed_control_improved_a11y 
Keyboard events and ARIA markup added to speed control
 2014-02-10 22:07:27 +01:00
David Baumgold
a143309a22 Add unit tests to handle duplicate user registration attempts 2014-02-10 16:05:34 -05:00
cahrens
c2aa0bf629 pep8 cleanup 2014-02-10 16:03:06 -05:00
cahrens
5dfe9d7052 Remove unused methods. 2014-02-10 16:03:06 -05:00
cahrens
f9c1c0b38b Move tests related to views files into views/tests. 2014-02-10 16:03:06 -05:00
Don Mitchell
16f0d12a1f Merge pull request #2356 from edx/dhm/mixed_ms_wrapper 
MixedModulestore wraps most getters, update_item, delete_item
 2014-02-10 16:01:50 -05:00
Ned Batchelder
aab6c54a51 Merge pull request #2545 from edx/ned/remove-tabs 
Remove tabs.
 2014-02-10 15:54:11 -05:00
Jay Zoldak
7e9abd2e84 Do not translate checkbox values 2014-02-10 15:50:09 -05:00
Diana Huang
4a16846426 Don't internationalize strings we use for enrollment. 
LMS-2218
 2014-02-10 15:29:09 -05:00
jmclaus
31ffce4b05 Keyboard events and ARIA markup added to speed control. Replaced anonymous event handlers by named functions. Menu stays open on mouseleave when a speed entry has focus. In that case, the menu can be closed by clicking anywhere outside of it. [BLD-402, BLD-363] 2014-02-10 21:24:50 +01:00
Ned Batchelder
35c28e55b1 Use the latest django-wiki revision. 2014-02-10 15:23:13 -05:00
Ned Batchelder
6990b5ba41 Tests should explicitly ask for English. 2014-02-10 15:23:13 -05:00
Ned Batchelder
aff3c47754 i18n fixes for wiki templates. 2014-02-10 15:23:13 -05:00