Commit Graph

14447 Commits

Author SHA1 Message Date
Juho Kim
513c01b166 bringing up to master 2013-06-21 17:39:38 -04:00
Calen Pennington
25aec96e86 Merge pull request #124 from edx/fix/cale/test-ruby-install
Do a bundle install before trying to use rake, so that we have all the p...
2013-06-12 11:30:10 -07:00
Calen Pennington
5b8163dc9c Merge pull request #92 from edx/fix/cale/url-tests
Fix tests that vary urls.py
2013-06-12 10:47:13 -07:00
Brian Talbot
e641d2c6b5 Merge pull request #136 from edx/fix/btalbot/xmodule-showanswer
Problem Show Answer/Check Button Line Height Syncing
2013-06-12 08:56:08 -07:00
Brian Talbot
14100ba14c syncs up font-weight across problem button/input actions 2013-06-12 11:44:00 -04:00
Brian Talbot
832da3ad48 syncs styling rules for buttons/inputs to ensure consistency 2013-06-12 11:43:59 -04:00
Brian Talbot
050846af71 abstracts height rule to apply to the capa check, show, save actions 2013-06-12 11:43:59 -04:00
Brian Talbot
664efb9887 removes HTML elemements from problem action Sass selectors 2013-06-12 11:43:59 -04:00
Brian Talbot
a17bf5e2ce resolves height issue when display the check and show answer actions alongside problems 2013-06-12 11:43:59 -04:00
e0d
b11e748341 Merge pull request #142 from edx/e0d/pylint-and-import
added pylint ignores, fixed missing import
2013-06-12 08:38:32 -07:00
e0d
273df4e113 added pylint ignores, fixed missing import 2013-06-12 11:24:28 -04:00
Calen Pennington
d715c61d69 Merge pull request #118 from edx/fix/cale/xmodule-assets-deletion-error
Ignore files that don't exist when we try and delete them while compilin...
2013-06-12 08:10:36 -07:00
Calen Pennington
eccf800f47 Ignore files that don't exist when we try and delete them while compiling xmodule assets 2013-06-12 09:02:44 -04:00
e0d
fd4d816816 Merge pull request #133 from edx/e0d/migrate-as-other-user
Adding a new env to handle escalating privileges to run db migrations.
2013-06-12 05:10:28 -07:00
Diana Huang
58d561ac8e Merge pull request #126 from edx/diana/fix-display-text
Fix typo and an unclear description.
2013-06-11 14:36:06 -07:00
Ned Batchelder
413202e7d6 Merged ned/whitelistable-sandbox 2013-06-11 16:49:45 -04:00
Diana Huang
f79d1e215a Fix some typos and unclear descriptions. 2013-06-11 16:48:11 -04:00
e0d
c96511a278 Adding comments. 2013-06-11 16:37:37 -04:00
chrisndodge
e685ff7125 Merge pull request #129 from edx/fix/cdodge/cancel-asset-upload-crash
[STUD-256] Seems like on chrome when cancel is hit in the file chooser, the 'change...
2013-06-11 12:52:56 -07:00
Jay Zoldak
d4a5af850d Merge pull request #135 from edx/zoldak/fix-lettuce-tests
Fix broken lettuce tests
2013-06-11 12:34:01 -07:00
Jay Zoldak
32562b7055 Fix broken lettuce tests 2013-06-11 15:16:12 -04:00
e0d
1511ec841a Better error handling. 2013-06-11 15:00:39 -04:00
e0d
d2554909d8 Adding a new env to handle escalating privileges to run db migrations. 2013-06-11 14:42:39 -04:00
Chris Dodge
be6fbf913e make local variable 2013-06-11 14:36:04 -04:00
Chris Dodge
1602f592b4 use better API 2013-06-11 14:32:33 -04:00
Don Mitchell
64b909c5f0 Merge pull request #12 from edx/feature/dhm/timeconv
Feature/dhm/timeconv
2013-06-11 11:11:05 -07:00
Jay Zoldak
3d89b697fd Merge pull request #130 from edx/zoldak/fix-broken-lettuce
Update lettuce test for problems with new css for show and hide answers.
2013-06-11 10:56:11 -07:00
Jay Zoldak
37d7bc2365 Update lettuce test for problems with new css for show and hide answers. 2013-06-11 13:52:35 -04:00
Chris Dodge
fa8ae228bf Seems like on chrome when cancel is hit in the file chooser, the 'changed' event is fired and startUpload() was being called. We need to check to see if the upload file is blank and - if so - just return immediately out of the function 2013-06-11 13:38:01 -04:00
caesar2164
646e2bd486 Merge pull request #93 from edx/giulio/accessibility
A number of important accessibility changes
2013-06-11 08:38:53 -07:00
Greg Price
7c326f6520 Merge pull request #120 from edx/gprice/help-widget-tweaks
Reviewed by @brianhw https://rbcommons.com/s/edx/r/17/
2013-06-11 07:47:35 -07:00
Calen Pennington
473b0fc389 Do a bundle install before trying to use rake, so that we have all the prerequisites when running tests 2013-06-11 09:41:03 -04:00
Brian Talbot
443a50845a lms - adds back in missing/previously added .sr screen reader-focused styling and references in place of the .visuallyhidden application 2013-06-10 16:22:21 -07:00
Brian Talbot
47f91e79c4 adds in status for overall problem status indicator and replicates needed correctness django logic to show individual choice status 2013-06-10 16:22:20 -07:00
Brian Talbot
d74f952b37 updates masquerade unit test to account for new show answer button with problems 2013-06-10 16:22:20 -07:00
Brian Talbot
d778f2e9b9 updates jasmine tests to correspond to new capa template HTML 2013-06-10 16:22:20 -07:00
Brian Talbot
a377f86095 adds in aria attributes and semantic status content for vsepr input problems 2013-06-10 16:22:19 -07:00
Brian Talbot
628b741742 adds in aria attributes and semantic status content for schematic input problems 2013-06-10 16:22:19 -07:00
Brian Talbot
9552be6f19 adds in aria attributes and semantic status content for option input problems 2013-06-10 16:22:19 -07:00
Brian Talbot
2b08db57f0 adds in aria attributes and semantic status content for designprotein2d problems 2013-06-10 16:22:18 -07:00
Brian Talbot
04acd8790f adds in aria attributes and semantic status content for matlab problems 2013-06-10 16:22:18 -07:00
Brian Talbot
dba0eb78d3 adds in aria attributes and semantic status content for js-text input problems 2013-06-10 16:22:18 -07:00
Brian Talbot
d1ca8dc2bb adds in aria attributes and semantic status content for image input problems 2013-06-10 16:22:17 -07:00
Brian Talbot
cb78863984 adds in aria attributes and semantic status content for editamolecule problems 2013-06-10 16:22:17 -07:00
Brian Talbot
7ac75eae85 adds in aria attributes and semantic status content for editagene problems 2013-06-10 16:22:17 -07:00
Brian Talbot
254436aad1 adds in aria attributes and semantic status content for drag and drop problems 2013-06-10 16:22:16 -07:00
Brian Talbot
2c91f933e9 adds in aria attributes and semantic status content for crystallography problems 2013-06-10 16:22:16 -07:00
Brian Talbot
31a08bf42f adds in aria attributes and semantic status content for code input problems 2013-06-10 16:22:16 -07:00
Brian Talbot
a84dab0feb adds in aria attributes and semantic status content for choicegroup problems 2013-06-10 16:22:16 -07:00
Brian Talbot
832e05341b adds in aria attributes and semantic status content for chem eq problems 2013-06-10 16:22:15 -07:00