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

21156 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frances Botsford
cf16eb052d fixes for verification ui discrepancies 
UX-351
 2014-02-11 14:13:25 -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
Ned Batchelder
3eb69da545 Indicate where i18n tools are being run. 2014-02-10 15:23:13 -05:00
Ned Batchelder
dd6b72382c Include the third-party wiki app into the i18n toolchain 
We use pybabel to extract strings from third-party apps, put them on
Transifex, then merge them into django.po.

[LMS-1681]
 2014-02-10 15:23:13 -05:00
David Baumgold
3938e84d6a Merge pull request #2526 from edx/db/refactor-student-view 
Refactor student views
 2014-02-10 15:22:53 -05:00
Ned Batchelder
6635233b3c Merge pull request #2529 from edx/ned/second-dummy-language 
Add a second fake translation language
 2014-02-10 15:19:27 -05:00
Sarina Canelake
6f32324e28 Merge pull request #2537 from edx/sarina/add-greek 
Add Greek language translations
 2014-02-10 15:17:28 -05:00
Ned Batchelder
2f67d0aab4 Remove tabs. 2014-02-10 15:13:11 -05:00
Ned Batchelder
30aede6fb2 Merge pull request #2541 from edx/ned/remove-unused-imports 
Remove unused imports.
 2014-02-10 15:00:49 -05:00
Dave St.Germain
70b602fbfe Merge pull request #2498 from edx/dcs/a11y-sequence-nav 
Accessibility improvements to the sequence navigation
 2014-02-10 14:51:59 -05:00
David Baumgold
1dfd3310f7 Refactor student views 
Fix pylint/pep8 warnings, use JsonResponse instead of HttpResponse where useful,
put in TODOs to change HTTP status codes to be more accurate.
 2014-02-10 14:50:57 -05:00
Dave St.Germain
01ac04ca60 Merge pull request #2496 from edx/dcs/a11y-hide-things 
For a11y, modal dialogs and script templates should be hidden...
 2014-02-10 14:50:30 -05:00
Sarina Canelake
0ea941da69 Add Greek language translations 2014-02-10 14:40:11 -05:00
Dave St.Germain
4810bd6d1c Improved sequence navigation accessibility 2014-02-10 14:34:28 -05:00
Calen Pennington
25c0776ca5 Merge pull request #2540 from cpennington/fix-pylint-errors 
Fix pylint violations
 2014-02-10 14:33:31 -05:00
Ned Batchelder
1bd213beba Remove unused imports. 2014-02-10 14:07:50 -05:00
Jay Zoldak
552e20471d Merge pull request #2511 from edx/zoldak/pycharm 
Add pycharm helpers to gitignore
 2014-02-10 14:01:18 -05:00