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

21019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ned Batchelder
f900e8bb1d add missing people to AUTHORS 2014-02-05 17:52:18 -05:00
marcotuts
70f064e532 Merge pull request #2468 from edx/marco/studio/fix/component-header-styling 
Added back in component header visual separation from component renderin...
 2014-02-05 17:47:35 -05:00
Feanil Patel
716b789e06 Merge remote-tracking branch 'origin/release' 2014-02-05 17:26:39 -05:00
Feanil Patel
84efae5d22 Merge pull request #2487 from edx/hotfix/feb-10-2014 
Make receipt-ids actually generate UUIDs
 2014-02-05 17:24:47 -05:00
marco
799095fd7b updated csscomb ordering for css properties, moving border above padding. 2014-02-05 17:04:00 -05:00
Will Daly
4c2b76951d Merge pull request #2431 from edx/will/ora-acceptance-tests-rebase 
Peer-grading acceptance tests
 2014-02-05 16:43:47 -05:00
David Baumgold
ea6543ccf4 Merge pull request #2416 from Bachmann1234/fix_typo_in_data_readme 
Fix typo in data readme
 2014-02-05 16:33:53 -05:00
Jay Zoldak
0acb18fe1f Merge pull request #2480 from edx/zoldak/increase_lettuce_script_timeout 
Increase async script timeout in lettuce acceptance tests
 2014-02-05 15:45:31 -05:00
Julia Hansbrough
a0efe6e0de Make receipt-ids actually generate UUIDs 
LMS-2192
 2014-02-05 20:41:30 +00:00
Feanil Patel
544b496185 Merge pull request #2484 from edx/feanil/fix_transfer_logic 
Only move students if they aren't in the new course.
 2014-02-05 15:18:32 -05:00
Will Daly
0a9b4ada86 Added stub XQueue server to bok_choy test suite. 
Added feedback check for AI-assessment test
Added peer assessment feedback test
Added tests for peer grading module
Added stub peer grading module service
Updated Studio/LMS page objects and tests to use bok-choy v0.1.0
Added LMS bok-choy tests from e2e repo
Add bok-choy tests for peer grading module, including calibration.
 2014-02-05 14:50:15 -05:00
Feanil Patel
3731144dc6 Only move students if they aren't in the new course. 2014-02-05 14:32:59 -05:00
Mark Hoeber
60f73af5f0 Merge pull request #2481 from edx/markhoeber/documentation/stud-1246 
First draft, course start date changes
 2014-02-05 14:18:28 -05:00
Mark Hoeber
941d3a6076 Course start date documentation changes 
stud-1246
 2014-02-05 14:16:38 -05:00
Will Daly
a2502d6e12 Merge pull request #2467 from edx/will/clean-test-mongo-dbs 
Clean up Mongo databases created by the test suite.
 2014-02-05 14:08:17 -05:00
Will Daly
8c46d4c623 Merge pull request #2479 from edx/will/update-bok-choy-for-a11y-fixes 
Bok-choy fixes (a11y, video player bug)
 2014-02-05 14:07:28 -05:00
Jay Zoldak
a4275e90b1 Increase async script timeout in lettuce acceptance tests 2014-02-05 13:14:19 -05:00
Adam Palay
f4c6bd1bad Revert "If unit display name is non-empty string, change it to a defaul (STUD-1284)" 
This reverts commit b8da1c5bb7.
 2014-02-05 13:07:33 -05:00
Adam Palay
b8da1c5bb7 If unit display name is non-empty string, change it to a defaul (STUD-1284) 2014-02-05 13:05:26 -05:00
Christina Roberts
235d10ddc6 Merge pull request #2434 from edx/christina/preview_handler 
preview_handler changes to support Locators
 2014-02-05 12:53:11 -05:00
jsa
427468565f don't show the add response button if responses are not allowed. 
JIRA: FOR-452
 2014-02-05 12:49:52 -05:00
Diana Huang
7acc116128 Merge pull request #2477 from edx/diana/fix-sequence-titles 
Prevent bad sequential titles
 2014-02-05 12:49:31 -05:00
Dave St.Germain
28f2a547a5 Merge pull request #2475 from edx/dcs/a11y-skip-nav 
Add a means to skip to more specific parts of the page.
LMS-2156
 2014-02-05 12:46:59 -05:00
Will Daly
274824bf55 Updated bok-choy tests for a11y css selector changes 
Disable broken video test
 2014-02-05 12:45:52 -05:00
cahrens
c2199279e7 Changes to preview to support xblocks using Locators intead of Locatins. 
STUD-967
 2014-02-05 12:16:20 -05:00
