Commit Graph

19654 Commits

Author SHA1 Message Date
Nick Parlante
5d995ddb5c Merge pull request #1228 from edx/nick/fix-customization-visibility
Bug fix - text_customization should not show in settings
2013-10-04 13:50:49 -07:00
jmclaus
4f59e6bbee Captions are now removed from tab order when hidden 2013-10-04 22:16:59 +02:00
Nick Parlante
ad7c3f932b Bug fix - text_customization should not show in settings
Also change test to not expect text_customization
2013-10-04 12:55:28 -07:00
Julian Arni
dadc766fc0 Use wrapped tar extraction
Signed-off-by: Julian Arni <julian@edx.org>
2013-10-04 15:47:58 -04:00
Will Daly
e11bd1d96f Merge pull request #1226 from edx/will/use-lettuce-fork
Use a forked version of lettuce that fixes a bug with tag inheritance
2013-10-04 12:07:34 -07:00
Will Daly
cb511ee476 Use pre-generated reports for pep8/pylint when running diff-quality 2013-10-04 14:56:57 -04:00
David Baumgold
715aa6985e Merge pull request #662 from edx/db/requirejs
requirejs in Studio
2013-10-04 11:42:07 -07:00
Usman Khalid
a47442ed01 Merge pull request #1222 from edx/usman/lms1112-register-form-help-text
register.html: Corrected help text for username & name fields
2013-10-04 11:28:31 -07:00
Diana Huang
ab74b4d56f Merge pull request #1225 from edx/diana/fix-dashboard-error
Add in the static namespace to the new template
2013-10-04 11:27:23 -07:00
Will Daly
b7b8a2da8a Use a forked version of lettuce that fixes a bug with tag inheritence 2013-10-04 14:20:05 -04:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
Diana Huang
f51a99c9bc Add in the static namespace to the new template 2013-10-04 13:28:33 -04:00
Sarina Canelake
94ce535f41 Merge pull request #1008 from edx/fix/ichuang/inline-for-formulaequationinput
add inline style flag to formulaequationinput
2013-10-04 10:05:21 -07:00
ichuang
5b460ff6b7 add inline style flag to formulaequationinput 2013-10-04 11:56:50 -04:00
Will Daly
54ea98d249 Merge pull request #1219 from edx/will/run-individual-tests
Allow rake test to run individual tests again
2013-10-04 07:27:30 -07:00
Jay Zoldak
2d17c00eef Merge pull request #1223 from edx/zoldak/fix-acceptance-text-customization
Modify acceptance tests to account for the new text_customization...
2013-10-04 07:18:47 -07:00
Jay Zoldak
cce3758363 Modify acceptance tests to account for the new text_customization capa field 2013-10-04 09:38:40 -04:00
Diana Huang
3ec8df9f5e Merge pull request #1216 from edx/diana/dashboard-cleanup
Some dasbhoard template cleanup
2013-10-04 06:17:06 -07:00
Diana Huang
361fbaff03 Update CHANGELOG 2013-10-04 09:16:23 -04:00
Frances Botsford
6fa642fc65 a11y adjustment to new video and transcript links styles 2013-10-04 08:50:38 -04:00
Usman Khalid
f80a32e082 Register.html: Corrected help text for username & name fields 2013-10-04 17:12:23 +05:00
Nick Parlante
32bf5b93b2 Merge pull request #1106 from edx/nick/customization
Targeted string customization in the lms UI
2013-10-03 14:41:36 -07:00
Frances Botsford
55d8a72395 adding a little ux to the download video and transcript links 2013-10-03 16:51:39 -04:00
Diana Huang
6bb2ba283b Remove more unnecessary imports 2013-10-03 16:34:16 -04:00
Jay Zoldak
23dd16611d Merge pull request #1218 from edx/zoldak/fix-file-matcher
Fix the matcher for the word 'test' in the upload file step of tests
2013-10-03 13:28:55 -07:00
Diana Huang
ed5168ec61 Move more dashboard logic into the views 2013-10-03 16:22:00 -04:00
Will Daly
b0878d3d43 Allow rake test to run individual tests again 2013-10-03 16:15:33 -04:00
Jay Zoldak
855d5d9e4a Fix the matcher for the word 'test' in the upload file step of acceptance tests 2013-10-03 16:14:30 -04:00
Brian Talbot
d32611be82 Merge pull request #1217 from edx/talbs/fix-studio-bodyclasses
Studio: Fix - HTML <body> class regressions
2013-10-03 13:00:26 -07:00
Sarina Canelake
66b8e1fc8e Merge pull request #1195 from edx/sarina/more-ins-dash
Sarina/more ins dash
2013-10-03 12:58:40 -07:00
Sarina Canelake
1251003d10 Remove enrollment from Student Admin page of new instructor dash 2013-10-03 15:57:31 -04:00
Sarina Canelake
d9f7f8cf98 I18n Student Admin page of new instructor dash 2013-10-03 15:57:31 -04:00
Brian Talbot
39b578c066 Studio: adds JS/functionality dependent class to course updates <body> elem 2013-10-03 15:29:42 -04:00
Calen Pennington
e2b54b7ac5 Merge pull request #945 from cpennington/use-wrap-child
Use wrap_child instead of replacing get_html
2013-10-03 12:10:04 -07:00
Nick Parlante
cca6876a3c Targeted string customization in the LMS UI
Add the text_customization dict in advanced settings, which contains
customizations checked in specific spots. Here it is used to enable
the customization of the "Check" and "Final Check" button titles
under the keys custom_check and custom_final_check.
2013-10-03 11:31:40 -07:00
Calen Pennington
230bf0c643 Switch get_html replacement out for using wrap_child 2013-10-03 14:28:19 -04:00
Diana Huang
7ba38c0ff3 Refactor out logic for individual course listings. 2013-10-03 14:08:38 -04:00
Ned Batchelder
2a11ff0bdb Merge pull request #1198 from edx/ned/fix-calling-classmethods
No need to invoke classmethods through self.__class__
2013-10-03 10:28:39 -07:00
Brian Talbot
0dfe4a3243 Merge pull request #1214 from edx/talbs/fix-studio-bodyclasses
Studio: Fix - HTML <body> class regressions
2013-10-03 09:08:16 -07:00
Brian Talbot
38b04f2a9e Studio: adds in older styling dependent class to unit <body> elem 2013-10-03 11:53:10 -04:00
Diana Huang
51f44e02a6 Delete Pearson code from the dashboard page. 2013-10-03 11:53:08 -04:00
Brian Talbot
3bec8c66d2 Studio: adds JS/functionality dependent class to course updates <body> elem 2013-10-03 11:52:26 -04:00
Jay Zoldak
53e10501db Merge pull request #1213 from edx/zoldak/fix-broken-acceptance
Change css locator for Course Outline page in acceptance test
2013-10-03 08:37:14 -07:00
Ned Batchelder
a1be970153 Merge pull request #1194 from edx/ned/quiet-tests
Quiet down exceptions at startup, and during tests
2013-10-03 08:21:37 -07:00
Ned Batchelder
3504ce2c6c Merge pull request #1212 from edx/ned/word-wrap-changelog
Word-wrap CHANGELOG.
2013-10-03 08:21:12 -07:00
Jay Zoldak
db4dfd147e Change css locator for Course Outline page in acceptance test 2013-10-03 11:17:36 -04:00
Ned Batchelder
6880a67ec5 Word-wrap CHANGELOG. 2013-10-03 11:02:37 -04:00
Adam
246db90674 Merge pull request #1206 from edx/adam/unicode-error-instr-dash
small unicode fix in instr dash
2013-10-03 07:07:27 -07:00
David Ormsbee
cd7d75af72 Merge pull request #1184 from edx/ormsbee/vcerts_accept_tests_cleanup
Re-enable verify student identity acceptance tests
2013-10-03 06:08:12 -07:00
Diana Huang
bc9f86fd16 Merge pull request #1205 from edx/diana/fix-course-mode-expiration
Fix parentheses so that we only pull the course modes we want.
2013-10-03 05:33:43 -07:00