Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bertrand Marron
10482516e1 Prevent from tabbing on tos and honor links 2014-02-06 18:13:34 +01:00
Greg Price
02a233b7e2 Rename URL_PATH to url_path in acceptance code 
It's not a constant, and some subclasses will want to make it a
function with @property.
 2014-02-06 12:02:48 -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
Calen Pennington
85c31dd24b Refactor test_xblock_wrappers to use Factories 2014-02-06 11:52:07 -05:00
hkim823
37fea91d37 Merge branch 'master' of https://github.com/edx/edx-platform 2014-02-06 11:48:12 -05:00
Graham Lowe
c659b1c5f4 Fix goto_position in sequence coffeescript. 
Replace single-quotes with double-quotes so that #{@ajaxUrl} is
interpolated.
 2014-02-06 11:36:11 -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
Dave St.Germain
2d72184620 Added an alt tag to the footer logo; added charset meta tag; moved 
DOCTYPE to the top of the file.
 2014-02-06 11:25:16 -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
Jason Bau
b525f40377 Start datetime localization in LMS 
Currently just coerces the time displayed for due dates
(accordion.html and progess.html) to settings.TIME_ZONE
 2014-02-06 07:57:56 -08:00
daniel cebrian
1a62379a43 fixed conflict between Annotator and internationalitation 2014-02-06 16:31:02 +01: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
Calen Pennington
4321572708 Switch test_xblock_wrappers to use ddt, and to considate logic 2014-02-06 10:15:46 -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
Ned Batchelder
b34ca864fc Make i18n:generate more flexible 
Now normal i18n:generate doesn't care about missing files, and
i18n:generate_strict does.  The robot task calls the strict version.

There may well be a better way to make the two tasks, but my Ruby+Rake
skillz are weak, and it's all going away soon.
 2014-02-05 22:30:35 -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
Don Mitchell
1de9d55844 Review-driven changes (to-be-squashed) 2014-02-05 16:34:24 -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
Calen Pennington
b0bed170de Enable (and test) xml export of pure XBlocks 
[LMS-179]
[LMS-209]
[LMS-1345]
 2014-02-05 13:02:40 -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