thedeadparrot
539cd053d1 Prevent bad sequential titles 
Don't try to set the title if we don't have anything in
the sequential

LMS-2168
 2014-02-05 12:11:52 -05:00
Dave St.Germain
793dae53b7 Merge pull request #2439 from edx/dcs/a11y-vivisections 
Reduce the usage of <section> tags, to increase accessibility
LMS-2161
 2014-02-05 11:38:22 -05:00
Dave St.Germain
a6797899da Removed inappropriate section tags. Because screen readers announce each section, they should not be used unless they are actually defining meaningful sections. 2014-02-05 11:32:08 -05:00
Dave St.Germain
9945d3e9cf Add a means to skip to more specific parts of the page. Contributes to 
LMS-2156
 2014-02-05 11:28:11 -05:00
Dave St.Germain
9132009fd3 Merge pull request #2463 from edx/dcs/a11y-progress-delistify 
Converted <ol> to <div> to prevent a11y confusion on course progress page.
[LMS-1727]
 2014-02-05 11:16:41 -05:00
Will Daly
8ee601a5e3 Clean up Mongo databases created by the test suite. 2014-02-05 11:07:34 -05:00
Mark Hoeber
54f508a01f Merge pull request #2455 from edx/markhoeber/documentation/stud-1242 
Doc Update for Component label in editable unit page
 2014-02-05 11:05:51 -05:00
Mark Hoeber
bd9b12d6cb Merge pull request #2474 from edx/markhoeber/documentation/release-notes-2-5-14 
Markhoeber/documentation/release notes 2 5 14
 2014-02-05 11:05:23 -05:00
Will Daly
0cd7a489a5 Merge pull request #2472 from edx/will/tab-nav-page-object-fix 
Make tab nav page object more robust
 2014-02-05 11:04:55 -05:00
Mark Hoeber
c27e8e3cae 2-5-2014 release notes 2014-02-05 11:04:32 -05:00
cahrens
1dcd5fe6e9 Deleting unused methods. 2014-02-05 10:49:37 -05:00
Brian Talbot
26068a982f LMS: removing redundancy and markup reliability from progress-page Sass selectors 2014-02-05 10:49:37 -05:00
Mark Hoeber
ecc3ebd048 Merge pull request #2473 from edx/sylvia/documentation/BLD-787 
Update warning for Math Expression Input problems
 2014-02-05 10:24:40 -05:00
Feanil Patel
f33f543490 Merge pull request #2446 from edx/rc/2014-02-05 
rc/2014-02-05
 2014-02-05 09:55:18 -05:00
Sylvia Pearce
e690ac6ff6 Update warning for Math Expression Input problems 2014-02-05 09:48:54 -05:00
Calen Pennington
ded722dd38 Merge pull request #2449 from cpennington/xblock-testing-docs 
Add docs about testing xblocks in the LMS
 2014-02-05 09:47:27 -05:00
Dave St.Germain
ea594a2980 Merge pull request #2464 from edx/dcs/default-css-class 
The default course CSS class should be empty string rather than None.
 2014-02-05 09:34:05 -05:00
Will Daly
cb4f92acdf Make tab nav page object more robust 2014-02-05 08:54:43 -05:00
Will Daly
cb8818a4b0 Merge pull request #2470 from edx/will/fix-http-stub-test 
Increase wait time in XQueue stub test
 2014-02-05 08:34:45 -05:00
Calen Pennington
e7e528e8d8 Add docs about testing xblocks in the LMS 
[LMS-2059]
[LMS-2060]
[LMS-1216]
 2014-02-05 08:27:41 -05:00
Calen Pennington
6d67d0c677 Merge pull request #1949 from cpennington/xblock-studio-js-and-css 
Enable XBlock js and css in Studio
 2014-02-05 08:19:45 -05:00
Valera Rozuvan
7339f568d4 Merge pull request #2358 from Szczork/szczork/log-speed-change-video 
add condition - log speed change / loading video
 2014-02-05 12:46:25 +02:00
Will Daly
7960d31416 Increase wait time in XQueue stub test 2014-02-04 22:58:58 -05:00
ichuang
5541aa9c5d Merge pull request #2412 from edx/bugfix/ichuang/formulaequation-msg2 
add message output to formulaequationinput.html (capa)
 2014-02-04 18:57:41 -08:00
Will Daly
50fed0acc6 Merge pull request #2469 from edx/will/doc-and-i18n-test-prereqs 
Install Python prereqs before running doc and i18n tests
 2014-02-04 17:45:43 -08:00