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

21039 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ichuang
09bdcbbc6f skip ~ files in static content import 2014-02-06 14:21:40 -05:00
ichuang
33f86a7af1 skip *~ files in import of extra content (e.g. info and about pages) 2014-02-06 14:21:40 -05:00
David Baumgold
b9edc195bf Merge pull request #2505 from edx/db/resolve-dev-env-script 
fixup create-dev-env.sh
 2014-02-06 14:12:40 -05:00
David Baumgold
c273648395 fixup create-dev-env.sh 2014-02-06 14:09:05 -05:00
Greg Price
e1c36aa557 Merge pull request #2456 from edx/gprice/i18n-extract-dependency 
Make assets:coffee a dependency of i18n:extract
 2014-02-06 13:35:25 -05:00
David Baumgold
44d7d9523e Merge pull request #2501 from edx/db/clarify-test 
Minor test cleanup
 2014-02-06 13:05:11 -05:00
David Baumgold
698aedc329 better pylint formatting 2014-02-06 11:56:46 -05:00
David Baumgold
2d59d44bb5 Clarify DATA_DIR path 2014-02-06 11:55:41 -05:00
hkim823
37fea91d37 Merge branch 'master' of https://github.com/edx/edx-platform 2014-02-06 11:48:12 -05:00
Brian Talbot
a41bdb46db Merge pull request #2476 from ionis-education-group/bodyclass-without-js 
Stop using JavaScript to set the body's CSS class
 2014-02-06 11:28:09 -05:00
Feanil Patel
4636b2706c Merge pull request #2494 from edx/feanil/fix_cms_gather_assets 
Pull THEME_NAME from envs tokens if it's there.
 2014-02-06 11:25:37 -05:00
hkim823
70ca3a4729 fixing create-dev-env.sh to use Brewfile 2014-02-06 11:10:05 -05:00
Ned Batchelder
e64ab5e454 Merge pull request #2417 from edx/ned/add-missing-people-to-authors 
add missing people to AUTHORS
 2014-02-06 11:06:07 -05:00
Will Daly
c82e4ede34 Merge pull request #2492 from edx/will/really-fix-tab-nav-test 
Skip page check in promise for Tab Nav in bok-choy suite
 2014-02-06 10:22:50 -05:00
Will Daly
3336cc76b5 Merge pull request #2490 from edx/will/disable-js-transcripts-test 
Disabled flaky JS transcript test
 2014-02-06 10:10:57 -05:00
Will Daly
28c33a4f84 Skip page check in promise for Tab Nav in bok-choy suite 2014-02-06 09:31:21 -05:00
Will Daly
ac4d3e10d0 Disabled flaky JS transcript test 2014-02-06 08:00:25 -05:00
Feanil Patel
2aab8f89f2 Pull THEME_NAME from envs tokens if it's there. 
If the FEATURES['USE_CUSTOM_THEME'] flag is set but the
'THEME_NAME' is not set.  We get a compilation error during
cms gather assets.
 2014-02-05 18:40:03 -05:00
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
Bertrand Marron
5835ecf779 Stop using JavaScript to set the body CSS class 
This prevents everything from blinking, since the CSS class will be
present when the page is rendering.
 2014-02-05 17:34:35 +01: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