Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,001 Commits 1 Branch 0 Tags
185cf42e8fde70cdece8e6ea1dce58f217615780
Commit Graph

6798 Commits

Author SHA1 Message Date
Sarina Canelake
185cf42e8f Merge pull request #1462 from edx/sarina/adjust-email-template 
Change footer color in bulk email template
 2013-10-23 14:59:12 -07:00
Jay Zoldak
45f87b30c0 Improve problems acceptance tests. Disable brittle video test. 2013-10-23 13:53:11 -04:00
Szczork
b3844af28d Translation overrides 
Usefull variables for translation
 2013-10-23 12:39:31 -04:00
Sarina Canelake
90baa0c9af Change footer color in bulk email template 2013-10-23 11:37:51 -04:00
John Jarvis
68d31b9808 adding STATIC_ROOT_BASE to lms/envs/aws.py 2013-10-23 10:30:05 -04:00
brianhw
e1b39774de Merge pull request #1458 from edx/brian/email-dupe-retry 
Check for requeued subtasks when in RETRY state.
 2013-10-23 07:04:37 -07:00
Diana Huang
813c8c4cec Merge pull request #1426 from edx/diana/django-wiki-colors 
Better indication of what mode is active in the wiki.
 2013-10-23 06:13:50 -07:00
Usman Khalid
91fbc6610e dashboard.html: Made strings translatable 2013-10-23 14:52:13 +05:00
Usman Khalid
cfaf1275a7 leanModel is setup on jQuery.ready() 2013-10-23 14:52:13 +05:00
polesye
6c08708131 Merge pull request #1111 from edx/anton/video_subtitles 
Add Timed Transcripts Editor.
 2013-10-23 02:38:39 -07:00
Brian Wilson
16b85c0c2a Check for requeued subtasks when in RETRY state. 2013-10-22 18:17:00 -04:00
Diana Huang
52ed7b277d Add i18n hooks. 
LMS-1306
 2013-10-22 16:32:10 -04:00
Anton Stupak
aecc20af6b Add Timed Transcripts Editor. 2013-10-22 21:45:03 +03:00
Brian Wilson
ecb58e863f Add cache-based locking to subtasks to ensure that the same task is not running in two workers at the same time. 2013-10-22 14:32:52 -04:00
Diana Huang
0752375e46 Indicate active status more clearly for people 
with vision impairments

* bold text when active
* add in some extra text for screen readers

LMS-1306
 2013-10-22 14:21:35 -04:00
Adam
1f7bb112bf Merge pull request #1401 from edx/adam/a11y-modal-management 
optimize keyboard focus management on dashboard's modals
 2013-10-22 11:17:10 -07:00
Brian Talbot
bd0522d5a4 Merge pull request #1450 from edx/talbs/lms-fix-passwordreset 
LMS: FIX - Resolves path to CSS assets on password reset views (resolves LMS-1357)
 2013-10-22 10:56:14 -07:00
Julia Hansbrough
8785889684 Merge pull request #1446 from edx/flowerhack/fix/legacyemailjs 
Fixed a bug where legacy instructor dash's email editor failed to load
 2013-10-22 10:48:07 -07:00
Julia Hansbrough
9123186050 Fixed indentation 2013-10-22 17:39:48 +00:00
Brian Talbot
c476614f21 LMS: adds correct css/style assets back to password reset and confirm views 2013-10-22 13:29:20 -04:00
Adam Palay
83b11a881c optimize keyboard focus management on dashboard's modals 
add license to a11y_tools.js

add tests, some reorganization of js tests

skip "toBeFocused" tests for now
 2013-10-22 13:26:18 -04:00
John Jarvis
c59ecc9068 Merge pull request #1433 from edx/jarv/static-root 
Jarv/static root
 2013-10-22 09:09:07 -07:00
