Commit Graph

17977 Commits

Author SHA1 Message Date
Christina Roberts
99bf64170f Merge pull request #1031 from edx/christina/backbone-assets
Backbone model/view for asset list.
2013-09-20 08:16:44 -07:00
cahrens
948615d66f Log warning if thumbnail cannot be deleted. 2013-09-20 10:44:55 -04:00
cahrens
fe6ed08518 Code review feedback. 2013-09-20 10:44:55 -04:00
cahrens
d11c92d799 Set the URL on the collection instead of the model. 2013-09-20 10:44:55 -04:00
cahrens
9ceee3627f Simplify how we determine if asset is already showing. 2013-09-20 10:44:54 -04:00
cahrens
01d7d48f8f Create backbone models/views for assets.
cleanup

Updates.

Testing changes.

Testing changes.

asset-index progress state cleanjup.

cleanup
2013-09-20 10:44:54 -04:00
Adam
97b738bc79 Merge pull request #1002 from edx/adam/accessible-mathjax
add accessibility message if mathjax is detected
2013-09-20 06:25:38 -07:00
jmclaus
1c7d821cfd Merge pull request #1041 from edx/jmclaus/bugfix_disable_video_autoplay_lms
Disabled video autoplay for students
2013-09-20 05:06:16 -07:00
jmclaus
66bd8127e6 Acceptance tests now pass 2013-09-20 14:04:58 +02:00
jmclaus
cbc4bd5c3a Modified acceptance test to reflect autoplay=false as a default for lms 2013-09-20 14:04:57 +02:00
jmclaus
7af892e66a Disabled video autoplay for students 2013-09-20 14:04:57 +02:00
Diana Huang
c65e21c779 Merge pull request #1071 from edx/diana/order-integrity-errors
If the current course doesn't have a verified course mode
2013-09-19 14:10:27 -07:00
Diana Huang
3140270590 Merge pull request #1040 from edx/diana/no-ordering-twice
Don't try to purchase the same order twice
2013-09-19 14:07:17 -07:00
Diana Huang
2f001041ee Merge pull request #1048 from edx/diana/cybersource-unicode-handling
Add unicode handling to the signing and verifying logic
2013-09-19 14:04:53 -07:00
Diana Huang
ec5e767bb4 If the current course doesn't have a verified course mode
kick the user out of the verify registration flow.
2013-09-19 16:59:28 -04:00
Brian Talbot
2a9c99224b Merge pull request #1067 from edx/talbs/fix-a11y-browsermessage
LMS: Hide Browser Recommendation Message from Assistive Tech Users
2013-09-19 13:54:23 -07:00
Brian Talbot
159f680711 LMS: semantically hides the ie-centric browser warning/FF/Chrome suggestion message to avoid confusing/misleading assistive tech-based users. 2013-09-19 16:37:50 -04:00
Adam Palay
34362b88a6 add accessibility message if mathjax is detected
use ie conditional html tags to detect for compatible ie versions
2013-09-19 16:07:56 -04:00
Adam
75b7514c4f Merge pull request #965 from felipemontoya/features/fmo/lms-i18n-strings
Features/fmo/lms i18n strings
2013-09-19 12:05:35 -07:00
Felipe Montoya
0c44ec1996 String extraction at input value attributes is done with single quotes 2013-09-19 13:54:35 -05:00
Felipe Montoya
3c88fabd1b Adding myself to authors 2013-09-19 12:34:11 -05:00
Felipe Montoya
92d1f232ed Adding to the problem template 2013-09-19 12:33:58 -05:00
Felipe Montoya
893d22515d Something for the user dashboard 2013-09-19 10:52:29 -05:00
Felipe Montoya
5f78645437 i18n: Strings for new instructor dashboard 2013-09-19 10:52:28 -05:00
Julia Hansbrough
29710661ec Merge pull request #1054 from edx/quotations
fixing quotations as per request
2013-09-19 08:25:38 -07:00
Julia Hansbrough
f81f2f2d96 fixing quotations as per request 2013-09-19 11:04:09 -04:00
Julia Hansbrough
5efa0c4578 Merge branch 'master' of https://github.com/edx/edx-platform 2013-09-19 10:50:46 -04:00
Jason Bau
46fddc6d26 Merge pull request #1052 from edx/jbau/staff-needs-to-grade-use-get
use .get when checking combined notifications to handle missing keys
2013-09-19 07:49:39 -07:00
Julia Hansbrough
14eadb24d6 fixing quotation marks as per request 2013-09-19 10:49:36 -04:00
Diana Huang
3b66852235 Add unicode handling to the signing and verifying logic 2013-09-19 10:07:49 -04:00
Jason Bau
aa0801907d use .get when checking combined notifications to handle missing keys 2013-09-18 23:47:31 -07:00
polesye
01a4292511 Merge pull request #1051 from edx/anton/disable_failed_tests
Disable temporarily failed js unit tests.
2013-09-18 23:47:24 -07:00
polesye
78c9f7e398 Disable temporarily failed js unit tests. 2013-09-19 09:24:34 +03:00
Will Daly
a6fb2bba77 Merge pull request #1018 from edx/will/vagrant-can-run-tests
Updated Vagrant file with requirements for tests
2013-09-18 14:00:38 -07:00
Will Daly
daada78dbf Merge pull request #1035 from edx/will/acceptance-test-prereqs
Changed prereq installation in rake test and rake fasttest
2013-09-18 13:56:47 -07:00
Jay Zoldak
bd06877109 Merge pull request #1046 from edx/zoldak/quiet-fast-acceptance
Zoldak/quiet fast acceptance
2013-09-18 13:37:30 -07:00
caesar2164
231c71c3ad Merge pull request #1042 from edx/giulio/ICE-calibration
Adding support for ICE track changes to calibration UI improvements
2013-09-18 12:52:58 -07:00
Giulio Gratta
c90262ebcb Adding support for ICE track changes to calibration UI improvements 2013-09-18 12:52:20 -07:00
Jay Zoldak
be51ee2c46 Speed up lms login 2013-09-18 15:51:31 -04:00
Jay Zoldak
9e368b8d9a Quiet the output of passing acceptance tests 2013-09-18 15:51:10 -04:00
Jay Zoldak
da538b8770 Merge pull request #1044 from edx/zoldak/acceptance-grid
Add ability to run against generic selenium grid
2013-09-18 12:07:21 -07:00
Will Daly
18f850037f Install prereqs before collecting assets 2013-09-18 14:55:04 -04:00
Calen Pennington
1d2e0b6615 Merge pull request #930 from cpennington/rename-xblock-field-data
Rename xblock_field_data to xmodule_field_data
2013-09-18 11:33:25 -07:00
Brian Talbot
b4cf4f4993 Merge pull request #989 from edx/talbs/studio-sassplaceholders
Studio: Switch class-based Sass @extend rules to use Sass placeholder syntax
2013-09-18 11:14:32 -07:00
Brian Talbot
8815962356 Studio: Converts all class-based Sass archetype-focused @extends to use Sass placeholder syntax 2013-09-18 14:14:11 -04:00
Jay Zoldak
35abac4770 Merge pull request #1036 from edx/zoldak/refactor-static-page-tests
Simplify static page acceptance tests
2013-09-18 11:14:01 -07:00
Jay Zoldak
4c411e2121 Add ability to run against generic selenium grid 2013-09-18 13:49:34 -04:00
Calen Pennington
2333a336a4 Merge pull request #947 from cpennington/group-python-tests
Teach rake to run all python tests as a group
2013-09-18 10:39:15 -07:00
Adam
ce9275b950 Merge pull request #1025 from edx/adam/accessible-tabs
make tooltips screen-readable
2013-09-18 10:22:01 -07:00
Adam
a777101d1e Merge pull request #1032 from edx/adam/a11y
Adam/a11y
2013-09-18 09:10:53 -07:00