Julia Hansbrough
eb4081115d Fixed a bug where legacy instructor dash's email editor failed to load 2013-10-22 14:27:40 +00:00
Jay Zoldak
ecea49ba2d Refactor wait_for methods in ui_helpers for acceptance tests. 2013-10-21 17:14:01 -04:00
David Baumgold
3688f221e3 password reset pages use Django templates, not Mako 2013-10-21 14:52:41 -04:00
John Jarvis
42e1991953 adding STATIC_ROOT 2013-10-21 14:39:34 -04:00
Carlos Andrés Rocha
0be9daf9d5 Merge pull request #1419 from rocha/fix-config-root-env 
Fix error when reading tokens on aws configuration
 2013-10-21 08:24:15 -07:00
Will Daly
bd812a62b7 Merge pull request #1422 from edx/will/fix-nav-tests 
Fixed navigation acceptance test
 2013-10-21 08:21:06 -07:00
Calen Pennington
405d42cde3 Merge pull request #1423 from cpennington/fix-lms-cms-dev 
Fix `rake lms[cms.dev]`
 2013-10-21 07:58:09 -07:00
Will Daly
854a564a73 Fixed navigation acceptance test 
Disable jquery animations to fix LMS navigation acceptance test.
 2013-10-21 10:31:27 -04:00
e0d
fb62f0c52a Merge pull request #1417 from edx/e0d/config-fix 
E0d/config fix
 2013-10-21 07:29:52 -07:00
Calen Pennington
3e59f3af40 Fix rake lms[cms.dev] 2013-10-21 09:26:57 -04:00
Will Daly
a632377620 Merge pull request #1420 from edx/will/quarantine-lms-nav-tests 
Temporarily disable navigation feature due to flakiness.
 2013-10-21 06:12:50 -07:00
Calen Pennington
12cc4a19c0 Merge pull request #1224 from cpennington/lms-xblock-js-execution 
Add an XBlock javascript runtime, and use it to run XModules
 2013-10-21 05:53:36 -07:00
Will Daly
7e6a52a528 Temporarily disable navigation feature due to flakiness. 2013-10-21 08:51:01 -04:00
Carlos Andrés Rocha
b764b9b4cf Fix error when reading tokens on aws configuration 
The error was caused by the CONFIG_ROOT environmental variable,
which was incorrectly assumed to be a path.py valid path.
 2013-10-21 03:19:22 -04:00
jmclaus
1810022d73 Caption functionality announced when tabbing to list 2013-10-20 21:56:12 +02:00
Calen Pennington
ce6fbae693 Add an XBlock javascript runtime, and use it to run XModules 
[LMS-57]
 2013-10-18 16:31:32 -04:00
e0d
5995a76254 sanity restored. 2013-10-18 16:26:23 -04:00
e0d
a008cc6b74 path fix. 2013-10-18 16:12:51 -04:00
e0d
6700a3ec14 Fixes for the AWS environment config. 2013-10-18 15:56:15 -04:00
Brian Wilson
ba6477abef Handle all exceptions returned by django-ses. 2013-10-18 15:12:07 -04:00
Jay Zoldak
159f020d9d Merge pull request #1399 from edx/zoldak/fix-lms-navigation-tests 
Change logic for section selection in navigation tests.
 2013-10-18 11:47:21 -07:00
brianhw
f831a0adcb Merge pull request #1406 from edx/post-release-2013-10-17-master 
Post release 2013 10 17 master
 2013-10-18 11:16:24 -07:00
Ned Batchelder
009b3e9c50 Merge pull request #1403 from edx/ned/small-dictfielddata-cleanups 
Simple cleanups of DictFieldData
 2013-10-18 11:02:38 -07:00
Giulio Gratta
19d3e31d97 Merge pull request #1332 from edx/giulio/register-page 
Change various text items to be more clear for users, as well as some grammar
 2013-10-18 11:02:00 -07:00
Brian Wilson
aa172272f3 Update master with hotfixes from release-2013-10-17. 2013-10-18 11:50:42 -04:00
Jay Zoldak
494a618c1a Change logic for section selection in navigation tests. 2013-10-18 09:38:20 -04:00
Don Mitchell
8fe99a6be2 Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation"" 
This reverts commit a517dc2085.
 2013-10-18 09:22:30 -04:00
Will Daly
7aff8a7791 Merge pull request #1362 from edx/will/acceptance-test-logs 
Write Django logs to file during acceptance tests
 2013-10-18 05:07:53 -07:00